[arch-commits] Commit in seamonkey/trunk (3 files)

[Kyle Keen]

    Date: Thursday, June 16, 2016 @ 05:13:58
  Author: kkeen
Revision: 180308

upgpkg: seamonkey 2.40-2 hunspell rebuild and gcc6 patches

Added:
  seamonkey/trunk/mozilla-1245076-1.patch
  seamonkey/trunk/mozilla-1245076.patch
Modified:
  seamonkey/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 ++++++++++---
 mozilla-1245076-1.patch |   49 ++++++++++++++++++++++++++++++++++++++++++++++
 mozilla-1245076.patch   |   23 +++++++++++++++++++++
 3 files changed, 83 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-15 21:56:22 UTC (rev 180307)
+++ PKGBUILD	2016-06-16 05:13:58 UTC (rev 180308)
@@ -3,7 +3,7 @@
 
 pkgname=seamonkey
 pkgver=2.40
-pkgrel=1
+pkgrel=2
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
 license=('MPL')
@@ -18,11 +18,15 @@
 source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz
         mozconfig
         seamonkey-2.0-lang.patch
-        rhbz-966424.patch)
+        rhbz-966424.patch
+        mozilla-1245076.patch
+        mozilla-1245076-1.patch)
 md5sums=('5789df8f96e14577c275f10fdf8462f3'
          '9b6d65e9b77acf9fd7c6e3578a5d2acd'
          '25b6fe16ac24cd5c852213e5c1adb272'
-         '8c1578232b7a60fa1caa9a0b322d1e2b')
+         '8c1578232b7a60fa1caa9a0b322d1e2b'
+         '43550e772f110a338d5a42914ee2c3a6'
+         '772aac58e3a7e8a32bedd898bc35dc90')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -44,6 +48,10 @@
 
   # 2.26 build fix from wgnie (blfs ch 37)
   sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
+
+  # GCC 6
+  patch -Np1 -d mozilla -i ../../mozilla-1245076.patch
+  patch -Np1 -d mozilla -i ../../mozilla-1245076-1.patch
 }
 
 build() {

Added: mozilla-1245076-1.patch
===================================================================
--- mozilla-1245076-1.patch	                        (rev 0)
+++ mozilla-1245076-1.patch	2016-06-16 05:13:58 UTC (rev 180308)
@@ -0,0 +1,49 @@
+diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h
+--- a/config/gcc-stl-wrapper.template.h
++++ b/config/gcc-stl-wrapper.template.h
+@@ -12,33 +12,39 @@
+ // compiling ObjC.
+ #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
+ #  error "STL code can only be used with -fno-exceptions"
+ #endif
+ 
+ // Silence "warning: #include_next is a GCC extension"
+ #pragma GCC system_header
+ 
++#ifndef moz_dont_include_mozalloc_for_cstdlib
++#  define moz_dont_include_mozalloc_for_cstdlib
++#endif
++#ifndef moz_dont_include_mozalloc_for_${HEADER}
+ // mozalloc.h wants <new>; break the cycle by always explicitly
+ // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
+ //
+ //    `#include_next' does not distinguish between <file> and "file"
+ //    inclusion, nor does it check that the file you specify has the
+ //    same name as the current file. It simply looks for the file
+ //    named, starting with the directory in the search path after the
+ //    one where the current file was found.
+-#include_next <new>
++#  include_next <new>
+ 
+ // See if we're in code that can use mozalloc.  NB: this duplicates
+ // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
+ // can't build with that being included before base/basictypes.h.
+-#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
+-#  include "mozilla/mozalloc.h"
+-#else
+-#  error "STL code can only be used with infallible ::operator new()"
++#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
++#    include "mozilla/mozalloc.h"
++#  else
++#    error "STL code can only be used with infallible ::operator new()"
++#  endif
++
+ #endif
+ 
+ #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
+ // Enable checked iterators and other goodies
+ //
+ // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
+ // Figure out how to resolve this with -fno-rtti.  Maybe build with
+ // -frtti in DEBUG builds?
+

Added: mozilla-1245076.patch
===================================================================
--- mozilla-1245076.patch	                        (rev 0)
+++ mozilla-1245076.patch	2016-06-16 05:13:58 UTC (rev 180308)
@@ -0,0 +1,23 @@
+diff --git a/gfx/graphite2/src/Collider.cpp b/gfx/graphite2/src/Collider.cpp
+--- a/gfx/graphite2/src/Collider.cpp
++++ b/gfx/graphite2/src/Collider.cpp
+@@ -21,17 +21,17 @@
+ 
+ Alternatively, the contents of this file may be used under the terms of the
+ Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public
+ License, as published by the Free Software Foundation, either version 2
+ of the License or (at your option) any later version.
+ */
+ #include <algorithm>
+ #include <limits>
+-#include <math.h>
++#include <cmath>
+ #include <string>
+ #include <functional>
+ #include "inc/Collider.h"
+ #include "inc/Segment.h"
+ #include "inc/Slot.h"
+ #include "inc/GlyphCache.h"
+ #include "inc/Sparse.h"
+ 
+