From 9af57c26d38aca92f95acaf6694a50bd483dd06e Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sat, 4 May 2013 14:42:05 -0300
Subject: iceweasel-libre-19.0.1-3: build with bundled libpng to avoid
 flickering tab loading icon

---
 libre/iceweasel-libre/PKGBUILD  | 9 ++++-----
 libre/iceweasel-libre/mozconfig | 4 +++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 03dd71fba..314d5ca6d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=20.0.1
+_debver=20.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=3
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -54,7 +54,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('22daa24b6490c654f131550cbf20fad3'
          '0c70ab52f35701558081df3d360361a2'
-         'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
+         '01f56b3ccbead0f665ed82fae0b8f290'
          '383e8e2a97a8b13fe56d153adb6878b6'
          '5addd418bf32b673fdfe80c8fefbea1a'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
@@ -142,8 +142,7 @@ prepare() {
 
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  # TODO: re-enable when we're building with GCC >= 4.8 again
-  #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 }
 
 build() {
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index c929b8972..d7961bf41 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -13,7 +13,9 @@ ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
-ac_add_options --with-system-png
+# Build with bundled libpng to avoid flickering tab loading icon
+# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+#ac_add_options --with-system-png
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
-- 
cgit v1.2.3