[packages/xulrunner] - started update to 21.0 - disabled install patch, too much pain to fix it

Tue May 14 22:45:57 CEST 2013

commit 604241ca1f2f7fcdc9d8d31cad2e6037eb870efd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 14 22:45:14 2013 +0200

    - started update to 21.0
    - disabled install patch, too much pain to fix it

 system-virtualenv.patch      | 20 ++++----------------
 xulrunner-gyp-slashism.patch |  9 ---------
 xulrunner-rpath.patch        | 11 -----------
 xulrunner.spec               | 29 ++++++++++++-----------------
 4 files changed, 16 insertions(+), 53 deletions(-)
---

diff --git a/xulrunner.spec b/xulrunner.spec
index f21a4af..37ee520 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,16 +23,15 @@
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	20.0.1
-Release:	1
+Version:	21.0
+Release:	0.1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 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:	b822ff4b2348410587dec563235d9320
-Patch0:		%{name}-install.patch
+# Source0-md5:	6e2510e9466b280c367de0e4c05a8840
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-paths.patch
 Patch3:		%{name}-pc.patch
@@ -188,7 +187,6 @@ cd mozilla
 # hunspell needed for factory including mozHunspell.h
 echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
 
-%patch0 -p2
 %patch1 -p1
 %patch2 -p2
 %patch3 -p1
@@ -300,24 +298,21 @@ EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd mozilla
-
-# work around broken build system
-touch obj-%{_target_cpu}/dist/sdk/empty.pyc
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/components \
+	$RPM_BUILD_ROOT%{_sbindir}
 
-%{__make} -C obj-%{_target_cpu}/xulrunner/installer install \
+cd mozilla/obj-%{_target_cpu}
+%{__make} -C xulrunner/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
-	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
+	installdir=%{_libdir}/%{name} \
 	INSTALL_SDK=1 \
 	PKG_SKIP_STRIP=1
 
-# fix for halfway done xulrunner-bin -> xulrunner rename
-ln -sf %{_libdir}/%{name}/xulrunner $RPM_BUILD_ROOT%{_bindir}/xulrunner
+cp -a dist/xulrunner/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
-install -d \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/components \
-	$RPM_BUILD_ROOT%{_sbindir}
+# fix for halfway done xulrunner-bin -> xulrunner rename
+#ln -sf %{_libdir}/%{name}/xulrunner $RPM_BUILD_ROOT%{_bindir}/xulrunner
 
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index be645d6..6ce0dd7 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,23 +1,11 @@
---- xulrunner-19.0/mozilla/configure.in~	2013-02-20 12:29:36.493788864 +0100
-+++ xulrunner-19.0/mozilla/configure.in	2013-02-20 12:46:55.030421705 +0100
-@@ -132,8 +132,7 @@
- dnl This verifies our Python version is sane and ensures the Python
- dnl virtualenv is present and up to date. It sanitizes the environment
- dnl for us, so we don't need to clean anything out.
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
- 
- dnl Create a virtualenv where we can install local Python packages
- case "$host_os" in
 --- xulrunner-19.0/mozilla/configure~	2013-02-20 12:39:40.270435866 +0100
 +++ xulrunner-19.0/mozilla/configure	2013-02-20 12:39:58.623768601 +0100
 @@ -1336,8 +1336,7 @@
- fi
  
- echo "$ac_t""Creating Python environment" 1>&6
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
+ if test -z $DONT_POPULATE_VIRTUALENV; then
+   echo "$ac_t""Creating Python environment" 1>&6
+-        $PYTHON $_virtualenv_populate_path \
+-    $_virtualenv_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
 +PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
  
  case "$host_os" in
diff --git a/xulrunner-gyp-slashism.patch b/xulrunner-gyp-slashism.patch
index 4c2f0ff..5100011 100644
--- a/xulrunner-gyp-slashism.patch
+++ b/xulrunner-gyp-slashism.patch
@@ -34,15 +34,6 @@
      if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
          # If WriteTargetMakefile returns True, then this is a useful target
        dirs.append(rel_path)
-@@ -376,7 +382,7 @@
-     WriteMakefile(output_file, data, build_file, depth, top,
-                   # we set srcdir up one directory, since the subdir
-                   # 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.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-rpath.patch b/xulrunner-rpath.patch
index 28932be..565bfaa 100644
--- a/xulrunner-rpath.patch
+++ b/xulrunner-rpath.patch
@@ -20,14 +20,3 @@
  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/toolkit/mozapps/installer/packager.mk.orig	2012-01-17 16:05:48.399452282 +0100
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2012-01-18 16:47:16.095761903 +0100
-@@ -436,7 +436,7 @@
- 
- # Silence the unzip step so we don't print any binary data from the comment field.
- GENERATE_CACHE = \
--  $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('startupCache.zip');" && \
-+  LD_PRELOAD=$(LIBXUL_DIST)/lib/libxpcom.so:$(LIBXUL_DIST)/lib/libmozalloc.so:$(LIBXUL_DIST)/lib/libxul.so:$(LIBXUL_DIST)/lib/libmozjs.so $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('startupCache.zip');" && \
-   rm -rf jsloader jssubloader && \
-   $(UNZIP) -q startupCache.zip && \
-   rm startupCache.zip && \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/604241ca1f2f7fcdc9d8d31cad2e6037eb870efd

