[arch-commits] Commit in xulrunner/repos (3 files)

Jan de Groot jgc at archlinux.org
Wed Jul 1 20:48:47 UTC 2009 

    Date: Wednesday, July 1, 2009 @ 16:48:47
  Author: jgc
Revision: 44371

Merged revisions 44370 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xulrunner/trunk

........
  r44370 | jgc | 2009-07-01 22:48:29 +0200 (Wed, 01 Jul 2009) | 2 lines
  
  upgpkg: xulrunner 1.9.1-2
      Fix pkgconfig files
........

Modified:
  xulrunner/repos/testing-x86_64/	(properties)
  xulrunner/repos/testing-x86_64/PKGBUILD
  xulrunner/repos/testing-x86_64/mozilla-pkgconfig.patch

-------------------------+
 PKGBUILD                |    2 
 mozilla-pkgconfig.patch |  115 +++++++++++++++++++++++++++++-----------------
 2 files changed, 75 insertions(+), 42 deletions(-)


Property changes on: xulrunner/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xulrunner/trunk:1-44351
   + /xulrunner/trunk:1-44370

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-07-01 20:48:29 UTC (rev 44370)
+++ testing-x86_64/PKGBUILD	2009-07-01 20:48:47 UTC (rev 44371)
@@ -24,7 +24,7 @@
 md5sums=('6dd59399db08963ef022a1d0e5010053'
          'ed5045e94a7ef2a2c7d0c8c54581cd63'
          '5efd6772ed0ecf8eddec5d5650191d3c'
-         'ecd71710966203bd1550d68b0c485f73'
+         'd806ffcd9fa8d178ebfa9057c1221fbf'
          '63eee2d1da3b43c9d604f2253f242f40'
          '13dca58c04e62a8916691c63c5c492a0'
          'ccc3a0672c783c043434f256fbd38c86')

Modified: testing-x86_64/mozilla-pkgconfig.patch
===================================================================
--- testing-x86_64/mozilla-pkgconfig.patch	2009-07-01 20:48:29 UTC (rev 44370)
+++ testing-x86_64/mozilla-pkgconfig.patch	2009-07-01 20:48:47 UTC (rev 44371)
@@ -1,6 +1,34 @@
-diff -ruN mozilla/xulrunner/installer/libxul-embedding.pc.in mozilla/xulrunner/installer/libxul-embedding.pc.in
---- mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-07-16 20:27:31.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-07-16 21:43:47.000000000 +0200
+diff -r f1af606531f5 xulrunner/installer/Makefile.in
+--- a/xulrunner/installer/Makefile.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/Makefile.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -116,6 +118,7 @@
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
+diff -r f1af606531f5 xulrunner/installer/libxul-embedding-unstable.pc.in
+--- a/xulrunner/installer/libxul-embedding-unstable.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul-embedding-unstable.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,11 +1,12 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+diff -r f1af606531f5 xulrunner/installer/libxul-embedding.pc.in
+--- a/xulrunner/installer/libxul-embedding.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul-embedding.pc.in	Mon Dec 01 22:30:12 2008 -0500
 @@ -1,7 +1,7 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -10,21 +38,30 @@
  includetype=stable
  
  # Note: the default pkg-config cflags will only list include directories
-diff -ruN mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-07-16 20:27:31.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-07-16 21:44:06.000000000 +0200
-@@ -1,7 +1,7 @@
+@@ -11,5 +11,6 @@
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
++Libs: -L${sdkdir}/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
+diff -r f1af606531f5 xulrunner/installer/libxul-unstable.pc.in
+--- a/xulrunner/installer/libxul-unstable.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul-unstable.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
 -idldir=%idldir%
 +idldir=%idldir%/unstable
  includetype=unstable
  
- Name: libxul-embedding-unstable
-diff -ruN mozilla/xulrunner/installer/libxul.pc.in mozilla/xulrunner/installer/libxul.pc.in
---- mozilla/xulrunner/installer/libxul.pc.in	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2008-07-16 21:44:33.000000000 +0200
+ Name: libxul
+diff -r f1af606531f5 xulrunner/installer/libxul.pc.in
+--- a/xulrunner/installer/libxul.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/libxul.pc.in	Mon Dec 01 22:30:12 2008 -0500
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -35,33 +72,9 @@
  includetype=stable
  
  # Note: the default pkg-config includes will only list include directories
-diff -ruN mozilla/xulrunner/installer/libxul-unstable.pc.in mozilla/xulrunner/installer/libxul-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-07-16 21:45:11.000000000 +0200
-@@ -1,7 +1,8 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/unstable
- includetype=unstable
- 
- Name: libxul
-diff -ruN mozilla/xulrunner/installer/Makefile.in mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in	2008-07-16 20:27:31.000000000 +0200
-+++ mozilla/xulrunner/installer/Makefile.in	2008-07-16 21:45:51.000000000 +0200
-@@ -125,6 +125,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
-diff -ruN mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2008-07-16 21:46:14.000000000 +0200
+diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	Mon Dec 01 22:30:12 2008 -0500
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -69,9 +82,9 @@
  includedir=%includedir%
  
  Name: mozilla-gtkembedmoz
-diff -ruN mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2008-07-16 21:46:28.000000000 +0200
+diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in	Mon Dec 01 22:30:12 2008 -0500
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -79,3 +92,23 @@
  includedir=%includedir%
  
  Name: mozilla-gtkembedmoz
+diff -r f1af606531f5 xulrunner/installer/mozilla-js.pc.in
+--- a/xulrunner/installer/mozilla-js.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-js.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -6,5 +6,5 @@
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Libs: -L${sdkdir}/lib -lmozjs
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+diff -r f1af606531f5 xulrunner/installer/mozilla-plugin.pc.in
+--- a/xulrunner/installer/mozilla-plugin.pc.in	Sat Nov 22 20:22:22 2008 +0100
++++ b/xulrunner/installer/mozilla-plugin.pc.in	Mon Dec 01 22:30:12 2008 -0500
+@@ -6,4 +6,4 @@
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin

More information about the arch-commits mailing list