community/xulrunner to 41.0.2-11

community/xulrunner/PKGBUILD

@@ -12,17 +12,18 @@ highmem=1
 
 pkgname=xulrunner
 pkgver=41.0.2
-pkgrel=10
+pkgrel=11
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'nss>3.18' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'libpulse' 'libevent' 'libvpx' 'icu' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'gconf' 'autoconf2.13' 'gst-plugins-base-libs')
+makedepends=('gcc5' 'zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'gconf' 'autoconf2.13' 'gst-plugins-base-libs')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.xz
         mozconfig
         freetype261.patch
         0001-Bug-1233963-Work-around-recent-GNU-gold-behavior-wit.patch
+	Bug-1269171.patch
         LFS_graphite2_harfbuzz.patch
         mozilla-pkgconfig.patch
         shared-libs.patch
@@ -31,9 +32,10 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/sourc
 options=('!emptydirs' 'staticlibs')
 replaces=('xulrunner-oss')
 sha256sums=('f7abb2e2989779305ab1f80d30caf9fc55d96c7e66d1394e2cc9639442e2b864'
-            '689db506c2536dd594411e09ef054ab083bd22e26daffe03183a93a8d3b5b673'
+            '5c138729835bf5829c3fd64af3c364a5bc7576f2e1006ef8c2d9aa26c681bb91'
             '3aea9a83bf304da5525f34a911712cf42f8ded1c8b6becf0a2cf8a4b4f7facd6'
             '13a27a385fab88938ac7417f1e7ca7225ec6b88840bafe67e0f5642e5446554a'
+	    'bd78da5d5319c8eb6a9195c3bd35bf919f9a9c030d69890f42e96171e32be60f'
             'afcd7d3f6113b0f9ead0cb1b47b3fccedadce56a16b4406c439411864bd11863'
             '1aa9ebe67542a2b8c28905d070829ada5b29438c6a7961f2b0cdd6b92d8b9f5c'
             '59d9fc421bc10a5515b73e159f44a72365bf7b7e8b3fc8a8c46043ef40bd3a40'
@@ -44,9 +46,6 @@ prepare() {
   cd "$srcdir/mozilla-release"
   cp "$srcdir/mozconfig" .mozconfig
 
-  # GCC6
-  patch -Np1 -i ../gcc6.diff
-
   [[ $CARCH == "aarch64" ]] && echo "ac_add_options --disable-gold" >> .mozconfig
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272
@@ -58,8 +57,15 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1233963
   patch -Np1 -i ../0001-Bug-1233963-Work-around-recent-GNU-gold-behavior-wit.patch
 
+  # It would be great to track down all the gcc7 fixes
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1269171
+  #patch -Np1 -i ../gcc6.diff
+  #patch -Np1 -i ../Bug-1269171.patch
+
   # https://bugzilla.mozilla.org/show_bug.cgi?id=847568
   patch -Np1 -i ../LFS_graphite2_harfbuzz.patch
+  sed -i -e "s|lcrmf|lm|g" configure.in
+  sed -i -e "/lcrmf/d" config/external/nss/crmf/moz.build
   rm configure
   autoconf-2.13
 

community/xulrunner/mozconfig

@@ -1,5 +1,8 @@
 . $topsrcdir/xulrunner/config/mozconfig
 
+export CC=gcc-5
+export CXX=g++-5
+
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 
@@ -38,3 +41,4 @@ ac_add_options --disable-installer
 
 # https://bugzilla.mozilla.org/show_bug.cgi?id=955876
 #ac_add_options --enable-release
+ac_add_options --disable-gold