packages: xulrunner/xulrunner-install.patch, xulrunner/xulrunner-pc.patch, ...

megabajt megabajt at pld-linux.org
Wed Mar 23 18:21:37 CET 2011 

Author: megabajt                     Date: Wed Mar 23 17:21:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 2.0

---- Files affected:
packages/xulrunner:
   xulrunner-install.patch (1.9 -> 1.10) , xulrunner-pc.patch (1.12 -> 1.13) , xulrunner-rpath.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.9 packages/xulrunner/xulrunner-install.patch:1.10
--- packages/xulrunner/xulrunner-install.patch:1.9	Fri Sep 24 07:21:45 2010
+++ packages/xulrunner/xulrunner-install.patch	Wed Mar 23 18:21:32 2011
@@ -1,35 +1,38 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.org	2010-01-21 13:25:04.436839154 +0100
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2010-01-21 13:32:14.673453287 +0100
-@@ -362,11 +362,11 @@
+diff -urN mozilla-2.0/toolkit//mozapps/installer/packager.mk mozilla-2.0.new/toolkit//mozapps/installer/packager.mk
+--- mozilla-2.0/toolkit//mozapps/installer/packager.mk	2011-03-19 00:34:12.000000000 +0100
++++ mozilla-2.0.new/toolkit//mozapps/installer/packager.mk	2011-03-23 16:13:50.400006328 +0100
+@@ -500,14 +500,14 @@
  # NOTE: this must be a tar now that dist links into the tree so that we
  # do not strip the binaries actually in the tree.
  	@echo "Creating package directory..."
 -	@mkdir $(DIST)/$(MOZ_PKG_DIR)
 +	@mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR) $(DESTDIR)/$(MOZ_PKG_APPDIR)
+ ifndef UNIVERSAL_BINARY
+ # If UNIVERSAL_BINARY, the package will be made from an already-prepared
+ # STAGEPATH
  ifdef MOZ_PKG_MANIFEST
- 	$(RM) -rf $(DIST)/xpt
+ 	$(RM) -rf $(DIST)/xpt $(RM) -rf $(DIST)/manifests
  	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
--		 "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-+		 "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
- 		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+-	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
+ 	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
  	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
- else # !MOZ_PKG_MANIFEST
-@@ -377,11 +377,11 @@
- ifndef STAGE_SDK
- 	@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+ 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
+@@ -529,10 +529,10 @@
+ 	@$(NSINSTALL) -D $(DIST)/xpt
+ 	@($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/.  Continuing...
  else
 -	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 +	cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  endif
- endif
  else
 -	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 +	cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
  	@echo "Linking XPT files..."
  	@rm -rf $(DIST)/xpt
  	@$(NSINSTALL) -D $(DIST)/xpt
-@@ -450,24 +450,27 @@
- 	$(error "make install" is not supported on this platform. Use "make package" instead.)
+@@ -620,24 +620,26 @@
+ 	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)
 -	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
@@ -38,7 +41,6 @@
  	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
 -	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
 +	ln -s $(installdir)/$(MOZ_APP_NAME)-bin $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
-+	ln -s $(MOZ_PKG_APPDIR)/regxpcom $(DESTDIR)$(bindir)/regxpcom
 +	ln -s $(MOZ_PKG_APPDIR)/xpidl $(DESTDIR)$(bindir)/xpidl
 +	ln -s $(MOZ_PKG_APPDIR)/xpt_dump $(DESTDIR)$(bindir)/xpt_dump
 +	ln -s $(MOZ_PKG_APPDIR)/xpt_link $(DESTDIR)$(bindir)/xpt_link

================================================================
Index: packages/xulrunner/xulrunner-pc.patch
diff -u packages/xulrunner/xulrunner-pc.patch:1.12 packages/xulrunner/xulrunner-pc.patch:1.13
--- packages/xulrunner/xulrunner-pc.patch:1.12	Sat Dec 11 13:56:04 2010
+++ packages/xulrunner/xulrunner-pc.patch	Wed Mar 23 18:21:32 2011
@@ -1,24 +1,16 @@
---- mozilla/xulrunner/installer/Makefile.in	2008-04-10 16:50:48.000000000 +0200
-+++ mozilla.new/xulrunner/installer/Makefile.in	2008-07-07 20:01:44.000000000 +0200
-@@ -116,6 +116,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)|" \
---- mozilla/xulrunner/installer/libxul-embedding.pc.in	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla.new/xulrunner/installer/libxul-embedding.pc.in	2008-07-07 19:59:11.000000000 +0200
-@@ -11,5 +11,6 @@
+diff -urN mozilla-2.0/xulrunner//installer/libxul-embedding.pc.in mozilla-2.0.new/xulrunner//installer/libxul-embedding.pc.in
+--- mozilla-2.0/xulrunner//installer/libxul-embedding.pc.in	2011-03-19 00:34:14.000000000 +0100
++++ mozilla-2.0.new/xulrunner//installer/libxul-embedding.pc.in	2011-03-23 16:24:51.283327032 +0100
+@@ -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}/${includetype} -fshort-wchar
---- mozilla/xulrunner/installer/libxul.pc.in	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla.new/xulrunner/installer/libxul.pc.in	2008-07-07 20:00:09.000000000 +0200
+ Libs: -L${sdkdir}/lib -lxpcomglue -ldl
+ Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
+diff -urN mozilla-2.0/xulrunner//installer/libxul.pc.in mozilla-2.0.new/xulrunner//installer/libxul.pc.in
+--- mozilla-2.0/xulrunner//installer/libxul.pc.in	2011-03-19 00:34:14.000000000 +0100
++++ mozilla-2.0.new/xulrunner//installer/libxul.pc.in	2011-03-23 16:25:09.856665406 +0100
 @@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -26,28 +18,32 @@
  includedir=%includedir%
  idldir=%idldir%
  
