commit 45b778be2738bca9c7bb21e21b70d29a80c5b698
Author: Jakub Bogusz <[email protected]>
Date: Mon Nov 25 19:39:22 2013 +0100
- added new-libxul patch (use just built libxul for xptcshell, overriding
system one)
xulrunner-new-libxul.patch | 11 +++++++++++
xulrunner.spec | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 44ab7d6..576ee68 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -26,6 +26,7 @@ Group: X11/Applications
# instead of waiting for mozilla to copy file on ftp.
Source0:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
# Source0-md5: b5b57d3ea937a339e0ed7ebea604b430
+Patch0: %{name}-new-libxul.patch
Patch1: %{name}-rpath.patch
Patch2: %{name}-paths.patch
Patch3: %{name}-pc.patch
@@ -87,7 +88,6 @@ BuildRequires: xorg-lib-libXt-devel
BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
BuildConflicts: xulrunner-devel < %{epoch}:%{name}-%{version}
-BuildConflicts: xulrunner-libs < %{epoch}:%{name}-%{version}
Requires(post): mktemp >= 1.5-18
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: browser-plugins >= 2.0
@@ -182,6 +182,7 @@ cd mozilla
# hunspell needed for factory including mozHunspell.h
echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >>
extensions/spellcheck/src/Makefile.in
+%patch0 -p1
%patch1 -p1
%patch2 -p2
%patch3 -p1
diff --git a/xulrunner-new-libxul.patch b/xulrunner-new-libxul.patch
new file mode 100644
index 0000000..23a9cf3
--- /dev/null
+++ b/xulrunner-new-libxul.patch
@@ -0,0 +1,11 @@
+--- mozilla/toolkit/mozapps/installer/packager.py.orig 2013-11-13
01:14:17.000000000 +0100
++++ mozilla/toolkit/mozapps/installer/packager.py 2013-11-24
14:15:29.769622782 +0100
+@@ -144,7 +144,7 @@
+ '-e', 'precompile_startupcache("resource://%s/");'
+ % resource],
+ extra_linker_path=gre_path,
+- extra_env={'MOZ_STARTUP_CACHE': cache}):
++ extra_env={'MOZ_STARTUP_CACHE': cache,
'LD_PRELOAD': os.path.join(gre_path, 'libxul.so')}):
+ errors.fatal('Error while running startup cache precompilation')
+ return
+ from mozpack.mozjar import JarReader
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/45b778be2738bca9c7bb21e21b70d29a80c5b698
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
