From 870a13606c5d9d797a9f4dd78c990ac72fb59125 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 26 Jun 2013 21:44:46 -0300 Subject: iceweasel-libre-22.0.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 8 ++--- libre/iceweasel-libre/PKGBUILD | 36 ++++++++++++++------- .../iceweasel-20.0.1-fixed-loading-icon.png | Bin 0 -> 12184 bytes ...-do-not-fallback-to-manual-proxy-settings.patch | 36 +++++++++++++++++++++ libre/iceweasel-libre/mozconfig | 2 +- libre/iceweasel-libre/mozconfig.pgo | 2 +- 6 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png create mode 100644 libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index d89e4d1ae..f561d5d39 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -3,7 +3,7 @@ Date: Tue, 5 Jun 2012 08:57:06 +0200 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index 0e8ccf5..fa46c08 100644 +index 91c5c1c..2f8bd1a 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js @@ -249,7 +249,7 @@ var MigrationWizard = { @@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index fa45115..1fcf3cd 100644 +index 0541ebf..f983ae4 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -42,7 +42,7 @@ toolkit.jar: @@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index b08f8ce..446ee74 100644 +index 17f5598..0b9a24a 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun() +@@ -3743,7 +3743,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index eebf10e57..8e1c525c3 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -1,10 +1,10 @@ +# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Márcio Silva # Contributor (ConnochaetOS): Henry Jensen # Contributor (Parabola): Luke Shumaker # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando -# Contributor (Parabola): André Silva -# Contributor (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=21.0 +_debver=22.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,20 +22,21 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre 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 mips64el) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi -optdepends=('networkmanager: Location detection via available WiFi networks') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install replaces=('firefox') @@ -51,18 +52,22 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js shared-libs.patch replace-urls.txt + $_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('0a7c51bb494463c327af918bae6c4ee4' - 'c17121a4ffd40f463e16d7828445d96e' - 'e1e903ca91997f18b428c54ef604f27d' - '383e8e2a97a8b13fe56d153adb6878b6' +md5sums=('45d7121606cc3b21cd2797c87b5dc3bd' + 'bf0440dd8c31527359d797daaf0d3edd' + '2d7ac85c32df6a4ccfcc6de7a1420bf7' + 'df08eaa1ac3bc6c2356be4fbf8ec8932' '2930f3bffe0d7a6b9845f8c006821bc2' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '85e67561e0e491cd538ce018dfc2d948') + 'bc27a39d08ab3f6705e487c85598d8bf' + '6e335a517c68488941340ee1c23f97b0' + '86d4045285a9a15c20a62f46535809cb') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -131,6 +136,10 @@ prepare() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # Should be fixed in Iceweasel 23 + # https://bugzilla.mozilla.org/show_bug.cgi?id=817533 + patch -Np1 -i ../$_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in @@ -143,6 +152,11 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png } build() { diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png new file mode 100644 index 000000000..55f25e591 Binary files /dev/null and b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png differ diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch new file mode 100644 index 000000000..56e4bfc45 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch @@ -0,0 +1,36 @@ + +# HG changeset patch +# User Patrick McManus +# Date 1365623297 14400 +# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb +# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 +bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell + +diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp +--- a/netwerk/base/src/nsProtocolProxyService.cpp ++++ b/netwerk/base/src/nsProtocolProxyService.cpp +@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal + + // Proxy auto config magic... + if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { + // Do not query PAC now. + *usePACThread = true; + return NS_OK; + } + +- // proxy info values ++ // If we aren't in manual proxy configuration mode then we don't ++ // want to honor any manual specific prefs that might be still set ++ if (mProxyConfig != PROXYCONFIG_MANUAL) ++ return NS_OK; ++ ++ // proxy info values for manual configuration mode + const char *type = nullptr; + const nsACString *host = nullptr; + int32_t port = -1; + + uint32_t proxyFlags = 0; + + if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && + !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { + diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 21d56e13c..a5af10e63 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -25,10 +25,10 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --enable-gstreamer +ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-tests ac_add_options --disable-installer # Parabola features diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo index 2f4ebe32b..71ba205a4 100644 --- a/libre/iceweasel-libre/mozconfig.pgo +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -1,3 +1,3 @@ # PGO -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10' +mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' -- cgit v1.2.3