[packages/xulrunner] - updated to 20.0.1

baggins baggins at pld-linux.org
Wed Apr 17 22:33:45 CEST 2013


commit 7cc87f7941f6079efbdf4d9423d9446cf182b239
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Apr 17 22:33:26 2013 +0200

    - updated to 20.0.1

 xulrunner-gyp-slashism.patch |  4 ++--
 xulrunner-install.patch      | 12 ++++++------
 xulrunner.spec               |  7 ++++---
 3 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 47ab6e3..f21a4af 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,7 +23,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:	19.0
+Version:	20.0.1
 Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -31,7 +31,7 @@ Group:		X11/Applications
 # 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:	3dc732b6ce177792b43324f4bc7164d8
+# Source0-md5:	b822ff4b2348410587dec563235d9320
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-paths.patch
@@ -79,7 +79,7 @@ BuildRequires:	python-virtualenv >= 1.8.4-2
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.7.14.1
+BuildRequires:	sqlite3-devel >= 3.7.15.2
 BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	unzip
 %if "%{pld_release}" == "ac"
@@ -315,6 +315,7 @@ touch obj-%{_target_cpu}/dist/sdk/empty.pyc
 ln -sf %{_libdir}/%{name}/xulrunner $RPM_BUILD_ROOT%{_bindir}/xulrunner
 
 install -d \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/components \
 	$RPM_BUILD_ROOT%{_sbindir}
 
diff --git a/xulrunner-gyp-slashism.patch b/xulrunner-gyp-slashism.patch
index ccab456..4c2f0ff 100644
--- a/xulrunner-gyp-slashism.patch
+++ b/xulrunner-gyp-slashism.patch
@@ -40,9 +40,9 @@
                    # doesn't actually exist in the source directory
 -                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
 +                  swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
-                   self.relative_srcdir)
+                   self.relative_srcdir,
+                   self.common_mk_path)
      return True
- 
 @@ -399,7 +405,7 @@
    # The relative path from objdir to gyp_file_dir
    srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
diff --git a/xulrunner-install.patch b/xulrunner-install.patch
index e741271..51923c4 100644
--- a/xulrunner-install.patch
+++ b/xulrunner-install.patch
@@ -4,7 +4,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
--	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
+-	@cd $(DIST)/bin && $(TAR) $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 +	cp -rfLp $(DIST)/bin/* $(MOZ_PKG_DIR)
  endif
  else
@@ -13,7 +13,7 @@
  	$(error "make install" is not supported on this platform. Use "make package" instead.)
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)
--	(cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
+-	(cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
 -	  (cd $(DESTDIR)$(installdir) && tar -xf -)
 +	cp -rfLp $(DIST)/$(MOZ_PKG_DIR)/* $(DESTDIR)$(installdir)
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
@@ -22,11 +22,11 @@
 +	ln -s $(installdir)/$(MOZ_APP_NAME)-bin $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
  ifdef INSTALL_SDK # Here comes the hard part
  	$(NSINSTALL) -D $(DESTDIR)$(includedir)
--	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+-	(cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
 -	  (cd $(DESTDIR)$(includedir) && tar -xf -)
 +	cp -rfLp $(DIST)/include/* $(DESTDIR)$(includedir)
  	$(NSINSTALL) -D $(DESTDIR)$(idldir)
--	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
+-	(cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \
 -	  (cd $(DESTDIR)$(idldir) && tar -xf -)
 +	cp -rfLp $(DIST)/idl/* $(DESTDIR)$(idldir)
  # SDK directory is the libs + a bunch of symlinks
@@ -36,8 +36,8 @@
  	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
  	fi
  	find $(DIST)/sdk -name "*.pyc" | xargs rm -f
--	(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 -)
+-	(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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/7cc87f7941f6079efbdf4d9423d9446cf182b239



More information about the pld-cvs-commit mailing list