From d149ac437ba3609517f0afe43336110f0ee7fa1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 18 Sep 2013 15:25:19 -0300 Subject: iceweasel-libre-1:24.0.deb1-1: updating version * fix i686 build * remove unnecessaries deps; add inetutils (hostname is called during build, and recorded); add gold linker, but keep commented for now * remove loading icon patch; should not be needed since libpng 1.6.3 * try to build without shared-libs.patch; hopefully not needed anymore --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 4 +- libre/iceweasel-libre/PKGBUILD | 55 +++++++++++---------- .../iceweasel-20.0.1-fixed-loading-icon.png | Bin 12184 -> 0 bytes ...-do-not-fallback-to-manual-proxy-settings.patch | 36 -------------- libre/iceweasel-libre/mozconfig | 1 - libre/iceweasel-libre/shared-libs.patch | 12 ----- 6 files changed, 31 insertions(+), 77 deletions(-) delete mode 100644 libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png delete mode 100644 libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch delete mode 100644 libre/iceweasel-libre/shared-libs.patch (limited to '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 9fbb5f84a..5d56ee23b 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 @@ -268,10 +268,10 @@ index f35c227..7062886 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 90641ed..1806e0c 100644 +index cc3f65e..cdd4305 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun() +@@ -3731,7 +3731,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 1918e27a6..6ee55bd61 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel -_debver=23.0.1 +_debver=24.0 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,13 +23,13 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +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 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(diffutils gstreamer0.10-base imake inetutils libpulse mesa python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then @@ -37,6 +37,10 @@ if $_pgo; then options+=(!ccache) fi optdepends=('networkmanager: Location detection via available WiFi networks' + 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-good-plugins: webm and mp4 demuxing' + 'gstreamer0.10-ugly-plugins: h.264 decoding' 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install @@ -51,22 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel.desktop iceweasel-install-dir.patch vendor.js - shared-libs.patch replace-urls.txt - $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('43ca6c80e00f5812cb1a38d87f838e06' - '0eb0d65b6dbb035b7b8d753c68fda6aa' - '2d7ac85c32df6a4ccfcc6de7a1420bf7' +md5sums=('8f24807d67599516850a4bdca2b2fbd6' + '6ff864f04cb66c5e57f5156cb76dd2b3' + '350feec44d359c31679dbec3de6685df' 'df08eaa1ac3bc6c2356be4fbf8ec8932' '4f656688fe7bc0b11899369e0e23e516' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0b88d6142f6131711dcb1a2d87a12ad2' - '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '6e335a517c68488941340ee1c23f97b0' - 'c8ee0925def9f018cde65950f66e5844') + 'f1594fa3567e5b70202c3432d7c00202') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -88,7 +88,6 @@ prepare() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/shared-libs.patch" # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do @@ -144,14 +143,12 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" + # Use gold, as Mozilla can use some of its features, such as safe ICF + #ln -s /usr/bin/ld.gold "$srcdir/path/ld" + # 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() { @@ -163,20 +160,26 @@ build() { export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - # Work around memory address space exhaustion during linking on i686 if [[ $CARCH == i686 ]]; then + # Work around memory address space exhaustion during linking on i686 LDFLAGS+=' -Wl,--no-keep-memory' fi if $_pgo; then - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - - if ! make -f client.mk build MOZ_PGO=1; then - kill $! - return 1 + if [[ $CARCH != i686 ]]; then + # Set up PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 + fi + + kill $! || true + else + make -f client.mk build fi - - kill $! || true else make -f client.mk build fi 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 deleted file mode 100644 index 55f25e591..000000000 Binary files a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png and /dev/null 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 deleted file mode 100644 index 56e4bfc45..000000000 --- a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# 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 a5af10e63..d2ea098d2 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -24,7 +24,6 @@ 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 diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/libre/iceweasel-libre/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ -- cgit v1.2.3-2-g168b