commit a86b095117b283cecff8c86dc47a9cb0966ab17a
Author: Jakub Bogusz <[email protected]>
Date: Sun Dec 28 12:28:21 2014 +0100
- up to 34.0.5; shared_js is buildable again
mozilla-firefox-packaging.patch | 26 +++++++++++++++++++-------
mozilla-firefox-prefs.patch | 4 ++--
mozilla-firefox.spec | 15 ++++++++-------
3 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index d978175..14f194d 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -10,8 +10,7 @@
%bcond_with gtk3 # GTK+ 3.x instead of 2.x
%bcond_without kerberos # disable krb5 support
%bcond_with xulrunner # system xulrunner [no longer supported]
-# - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
-%bcond_with shared_js # shared libmozjs library [broken]
+%bcond_without shared_js # shared libmozjs library
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -24,12 +23,12 @@
Summary: Firefox Community Edition web browser
Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW
Name: mozilla-firefox
-Version: 33.1.1
+Version: 34.0.5
Release: 1
License: MPL v2.0
Group: X11/Applications/Networking
Source0:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 2c23350a10d508f1d9b9a5f82df5dd93
+# Source0-md5: d9b7e4819899e23466f5b0750408f128
Source3: %{name}.desktop
Source4: %{name}.sh
Source5: vendor.js
@@ -79,11 +78,12 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(libffi) >= 3.0.9
BuildRequires: pulseaudio-devel
BuildRequires: python-modules >= 1:2.5
+BuildRequires: python-simplejson
BuildRequires: python-virtualenv >= 1.9.1-4
BuildRequires: readline-devel
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: sqlite3-devel >= 3.8.5
+BuildRequires: sqlite3-devel >= 3.8.6
BuildRequires: startup-notification-devel >= 0.8
BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
@@ -130,7 +130,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoprovfiles %{_libdir}/mozilla-firefox
%if %{without xulrunner}
# and as we don't provide them, don't require either
-%define _noautoreq libmozalloc.so libmozjs.so libxpcom.so
libxul.so
+%define _noautoreq libmozalloc.so libmozjs.so
libmozsandbox.so libxul.so
%endif
%description
@@ -242,6 +242,7 @@ ac_add_options --with-libxul-sdk=$(pkg-config
--variable=sdkdir libxul)
%endif
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
ac_add_options --with-system-jpeg
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
@@ -250,7 +251,6 @@ ac_add_options --with-system-nss
ac_add_options --with-system-ply
ac_add_options --with-system-png
ac_add_options --with-system-zlib
-ac_add_options --with-system-icu
ac_add_options --with-x
EOF
@@ -438,6 +438,7 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
%{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
+%attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
diff --git a/mozilla-firefox-packaging.patch b/mozilla-firefox-packaging.patch
index 0cb79ff..b2037d4 100644
--- a/mozilla-firefox-packaging.patch
+++ b/mozilla-firefox-packaging.patch
@@ -19,7 +19,7 @@
@BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
@BINPATH@/browser/searchplugins/*
#ifdef XP_WIN32
-@@ -51,17 +55,23 @@
+@@ -51,28 +55,34 @@
#endif
[xpcom]
@@ -30,30 +30,41 @@
@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
#endif
+#ifndef LIBXUL_SDK
+ #ifdef XP_MACOSX
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ #else
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
+ #endif
+#endif
#ifdef MOZ_SHARED_MOZGLUE
+ #ifdef XP_MACOSX
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@mozglue@DLL_SUFFIX@
+ #else
@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
#endif
+ #endif
#ifndef MOZ_STATIC_JS
+#ifndef LIBXUL_SDK
+ #ifdef XP_MACOSX
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #else
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
#endif
+#endif
- #ifdef MOZ_DMD
- @BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@
#endif
+ #ifdef MOZ_DMD
+ #ifdef XP_MACOSX
@@ -75,14 +85,18 @@
#ifdef XP_MACOSX
- @BINPATH@/XUL
+ @APPNAME@/Contents/MacOS/XUL
#else
+#ifndef LIBXUL_SDK
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
#endif
+#endif
#ifdef XP_MACOSX
- @BINPATH@/@[email protected]/
- @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
+ @APPNAME@/Contents/MacOS/@[email protected]/
+ @APPNAME@/Contents/MacOS/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
#else
+#ifndef LIBXUL_SDK
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@
@@ -88,13 +99,14 @@
@BINPATH@/components/alerts.xpt
#ifdef ACCESSIBILITY
#ifdef XP_WIN32
-@@ -162,8 +181,10 @@
+@@ -162,9 +181,11 @@
@BINPATH@/components/appstartup.xpt
@BINPATH@/components/autocomplete.xpt
@BINPATH@/components/autoconfig.xpt
+#endif
@BINPATH@/browser/components/browsercompsbase.xpt
@BINPATH@/browser/components/browser-feeds.xpt
+ @BINPATH@/browser/components/browsermodules.manifest
+#ifndef LIBXUL_SDK
@BINPATH@/components/caps.xpt
@BINPATH@/components/chrome.xpt
diff --git a/mozilla-firefox-prefs.patch b/mozilla-firefox-prefs.patch
index d8cc277..2bfe3f6 100644
--- a/mozilla-firefox-prefs.patch
+++ b/mozilla-firefox-prefs.patch
@@ -63,8 +63,8 @@ diff -ur
mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd mozill
<button
id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
+<button
id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
">
---- a/modules/libpref/src/init/all.js
-+++ b/modules/libpref/src/init/all.js
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
@@ -1510,7 +1510,7 @@ pref("layout.css.visited_links_enabled", true);
// A value of 0 means use the system DPI. A positive value is used as the DPI.
// This sets the physical size of a device pixel and thus controls the
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozilla-firefox.git/commitdiff/a86b095117b283cecff8c86dc47a9cb0966ab17a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
