[xulrunner] Added fix for rhbz#872752

Martin Stransky stransky at fedoraproject.org
Tue Nov 6 14:29:29 UTC 2012


commit b20671cea61761f9254ed68136dcc7e4ab7b129f
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Nov 6 15:29:25 2012 +0100

    Added fix for rhbz#872752

 rhbz-872752.patch |   22 ++++++++++++++++++++++
 xulrunner.spec    |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/rhbz-872752.patch b/rhbz-872752.patch
new file mode 100644
index 0000000..86bfdd7
--- /dev/null
+++ b/rhbz-872752.patch
@@ -0,0 +1,22 @@
+diff -up mozilla-beta/xulrunner/installer/libxul-embedding.pc.in.embedlink mozilla-beta/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla-beta/xulrunner/installer/libxul-embedding.pc.in.embedlink	2012-11-06 14:51:44.000000000 +0100
++++ mozilla-beta/xulrunner/installer/libxul-embedding.pc.in	2012-11-06 14:58:04.560608699 +0100
+@@ -7,5 +7,5 @@ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue -ldl
++Libs: -L${sdkdir}/lib -lxpcomglue -Wl,--whole-archive -lmozglue -lmemory -Wl,--no-whole-archive -ldl 
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff -up mozilla-beta/xulrunner/installer/Makefile.in.embedlink mozilla-beta/xulrunner/installer/Makefile.in
+--- mozilla-beta/xulrunner/installer/Makefile.in.embedlink	2012-11-06 14:51:44.528600028 +0100
++++ mozilla-beta/xulrunner/installer/Makefile.in	2012-11-06 14:51:44.535600028 +0100
+@@ -64,7 +64,7 @@ FULL_NSPR_LIBS=$(subst $(prefix),\$${sdk
+ NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
+ endif
+ 
+-MOZ_XUL_LINK = -lxpcomglue_s -lxul -lxpcom -lmozalloc
++MOZ_XUL_LINK = -lxpcomglue_s -Wl,--whole-archive -lmozglue -lmemory -Wl,--no-whole-archive -lxul -lxpcom -lmozalloc
+ ifdef JS_SHARED_LIBRARY
+ MOZ_JS_LINK = -lmozjs
+ else
diff --git a/xulrunner.spec b/xulrunner.spec
index eb5d47d..eb15807 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -75,7 +75,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        16.0.2
-Release:        2%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -95,6 +95,7 @@ Patch18:        xulrunner-16.0-jemalloc-ppc.patch
 
 # Fedora specific patches
 Patch20:        mozilla-193-pkgconfig.patch
+Patch21:        rhbz-872752.patch
 
 # Upstream patches
 Patch49:        mozilla-746112.patch
@@ -227,6 +228,7 @@ cd %{tarballdir}
 %patch18 -p2 -b .jemalloc-ppc
 
 %patch20 -p2 -b .pk
+%patch21 -p1 -b .872752
 
 %patch49 -p1 -b .746112
 %patch51 -p1 -b .709732
@@ -500,6 +502,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Nov 6 2012 Martin Stransky <stransky at redhat.com> - 16.0.2-2
+- Added fix for rhbz#872752
+
 * Wed Oct 31 2012 Martin Stransky <stransky at redhat.com> - 16.0.2-1
 - Updated mozilla-746112.patch for second arches
 - Removed unused one (rhbz#855919)


More information about the scm-commits mailing list