[arch-commits] Commit in xulrunner/trunk (PKGBUILD gcc6.diff)

[Andreas Radke]

    Date: Tuesday, June 14, 2016 @ 19:45:35
  Author: andyrtr
Revision: 180107

prepare hunspell rebuild, requires further gcc6 patching

Added:
  xulrunner/trunk/gcc6.diff
Modified:
  xulrunner/trunk/PKGBUILD

-----------+
 PKGBUILD  |   11 ++++++++---
 gcc6.diff |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-14 19:44:57 UTC (rev 180106)
+++ PKGBUILD	2016-06-14 19:45:35 UTC (rev 180107)
@@ -5,7 +5,7 @@
 
 pkgname=xulrunner
 pkgver=41.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -17,7 +17,8 @@
         freetype261.patch
         0001-Bug-1233963-Work-around-recent-GNU-gold-behavior-wit.patch
         mozilla-pkgconfig.patch
-        shared-libs.patch)
+        shared-libs.patch
+        gcc6.diff)
 options=('!emptydirs' '!makeflags' 'staticlibs')
 replaces=('xulrunner-oss')
 sha256sums=('f7abb2e2989779305ab1f80d30caf9fc55d96c7e66d1394e2cc9639442e2b864'
@@ -25,12 +26,16 @@
             '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
             '13a27a385fab88938ac7417f1e7ca7225ec6b88840bafe67e0f5642e5446554a'
             '1aa9ebe67542a2b8c28905d070829ada5b29438c6a7961f2b0cdd6b92d8b9f5c'
-            '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40')
+            '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40'
+            '0992d5dce883de760ff0445448466f096d0baa75fe5fd1e60bfd3cc13cb4d098')
 
 prepare() {
   cd "$srcdir/mozilla-release"
   cp "$srcdir/mozconfig" .mozconfig
 
+  # GCC6
+  patch -Np1 -i ../gcc6.diff
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
   patch -Np1 -i ../freetype261.patch
 

Added: gcc6.diff
===================================================================
--- gcc6.diff	                        (rev 0)
+++ gcc6.diff	2016-06-14 19:45:35 UTC (rev 180107)
@@ -0,0 +1,37 @@
+--- mozilla-release/config/gcc-stl-wrapper.template.h	2015-10-14 23:40:56.000000000 +0200
++++ mozilla-release/config/gcc-stl-wrapper.template.h.new	2016-06-14 19:40:50.542435101 +0200
+@@ -22,6 +22,11 @@
+ #define NOMINMAX 1
+ #endif
+ 
++// Don't include mozalloc for cstdlib. See bug 1245076.
++#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:
+ //
+@@ -30,15 +35,17 @@
+ //    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)