iceweasel-1:48.0.deb1-1: updating version

1 files changed, 16 insertions, 20 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index dd0b0c5d8..fc9337e36 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,9 +16,9 @@ _pgo=false
 
 # We're getting this from Debian Sid
 _debname=firefox
-_brandingver=45.0
-_brandingrel=2
-_debver=47.0.1
+_brandingver=48.0
+_brandingrel=1
+_debver=48.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 _parabolarepo=https://repo.parabola.nu/other/iceweasel
@@ -34,7 +34,7 @@ pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based o
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell icu=57.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
-makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg-stable libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
+makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg-stable libxslt mesa mozilla-searchplugins pkg-config python2 quilt rust unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
@@ -51,6 +51,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         "$_parabolarepo/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig"
         mozconfig
         libre.patch
+        remove-default-and-shell-icons-in-packaging-manifest.patch
         gnu_headshadow.png
         drm-free.png
         $pkgname.desktop
@@ -58,24 +59,21 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         vendor.js
         no-libnotify.patch
         $pkgname-gtk3-20.patch
-        mozilla-1245076.patch
-        mozilla-1245076-1.patch
         enable-object-directory-paths.patch)
-sha256sums=('9e018efdb271b31290c99f75a4648f0eee752ed7802f041699efa46b903f04da'
-            '6ba23fa1c989a06f021264109adc0a2b0b5b4c52f8fef5ff6762869867f970ba'
-            '69736106a9c96fdbca2fb82bd8fbceddf2ab87940ff42bc92cfaed716363310e'
+sha256sums=('032cc7c6da26b4336a6e0cea41a2821a149469b5cdeaec66723bf256bbf13ec5'
+            'bda6131cb58bedfb33ed372ab0b8ad666f8b6b310f4788c7415efb9e3ae30ec6'
+            '0c4ce096711629db4a5f15415b9d752fd77c4eab7bfd22bd3cb6640ed9cbf861'
             'SKIP'
-            '2b46569741e6939d945a7dbee424418a2d56e5a15283fa5eee3bad50ab4d5ce7'
-            'b6679e1fe6b25be59a25490a97d1ff7bef6ca660af928052b14fd0d8dd13175f'
+            '6891d6237312914b579c632b71f9e4f613e7b00bbf2fd7ce53b4cf681820f609'
+            '013af398e97da9e855a143582816bf819e0d9d8d2b0e323d6b832f3df1157fdd'
+            '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
             '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            '0102d0d8d0833691865cc8e27050da929d899ec4a26327b519ca7e4fdff6802a'
+            'eb22f6a5dfea240f7c5e5f6148796159037ec597d44c90ded4cc1d2d7daa5914'
             'e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7'
-            'd5e1b9a702dc693184494899fc4cd57ac206e1fd5415a8e5520b8ff3b822e734'
-            '05574c7d0f259da161bcd0e2e8bc9a19401e620ff29439da935d349eebb60efa'
-            '6e7cba25c52b246da183b8309e7b56208bd991d1a7adb40063c5702a6f3722ea'
+            'c984c8bda3c173349d98f3fa71ec8ff8e8b74e6ca20a3f39f33596dbb4c4d1e8'
             'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484')
 validpgpkeys=(
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
@@ -99,6 +97,9 @@ prepare() {
   install -m644 "$srcdir/"{gnu_headshadow,drm-free}.png \
     browser/base/content/abouthome
 
+  # Useless since we are doing it ourselves
+  patch -Np1 -i "$srcdir/remove-default-and-shell-icons-in-packaging-manifest.patch"
+
   # Enable object directory paths for Iceweasel rebranding
   patch -Np1 -i "$srcdir/enable-object-directory-paths.patch"
 
@@ -108,10 +109,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1234158
   patch -Np1 -i "$srcdir/$pkgname-gtk3-20.patch"
 
-  # GCC 6
-  patch -Np1 -i ../mozilla-1245076.patch
-  patch -Np1 -i ../mozilla-1245076-1.patch
-
   # Notifications with libnotify are broken
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1236150
   patch -Np1 -i "$srcdir/no-libnotify.patch"
@@ -148,7 +145,6 @@ build() {
   LDFLAGS+=" -Wl,-z,now"
 
   # GCC 6
-  CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
   CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
 
   export PATH="$srcdir/path:$PATH"