Date: Thursday, January 21, 2010 @ 17:28:18 Author: ibiru Revision: 64698
Merged revisions 64696 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xulrunner/trunk ........ r64696 | ibiru | 2010-01-22 00:25:40 +0200 (Fri, 22 Jan 2010) | 2 lines upgpkg: xulrunner 1.9.2-2 redo pkgconfig patch since we don't want to change paths ........ Modified: xulrunner/repos/testing-x86_64/ (properties) xulrunner/repos/testing-x86_64/PKGBUILD xulrunner/repos/testing-x86_64/mozilla-pkgconfig.patch -------------------------+ PKGBUILD | 4 +- mozilla-pkgconfig.patch | 81 ++++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 44 deletions(-) Property changes on: xulrunner/repos/testing-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /xulrunner/trunk:1-64644 + /xulrunner/trunk:1-64697 Modified: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2010-01-21 22:26:26 UTC (rev 64697) +++ testing-x86_64/PKGBUILD 2010-01-21 22:28:18 UTC (rev 64698) @@ -4,7 +4,7 @@ pkgname=xulrunner pkgver=1.9.2 _ffoxver=3.6 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') @@ -23,7 +23,7 @@ xulrunner-png14.patch) md5sums=('458051557ff49e6a352c1d56eee5782a' 'c99bced771a39690bd71e5e1c1770e73' - 'b747631cbe9d1f5037baeb8a8dcdae35' + 'd92adb0f23e724c1667baecb4cdaea80' '63eee2d1da3b43c9d604f2253f242f40' '13dca58c04e62a8916691c63c5c492a0' '371303c5bdc4fa0d955d14521b93b69d' Modified: testing-x86_64/mozilla-pkgconfig.patch =================================================================== --- testing-x86_64/mozilla-pkgconfig.patch 2010-01-21 22:26:26 UTC (rev 64697) +++ testing-x86_64/mozilla-pkgconfig.patch 2010-01-21 22:28:18 UTC (rev 64698) @@ -1,49 +1,27 @@ -diff -up mozilla-1.9.2/config/autoconf.mk.in.pk mozilla-1.9.2/config/autoconf.mk.in ---- mozilla-1.9.2/config/autoconf.mk.in.pk 2009-11-09 01:33:58.000000000 +0100 -+++ mozilla-1.9.2/config/autoconf.mk.in 2009-11-12 12:49:28.000000000 +0100 -@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION) - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -diff -up mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in.pk mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in 2009-11-12 13:09:18.000000000 +0100 -@@ -6,5 +6,6 @@ idldir=%idldir% +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 22:27:17.000000000 +0200 +@@ -6,5 +6,6 @@ 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 Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -up mozilla-1.9.2/xulrunner/installer/libxul.pc.in.pk mozilla-1.9.2/xulrunner/installer/libxul.pc.in ---- mozilla-1.9.2/xulrunner/installer/libxul.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in 2009-11-12 13:10:03.000000000 +0100 -@@ -2,6 +2,7 @@ prefix=%prefix% +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in mozilla-1.9.2/xulrunner/installer/libxul.pc.in +--- mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in 2010-01-21 22:27:56.000000000 +0200 +@@ -1,5 +1,6 @@ + prefix=%prefix% sdkdir=%sdkdir% ++libdir=%libdir% includedir=%includedir% idldir=%idldir% -+libdir=%libdir% - Name: libxul - Description: The Mozilla Runtime and Embedding Engine -diff -up mozilla-1.9.2/xulrunner/installer/Makefile.in.pk mozilla-1.9.2/xulrunner/installer/Makefile.in ---- mozilla-1.9.2/xulrunner/installer/Makefile.in.pk 2009-11-12 12:49:28.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/Makefile.in 2009-11-12 12:49:28.000000000 +0100 -@@ -123,6 +123,7 @@ endif +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/Makefile.in mozilla-1.9.2/xulrunner/installer/Makefile.in +--- mozilla-1.9.2.orig/xulrunner/installer/Makefile.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/Makefile.in 2010-01-21 22:25:04.000000000 +0200 +@@ -121,6 +121,7 @@ -e "s|%includedir%|$(includedir)|" \ -e "s|%idldir%|$(idldir)|" \ -e "s|%sdkdir%|$(sdkdir)|" \ @@ -51,9 +29,9 @@ -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2009-11-12 12:49:28.000000000 +0100 +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in +--- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 22:28:15.000000000 +0200 @@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% @@ -61,9 +39,9 @@ includedir=%includedir% Name: mozilla-gtkembedmoz -diff -up mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2009-11-09 01:34:25.000000000 +0100 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in 2009-11-12 12:49:28.000000000 +0100 +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in +--- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 22:28:27.000000000 +0200 @@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% @@ -71,3 +49,22 @@ includedir=%includedir% Name: mozilla-gtkembedmoz +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in +--- mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in 2010-01-21 22:29:30.000000000 +0200 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lmozjs +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE +diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in +--- mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 05:31:27.000000000 +0200 ++++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 22:29:58.000000000 +0200 +@@ -5,5 +5,5 @@ + 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% -I${includedir}/java -I${includedir}/plugin +