Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f1adb54a4f4a95aeae3a5711712d74ca5ecb9651
commit f1adb54a4f4a95aeae3a5711712d74ca5ecb9651 Author: kikadf <[email protected]> Date: Wed Sep 10 14:05:22 2014 +0200 firefox-32.0-2-x86_64 * Fix build on i686: remove --disable-optimize * add --enable-unified-compilation diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 8019321..5bde3aa 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -8,7 +8,7 @@ options+=('asneeded') pkgname=firefox pkgver=32.0 pathver=${pkgver} # version used in path names -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/"; depends=('libevent' 'hunspell' 'libidl' 'desktop-file-utils' 'nss>=3.16' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.9.2' \ @@ -29,6 +29,13 @@ source=(http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/f signatures=("${source[0]}.asc" '' '' '' '') options=('scriptlet') + +if [ "$CARCH" == "i686" ]; then + source+=(fix-compile-in-unified-mode.patch) + signatures+=('') +fi + + build() { Fcd mozilla-release @@ -45,7 +52,7 @@ build() { if [ "$CARCH" == "i686" ]; then LDFLAGS+=" -Wl,--no-keep-memory" - Fsed 'ac_add_options --disable-updater' 'ac_add_options --disable-updater\nac_add_options --disable-optimize' .mozconfig + Fsed 'ac_add_options --disable-updater' 'ac_add_options --disable-updater\nac_add_options --enable-unified-compilation' .mozconfig fi export MOZILLA_OFFICIAL=1 diff --git a/source/xapps/firefox/fix-compile-in-unified-mode.patch b/source/xapps/firefox/fix-compile-in-unified-mode.patch new file mode 100644 index 0000000..b130914 --- /dev/null +++ b/source/xapps/firefox/fix-compile-in-unified-mode.patch @@ -0,0 +1,21 @@ +Index: firefox-32.0~b9+build1/accessible/src/base/TextRange.cpp +=================================================================== +--- firefox-32.0~b9+build1.orig/accessible/src/base/TextRange.cpp 2014-08-30 00:41:16.000000000 +0100 ++++ firefox-32.0~b9+build1/accessible/src/base/TextRange.cpp 2014-08-30 09:57:49.910751230 +0100 +@@ -10,7 +10,8 @@ + #include "HyperTextAccessible.h" + #include "nsAccUtils.h" + +-using namespace mozilla::a11y; ++namespace mozilla { ++namespace a11y { + + //////////////////////////////////////////////////////////////////////////////// + // TextPoint +@@ -294,3 +295,6 @@ + { + + } ++ ++} // namespace a11y ++} // namespace mozilla _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
