Author: qboosh Date: Tue Mar 13 14:12:47 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- removed xpidl remnants from install patch
---- Files affected:
packages/xulrunner:
xulrunner.spec (1.221 -> 1.222) , xulrunner-install.patch (1.14 -> 1.15)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.221
packages/xulrunner/xulrunner.spec:1.222
--- packages/xulrunner/xulrunner.spec:1.221 Sun Mar 4 15:09:43 2012
+++ packages/xulrunner/xulrunner.spec Tue Mar 13 15:12:42 2012
@@ -425,6 +425,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.222 2012/03/13 14:12:42 qboosh
+- removed xpidl remnants from install patch
+
Revision 1.221 2012/03/04 14:09:43 arekm
- rel 3; fix for new vpx
================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.14
packages/xulrunner/xulrunner-install.patch:1.15
--- packages/xulrunner/xulrunner-install.patch:1.14 Wed Sep 28 11:18:08 2011
+++ packages/xulrunner/xulrunner-install.patch Tue Mar 13 15:12:42 2012
@@ -9,7 +9,7 @@
endif
else
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-@@ -725,26 +725,31 @@
+@@ -725,26 +725,29 @@
cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
@@ -20,7 +20,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)/xpidl $(DESTDIR)$(bindir)/xpidl
ifdef INSTALL_SDK # Here comes the hard part
$(NSINSTALL) -D $(DESTDIR)$(includedir)
- (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
@@ -45,7 +44,6 @@
+ 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=63955
$(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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.221&r2=1.222&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
