From b6f33ad11e50e29ae3c17b0148b605eefebc82b2 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 16 Dec 2015 23:49:53 -0300
Subject: iceweasel-1:43.0.deb1-1: updating version

* switch to GTK3; still need GTK2 for plugins
* use FFmpeg for H264 video playback
---
 libre/iceweasel/PKGBUILD  | 18 ++++++++++--------
 libre/iceweasel/mozconfig |  5 +++++
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 4abe7e9dc..32a02c06c 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -16,7 +16,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=42.0
+_debver=43.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -25,12 +25,12 @@ _pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gtk3 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
 makedepends=(autoconf2.13 diffutils gconf gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
 options=(!emptydirs !makeflags debug)
 if $_pgo; then
@@ -38,8 +38,10 @@ if $_pgo; then
   options+=(!ccache)
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gst-plugins-good: h.264 video'
-            'gst-libav: h.264 video')
+            'ffmpeg: H264/AAC decoding'
+            'gst-plugins-good: MP3 playback'
+            'gst-plugins-ugly: MP3 playback'
+            'upower: Battery API')
 url="http://packages.debian.org/experimental/$pkgname"
 install=$pkgname.install
 replaces=("$pkgname-libre" "$_pkgname")
@@ -54,9 +56,9 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
         $pkgname-install-dir.patch
         vendor.js
         $pkgname-fixed-loading-icon.png)
-sha256sums=('355e688b16330d8a86f01a2abaaa483971ba1eab9c7aca37fc064a7601645cc2'
-            'd25335678825e23a5dd0c669d3f8fcfc666bf21944139b16e4fc46d203a8cfd8'
-            '8e0b2aa899f9c71dfabf61e8e3427bda9a6ef76330bda4428d1badddcfc331a5'
+sha256sums=('12424bf494c9eae7b3489fa85b11f1743b41f2363413d43cfc77af8f4caf11b4'
+            '2a59e901a0c7bd93aba47583459837067b0a826eac0ce0bd41317f19c86938dd'
+            '351ff30a3709ea5c2336e8c5ea93d6fa24c1f34a136594ee5eae729590d18b2a'
             'a28bd21522f0c7d93e9669f1fcc35309c9841d9b2332aa16b0b746ad18fc878c'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
diff --git a/libre/iceweasel/mozconfig b/libre/iceweasel/mozconfig
index 0997645d4..a2c62ecd0 100644
--- a/libre/iceweasel/mozconfig
+++ b/libre/iceweasel/mozconfig
@@ -2,8 +2,12 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+ac_add_options --enable-release
+ac_add_options --enable-gold
 ac_add_options --enable-pie
 
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
 # Iceweasel
 ac_add_options --disable-official-branding
 ac_add_options --with-branding=debian/branding
@@ -21,6 +25,7 @@ ac_add_options --with-system-icu
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
+# system cairo without layers acceleration results in choppy video playback
 #ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 
-- 
cgit v1.2.3-54-g00ecf