From f5a8de28b86c2c838a28e79aa54f8b4c3fbd869e Mon Sep 17 00:00:00 2001 From: root Date: Thu, 31 May 2012 16:24:59 +0000 Subject: Thu May 31 16:24:59 UTC 2012 --- libre/iceweasel-libre/PKGBUILD | 31 +++++++++++----- libre/iceweasel-libre/gcc47.patch | 75 +++++++++++++++++++++++++++++++++++++++ libre/iceweasel-libre/libre.patch | 28 +++++++-------- 3 files changed, 112 insertions(+), 22 deletions(-) create mode 100644 libre/iceweasel-libre/gcc47.patch (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 3ef4da470..85ede7409 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -12,8 +12,8 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel -_debver=11.0 -_debrel=2 +_debver=12.0 +_debrel=7 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -27,11 +27,12 @@ if $_pgo; then pkgname+='-pgo' fi -pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification') -makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'yasm' 'zip') +makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'zip') +[ "$CARCH" != "mips64el" ] && makedepends+=('yasm') if $_pgo; then makedepends+=('xorg-server-xvfb') options=(!ccache) @@ -49,13 +50,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" iceweasel-install-dir.patch region.properties vendor.js) -md5sums=('01d9d18909ca9fff2483d8fd779a0f89' - '59349da94b095fe0623d09ce75696766' - 'f407208a750cdc9bea3a6a3a3e42dd89' +md5sums=('b45f57bfe21b0e6db4f0683e794917cb' + '08aa0a949d9cbb26116490f7878a62fe' + 'd7ad1c025d2442427a06cc702906ef0d' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - 'addd3a3420cebeda152b447705b086e9' + '64be2fab525189c285ee04495d628035' 'e529742c0a425648087bc3ce537fe4c5' 'f1c76e7e244257856a386ca2de69bdf0' '0d053487907de4376d67d8f499c5502b') @@ -110,6 +111,20 @@ fi sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in + # This is a bug, we should fix it. + if [ "$CARCH" = "mips64el" ]; then + # Fix MIPS N32 support. + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + js/src/assembler/wtf/Platform.h + # Disable JIT. + sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \ + js/src/assembler/wtf/Platform.h + sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in + echo 'ac_add_options --disable-methodjit' >> .mozconfig + echo 'ac_add_options --disable-tracejit' >> .mozconfig + echo 'ac_add_options --disable-jemalloc' >> .mozconfig + fi + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" diff --git a/libre/iceweasel-libre/gcc47.patch b/libre/iceweasel-libre/gcc47.patch new file mode 100644 index 000000000..829d59510 --- /dev/null +++ b/libre/iceweasel-libre/gcc47.patch @@ -0,0 +1,75 @@ + +# HG changeset patch +# User Martin Stránský +# Date 1328886461 -3600 +# Node ID 87a5ed480992788832387ba91a77c69fbe9fe349 +# Parent 67017dd3b7f6650e6bcd5b6f545e0309e8de7049 +Bug 725655 - gcc 4.7 build failures (missing headers). r=benjamin + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/file_util.h" + + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + #include + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include + #include ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include + #endif + #include + #ifdef ANDROID + #include + #else + #include + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include ++#endif + + #include + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index c1bb0a8c7..ecebbb3ce 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -9,12 +9,12 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); --pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); -++pref("extensions.getAddons.get.url", ""); -++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); ++pref("extensions.getAddons.get.url", ""); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); // Blocklist preferences pref("extensions.blocklist.enabled", true); @@ -135,23 +135,23 @@ diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/la diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js --- mozilla-build/mobile/xul/app/mobile.js.orig 2012-03-20 01:02:30.300551777 -0300 +++ mozilla-build/mobile/xul/app/mobile.js 2012-03-20 01:02:40.820551342 -0300 -@@ -218,13 +218,12 @@ +@@ -220,13 +220,12 @@ /* preferences for the Get Add-ons pane */ pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%"); -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); -++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); /* preference for the locale picker */ pref("extensions.getLocales.get.url", ""); -- cgit v1.2.3-54-g00ecf