[jhbuild] [2.32, 3.0] Fixed mozilla-js.pc include path



commit 9c8d8f7c0cfca82b6df71bf8d0715ad4c79d0b4b
Author: Nicolas Dufresne <nicolas dufresne collabora co uk>
Date:   Tue Sep 28 14:15:19 2010 +0200

    [2.32, 3.0] Fixed mozilla-js.pc include path
    
    In xulrunner 1.9.1 the JavaScript engine headers are found in unstable
    folder of the includes directory while mozilla-js.pc says it's in
    stable. This fixes libproxy build against mozilla.

 modulesets/gnome-external-deps-2.32.modules   |    1 +
 modulesets/gnome-external-deps-3.0.modules    |    1 +
 patches/mozilla-1.9.1-mozilla-js-pc-fix.patch |   10 ++++++++++
 3 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-2.32.modules b/modulesets/gnome-external-deps-2.32.modules
index ed8ebe7..06ac9d4 100644
--- a/modulesets/gnome-external-deps-2.32.modules
+++ b/modulesets/gnome-external-deps-2.32.modules
@@ -613,6 +613,7 @@
             hash="sha256:383a3b5fd7f50bd48c96c34950478059c89c5ddad37c9c35a772b80b7c173c66"
             md5sum="284bcdd0411594ba461a21ff7ed481e7" size="47461712"
             checkoutdir="mozilla-1.9.1.11">
+      <patch file="mozilla-1.9.1-mozilla-js-pc-fix.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gtk+"/>
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 7ff846d..451a841 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -614,6 +614,7 @@
             hash="sha256:383a3b5fd7f50bd48c96c34950478059c89c5ddad37c9c35a772b80b7c173c66"
             md5sum="284bcdd0411594ba461a21ff7ed481e7" size="47461712"
             checkoutdir="mozilla-1.9.1.11">
+      <patch file="mozilla-1.9.1-mozilla-js-pc-fix.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="gtk+"/>
diff --git a/patches/mozilla-1.9.1-mozilla-js-pc-fix.patch b/patches/mozilla-1.9.1-mozilla-js-pc-fix.patch
new file mode 100644
index 0000000..f31c7b1
--- /dev/null
+++ b/patches/mozilla-1.9.1-mozilla-js-pc-fix.patch
@@ -0,0 +1,10 @@
+    Fix JavaScript engine header location
+
+--- mozilla-1.9.1.11/xulrunner/installer/mozilla-js.pc.in.orig	2010-09-01 16:45:47.829536589 -0400
++++ mozilla-1.9.1.11/xulrunner/installer/mozilla-js.pc.in	2010-09-01 16:48:33.860536683 -0400
+@@ -7,4 +7,4 @@
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir}/unstable -DXP_UNIX -DJS_THREADSAFE



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]