diff -r 93fb7400b957 -r f2df98836e17 mozilla-pkgconfig.patch --- a/mozilla-pkgconfig.patch Fri May 21 14:18:47 2010 +0200 +++ b/mozilla-pkgconfig.patch Wed Jun 09 07:53:55 2010 +0200 @@ -24,11 +24,11 @@ # to register xulrunner per-user, override this with $HOME/.gre.d regdir = /etc/gre.d -@@ -116,16 +119,17 @@ endif +@@ -109,16 +112,17 @@ pkg_config_files += mozilla-nss.pc + endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) cat $< | sed \ - -e "s|%ojidef%|$(OJIDEF)|" \ -e "s|%prefix%|$(prefix)|" \ -e "s|%includedir%|$(includedir)|" \ -e "s|%idldir%|$(idldir)|" \ @@ -54,9 +54,9 @@ Name: libxul-embedding Description: Static library for version-independent embedding of the Mozilla runtime Version: %MOZILLA_VERSION% --Libs: -L${sdkdir}/lib -lxpcomglue +-Libs: -L${sdkdir}/lib -lxpcomglue -ldl +Requires: %NSPR_NAME% >= %NSPR_VERSION% -+Libs: -L${sdkdir}/sdk/lib -lxpcomglue ++Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in --- a/xulrunner/installer/libxul.pc.in @@ -115,17 +115,3 @@ -Libs: -L${sdkdir}/lib -lmozjs +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -diff --git a/xulrunner/installer/mozilla-plugin.pc.in b/xulrunner/installer/mozilla-plugin.pc.in ---- a/xulrunner/installer/mozilla-plugin.pc.in -+++ b/xulrunner/installer/mozilla-plugin.pc.in -@@ -1,9 +1,9 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - - Name: Mozilla Plug-In API - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% --Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -+Cflags: -I${includedir} -DXP_UNIX %ojidef% -