Author: lisu Date: Wed Sep 28 09:18:14 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 7.0
---- Files affected:
packages/xulrunner:
xulrunner-install.patch (1.13 -> 1.14) , xulrunner.spec (1.189 -> 1.190)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.13
packages/xulrunner/xulrunner-install.patch:1.14
--- packages/xulrunner/xulrunner-install.patch:1.13 Sun Aug 28 22:13:34 2011
+++ packages/xulrunner/xulrunner-install.patch Wed Sep 28 11:18:08 2011
@@ -1,6 +1,6 @@
---- 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 @@
+--- xulrunner-7.0/mozilla/toolkit/mozapps/installer/packager.mk.orig
2011-09-22 22:20:42.000000000 +0200
++++ xulrunner-7.0/mozilla/toolkit/mozapps/installer/packager.mk
2011-09-28 11:14:05.247518747 +0200
+@@ -632,7 +632,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...
else
@@ -9,7 +9,7 @@
endif
else
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR);
tar -xf -)
-@@ -699,24 +699,31 @@
+@@ -725,26 +725,31 @@
cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
@@ -32,11 +32,12 @@
+ 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
+ $(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 -)
+- (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd
$(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
+ cp -rfLp $(DIST)/sdk/lib/* $(DESTDIR)$(sdkdir)/sdk/lib
+ cp -rfLp $(DIST)/sdk/bin/* $(DESTDIR)$(sdkdir)/sdk/bin
+ # replace copies with symlinks
@@ -45,7 +46,7 @@
+ 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
++ 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
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.189
packages/xulrunner/xulrunner.spec:1.190
--- packages/xulrunner/xulrunner.spec:1.189 Wed Sep 7 21:20:13 2011
+++ packages/xulrunner/xulrunner.spec Wed Sep 28 11:18:08 2011
@@ -22,7 +22,7 @@
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM
applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla
aplikacji XUL+XPCOM
Name: xulrunner
-Version: 6.0.2
+Version: 7.0
Release: 1
Epoch: 2
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -30,7 +30,7 @@
# Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so
lets use it
# instead of waiting for mozilla to copy file on ftp.
Source0:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 140ca0cfd57905139f8f71a527afb283
+# Source0-md5: 673a015a23e3fefa18d80db68c8b9fc1
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
Patch3: %{name}-nss_cflags.patch
@@ -415,6 +415,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.190 2011/09/28 09:18:08 lisu
+- updated to 7.0
+
Revision 1.189 2011/09/07 19:20:13 arekm
- up to 6.0.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.189&r2=1.190&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
