From eb67ff0589f9e3ced7533e5c7986b909e2bfea60 Mon Sep 17 00:00:00 2001 From: Weng Date: Wed, 26 Jun 2013 20:20:00 +0000 Subject: [PATCH] update firefox 22.0 --- firefox-kde/PKGBUILD | 148 ++++++++++-------- .../firefox-20.0.1-fixed-loading-icon.png | Bin 0 -> 12184 bytes ...ot-fallback-to-manual-proxy-settings.patch | 36 +++++ firefox-kde/firefox-kde.patch | 45 +++--- firefox-kde/mozconfig | 3 +- firefox-kde/mozilla-kde.patch | 113 ++++++++++--- firefox-kde/mozilla-nongnome-proxies.patch | 16 +- 7 files changed, 245 insertions(+), 116 deletions(-) create mode 100644 firefox-kde/firefox-20.0.1-fixed-loading-icon.png create mode 100644 firefox-kde/firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch diff --git a/firefox-kde/PKGBUILD b/firefox-kde/PKGBUILD index 4722660..2d16d81 100644 --- a/firefox-kde/PKGBUILD +++ b/firefox-kde/PKGBUILD @@ -1,15 +1,17 @@ # Contributor: Weng Xuetian pkgname=firefox-kde -pkgver=21.0 -pkgrel=2 +pkgver=22.0 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" _obsver=b88c72dfdc858f6209feb123227bd7df url='http://www.mozilla.org/projects/firefox' arch=('x86_64') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'startup-notification' 'libnotify' 'alsa-lib' 'gstreamer0.10' 'gstreamer0.10-base' 'libxt' 'dbus-glib' 'libevent' 'filesystem-extra' 'kdelibs') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'unzip' 'autoconf2.13' 'mesa' 'yasm' 'cmake' 'automoc4') +makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'unzip' 'autoconf2.13' 'mesa' 'yasm' 'cmake' 'automoc4' 'libpulse') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'libpulse: PulseAudio audio driver') screenshot="http://img864.imageshack.us/img864/5116/firefoxm.png" provides=("firefox=${pkgver}" "kmozillahelper=0.6.4") conflicts=('firefox' 'kmozillahelper') @@ -43,63 +45,20 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/ firefox-kde.patch mozilla-nongnome-proxies.patch mozilla-kde.patch - mozilla-gstreamer-760140.patch + firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch + firefox-20.0.1-fixed-loading-icon.png duckduckgo.xml "kmozillahelper-0.6.4.tar.bz2::https://api.opensuse.org/public/source/mozilla:Factory/mozilla-kde4-integration/${pkgname}-${pkgver}.tar.bz2?rev=${_obsver}" move-to-extra.patch ) -md5sums=('b822ff4b2348410587dec563235d9320' - 'b2a0c175d063e6c4fe0c7ed6c27ac443' - '22c8f014ca98e49c4c107e2671dd0e51' - '150ac0fb3ac7b2114c8e8851a9e0516c' - 'b1b1ad060b411a4abee7dcc63927aa02' - '75df0f88cc7a7fa7d522459e4ff82cc5' - '194da028eba1fbc316cf37dd586c4112' - '79f113b56057e17ca2466cd0ac578bb3' - '69a90693ab4fc4d81afd83c1524e73d4' - '9f4e6467284a5c82fbba0c0afe862f31' - '7303a96e92e600a46dd6a2cf9af5ada5' - 'f6e2a6759b8711b445dbc9d35cbd275f' - '7db8c8904371204fb4c13e9cd306deb0' - '4baee75ae2e23b2aa2f129385d4dcb82') - -build() { - pushd . - build_kmozillahelper - popd - pushd . - build_firefox - popd -} - -build_kmozillahelper() { - pushd . - cd kmozillahelper - patch -Np1 -i ../move-to-extra.patch || return 1 - popd - - mkdir -p kmozillahelper-build - cd kmozillahelper-build - - cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` -DCMAKE_BUILD_TYPE=Release ../kmozillahelper - make || return 1 - -} - -build_firefox() { +_prepare() { + pushd . cd "mozilla-release" - patch -Np1 -i "../firefox-install-dir.patch" - # modify the patch to make it under extra - cp ../mozilla-kde.patch ../mozilla-kde-mod.patch - sed -i 's|\(\+\#define KMOZILLAHELPER "\)\(/usr/lib/mozilla/kmozillahelper"\)|\1/extra\2|' ../mozilla-kde-mod.patch + cp "../mozconfig" .mozconfig - # remove the new file, to make life easier with call makepkg multiple times - rm -f content/media/gstreamer/nsGStreamerFormatHelper.cpp \ - content/media/gstreamer/GStreamerFormatHelper.cpp \ - content/media/gstreamer/nsGStreamerFormatHelper.h \ - content/media/gstreamer/GStreamerFormatHelper.h + # make makepkg -R easier rm -f browser/components/shell/src/nsKDEShellService.cpp \ browser/components/shell/src/nsKDEShellService.h \ browser/components/shell/src/nsUnixShellService.cpp \ @@ -114,8 +73,17 @@ build_firefox() { toolkit/content/widgets/dialog-kde.xml \ toolkit/content/widgets/preferences-kde.xml - msg "apply mozilla-gstreamer-760140.patch" - patch -Np1 -i "../mozilla-gstreamer-760140.patch" || return 1 + + cp toolkit/components/downloads/nsDownloadManager.cpp{,.bak} + + patch -Np1 -i "../firefox-install-dir.patch" + + # modify the patch to make it under extra + cp ../mozilla-kde.patch ../mozilla-kde-mod.patch + sed -i 's|\(\+\#define KMOZILLAHELPER "\)\(/usr/lib/mozilla/kmozillahelper"\)|\1/extra\2|' ../mozilla-kde-mod.patch + + cp toolkit/components/downloads/nsDownloadManager.cpp{.bak,} + msg "apply mozilla-nongnome-proxies.patch" patch -Np1 -i "../mozilla-nongnome-proxies.patch" || return 1 msg "apply mozilla-kde-mod.patch" @@ -123,12 +91,52 @@ build_firefox() { msg "apply firefox-kde.patch" patch -Np1 -i "../firefox-kde.patch" || return 1 - cp "../mozconfig" .mozconfig + # Should be fixed in Firefox 23 + # https://bugzilla.mozilla.org/show_bug.cgi?id=817533 + patch -Np1 -i ../firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch + + mkdir -p "$srcdir/path" + + # WebRTC build tries to execute "python" and expects Python 2 + ln -sf /usr/bin/python2 "$srcdir/path/python" # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/firefox-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png + popd + + pushd . + cd kmozillahelper + patch -Np1 -i ../move-to-extra.patch || return 1 + popd +} + +build() { + _prepare + pushd . + build_kmozillahelper + popd + pushd . + build_firefox + popd +} + +build_kmozillahelper() { + mkdir -p kmozillahelper-build + cd kmozillahelper-build + + cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` -DCMAKE_BUILD_TYPE=Release ../kmozillahelper + make || return 1 +} + +build_firefox() { + cd "mozilla-release" + export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/extra/usr/lib/firefox" export PYTHON="/usr/bin/python2" @@ -171,16 +179,18 @@ package() { ln -s /usr/share/hyphen "$pkgdir/extra/usr/lib/firefox/hyphenation" } -md5sums=('6e2510e9466b280c367de0e4c05a8840' - 'bbcfd1b4fc60495a7e49a66be1a637f7' - '22c8f014ca98e49c4c107e2671dd0e51' - '150ac0fb3ac7b2114c8e8851a9e0516c' - 'b1b1ad060b411a4abee7dcc63927aa02' - '75df0f88cc7a7fa7d522459e4ff82cc5' - '755528dfc7143f695bf5800f923bf384' - '79f113b56057e17ca2466cd0ac578bb3' - 'f6ee269b0ecfbf6a4ddcf8d45cfd6e4f' - '70fb43a673328e3665e999659b3a0d4b' - 'f6e2a6759b8711b445dbc9d35cbd275f' - '7db8c8904371204fb4c13e9cd306deb0' - '4baee75ae2e23b2aa2f129385d4dcb82') + +sha1sums=('db2d5b028b6ea95b5f006b46e153f50f7a52bf80' + '1ab24e03f04c8641c7bba1ace285b9db98feed23' + '5c54c004a5f6bcf22d1ff0fdc33765c45517288a' + '28e6c025e1bfa0784648fcf3876c1ffc7a79aeec' + 'e0f399de01da908f474c237bc6c5a15678cd8fcd' + 'ce48f8e5065319e191a7389539ec663dc8a919d7' + '417da8cc3599b575c9c26ecd546e612b978cf260' + 'ec793946d5ae5a3e4e8f2a2f78aacb8f1b50ee04' + '3b2481ec13f8eefc2d38c658d2cdedbe538f0816' + '783d7ca683b911ef388fd265caef552e1e346d71' + '0c3900ffe21bfc3d96b80ade334613bc7e76fe27' + 'aa3442d291bd77fefa3758291baa9c609a74e5dc' + '5543ea72a07fb6f3af19cfbb6d1683a5fddaa807' + 'a905b224834c8f2d40a2f4e39a3f47ba6b1d2952') diff --git a/firefox-kde/firefox-20.0.1-fixed-loading-icon.png b/firefox-kde/firefox-20.0.1-fixed-loading-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..55f25e591ff52b1007efbc42d536df7f4b05b326 GIT binary patch literal 12184 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 Ve4%XO4umL7Q%z6xy^3w<{{hmG+u8sC literal 0 HcmV?d00001 diff --git a/firefox-kde/firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch b/firefox-kde/firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch new file mode 100644 index 0000000..56e4bfc --- /dev/null +++ b/firefox-kde/firefox-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/firefox-kde/firefox-kde.patch b/firefox-kde/firefox-kde.patch index 99a6398..a109bcc 100644 --- a/firefox-kde/firefox-kde.patch +++ b/firefox-kde/firefox-kde.patch @@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1216 @@ +@@ -0,0 +1,1225 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -119,7 +119,7 @@ new file mode 100644 + onpopupshowing="return FillHistoryMenu(event.target);" + oncommand="gotoHistoryIndex(event); event.stopPropagation();" + onclick="checkForMiddleClick(this, event);"/> -+ ++ + + +