---- mozilla/xulrunner/installer/mozilla-nspr.pc.in	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla.new/xulrunner/installer/mozilla-nspr.pc.in	2008-07-07 19:56:15.000000000 +0200
-@@ -7,5 +7,3 @@
- Version: %NSPR_VERSION%
- Libs: %FULL_NSPR_LIBS%
- Cflags: %FULL_NSPR_CFLAGS%
--
--
---- mozilla/xulrunner/installer/mozilla-plugin.pc.in~	2010-12-03 17:49:21.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2010-12-11 15:50:37.836516484 +0200
-@@ -5,5 +5,5 @@
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
- Version: %MOZILLA_VERSION%
--Cflags: -I${includedir} -DXP_UNIX %ojidef%
-+Cflags: -I${includedir} -I${includedir}/plugin -DXP_UNIX %ojidef%
- 
---- mozilla/xulrunner/installer/mozilla-js.pc.in	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla.new/xulrunner/installer/mozilla-js.pc.in	2009-02-18 23:15:40.681314523 +0100
+diff -urN mozilla-2.0/xulrunner//installer/Makefile.in mozilla-2.0.new/xulrunner//installer/Makefile.in
+--- mozilla-2.0/xulrunner//installer/Makefile.in	2011-03-19 00:34:14.000000000 +0100
++++ mozilla-2.0.new/xulrunner//installer/Makefile.in	2011-03-23 16:24:31.433331250 +0100
+@@ -121,6 +121,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 -urN mozilla-2.0/xulrunner//installer/mozilla-js.pc.in mozilla-2.0.new/xulrunner//installer/mozilla-js.pc.in
+--- mozilla-2.0/xulrunner//installer/mozilla-js.pc.in	2011-03-19 00:34:14.000000000 +0100
++++ mozilla-2.0.new/xulrunner//installer/mozilla-js.pc.in	2011-03-23 16:26:25.390008869 +0100
 @@ -7,4 +7,4 @@
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lmozjs
+ Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
 -Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
 +Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+diff -urN mozilla-2.0/xulrunner//installer/mozilla-plugin.pc.in mozilla-2.0.new/xulrunner//installer/mozilla-plugin.pc.in
+--- mozilla-2.0/xulrunner//installer/mozilla-plugin.pc.in	2011-03-19 00:34:14.000000000 +0100
++++ mozilla-2.0.new/xulrunner//installer/mozilla-plugin.pc.in	2011-03-23 16:26:00.333333556 +0100
+@@ -5,4 +5,4 @@
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+-Cflags: -I${includedir} -DXP_UNIX
++Cflags: -I${includedir} -I${includedir}/plugin -DXP_UNIX

================================================================
Index: packages/xulrunner/xulrunner-rpath.patch
diff -u packages/xulrunner/xulrunner-rpath.patch:1.4 packages/xulrunner/xulrunner-rpath.patch:1.5
--- packages/xulrunner/xulrunner-rpath.patch:1.4	Tue Jun 30 20:28:24 2009
+++ packages/xulrunner/xulrunner-rpath.patch	Wed Mar 23 18:21:32 2011
@@ -1,22 +1,22 @@
---- mozilla/configure.in.orig	2009-06-24 10:20:32.000000000 +0200
-+++ mozilla/configure.in	2009-06-28 19:07:33.000000000 +0200
-@@ -1000,7 +1000,7 @@
- 
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
+--- mozilla-2.0/configure.in	2011-03-19 00:33:33.000000000 +0100
++++ mozilla-2.0.new/configure.in	2011-03-23 16:18:45.746667659 +0100
+@@ -1229,7 +1229,7 @@
+ MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
+ MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
 -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath,$(installdir)'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
  LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
  XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
---- mozilla/configure.orig	2009-06-24 10:29:48.000000000 +0200
-+++ mozilla/configure	2009-06-28 19:07:50.000000000 +0200
-@@ -5185,7 +5185,7 @@
- 
- MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
+--- mozilla-2.0/configure	2011-03-19 00:48:56.000000000 +0100
++++ mozilla-2.0.new/configure	2011-03-23 16:19:10.449995855 +0100
+@@ -5856,7 +5856,7 @@
+ MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
+ MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
 -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath,$(installdir)'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
  LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
  XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-pc.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-rpath.patch?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list