Author: glen Date: Sun Aug 28 20:13:40 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- install xpt.py, from https://bugzilla.mozilla.org/show_bug.cgi?id=639554
---- Files affected:
packages/xulrunner:
xulrunner-install.patch (1.12 -> 1.13)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.12
packages/xulrunner/xulrunner-install.patch:1.13
--- packages/xulrunner/xulrunner-install.patch:1.12 Sun Aug 28 12:59:37 2011
+++ packages/xulrunner/xulrunner-install.patch Sun Aug 28 22:13:34 2011
@@ -1,5 +1,5 @@
---- xulrunner-6.0/mozilla/toolkit/mozapps/installer/packager.mk
2011-08-28 13:50:44.993448811 +0300
-+++ xulrunner-6.0/mozilla/toolkit/mozapps/installer/packager.mk
2011-08-28 13:53:53.825505243 +0300
+--- xulrunner-6.0/mozilla/toolkit/mozapps/installer/packager.mk
2011-08-28 13:53:53.825505243 +0300
++++ xulrunner-6.0/mozilla/toolkit/mozapps/installer/packager.mk
2011-08-28 21:49:24.108430943 +0300
@@ -612,7 +612,7 @@
@$(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...
@@ -9,7 +9,7 @@
endif
else
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-@@ -699,24 +699,27 @@
+@@ -699,24 +699,31 @@
cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
@@ -32,16 +32,20 @@
+ cp -rfLp $(DIST)/idl/* $(DESTDIR)$(idldir)
# SDK directory is the libs + a bunch of symlinks
$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
++ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
if test -f $(DIST)/include/xpcom-config.h; then \
$(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h
$(DESTDIR)$(sdkdir); \
fi
- (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd
$(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
+ cp -rfLp $(DIST)/sdk/lib/* $(DESTDIR)$(sdkdir)/sdk/lib
++ cp -rfLp $(DIST)/sdk/bin/* $(DESTDIR)$(sdkdir)/sdk/bin
+ # replace copies with symlinks
+ ln -sf $(installdir)/libmozjs.so $(DESTDIR)$(sdkdir)/sdk/lib/libmozjs.so
+ ln -sf $(installdir)/libxpcom.so $(DESTDIR)$(sdkdir)/sdk/lib/libxpcom.so
+ ln -sf $(installdir)/libxul.so $(DESTDIR)$(sdkdir)/sdk/lib/libxul.so
+ ln -sf $(installdir)/libmozalloc.so
$(DESTDIR)$(sdkdir)/sdk/lib/libmozalloc.so
++ ln -sf $(installdir)/xpidl $(DESTDIR)$(sdkdir)/sdk/bin
++ chmod a+rx $(DESTDIR)$(sdkdir)/sdk/bin/xpt.py # temp fix for
https://bugzilla.mozilla.org/show_bug.cgi?id=639554
$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin
$(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include
$(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
