[packages/xulrunner] Updated to 15.0 Build with (PLD compliant) system virtualenv

baggins baggins at pld-linux.org
Wed Aug 29 17:00:56 CEST 2012 

commit c48ca27fbc7d639884946272ae9ec649ca62ed33
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Aug 29 16:59:55 2012 +0200

    Updated to 15.0
    Build with (PLD compliant) system virtualenv

 system-cairo.patch      | 20 +++++---------------
 system-virtualenv.patch | 24 ++++++++++++++++++++++++
 xulrunner-install.patch |  5 +++--
 xulrunner.spec          | 17 +++++++++++++----
 4 files changed, 45 insertions(+), 21 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 1bd0481..20729d5 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:	14.0.1
+Version:	15.0
 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:	c2f884f0f6c41c65cf20f678a1ee7191
+# Source0-md5:	64220887a349515f16e5aa990acb4db3
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
 Patch4:		%{name}-paths.patch
@@ -41,6 +41,8 @@ Patch7:		system-cairo.patch
 # http://pkgs.fedoraproject.org/gitweb/?p=xulrunner.git;a=tree
 Patch9:		%{name}-gtkmozembed.patch
 Patch11:	idl-parser.patch
+# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
+Patch12:	system-virtualenv.patch
 URL:		https://developer.mozilla.org/en/XULRunner
 %{!?with_qt:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
@@ -71,6 +73,7 @@ BuildRequires:	pango-devel >= 1:1.14.0
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(libffi) >= 3.0.9
 BuildRequires:	python >= 1:2.5
+BuildRequires:	python-virtualenv
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.453
 BuildRequires:	sed >= 4.0
@@ -190,6 +193,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch7 -p2
 %patch9 -p2
 %patch11 -p2
+%patch12 -p2
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
@@ -295,12 +299,18 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 cd mozilla
 
+# work around broken build system
+touch obj-%{_target_cpu}/dist/sdk/empty.pyc
+
 %{__make} -C obj-%{_target_cpu}/xulrunner/installer install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MOZ_PKG_APPDIR=%{_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
+
 install -d \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/components \
 	$RPM_BUILD_ROOT%{_sbindir}
@@ -325,7 +335,6 @@ touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
 # remove unecessary stuff
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
 
@@ -346,7 +355,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xulrunner
-%attr(755,root,root) %{_libdir}/%{name}/xulrunner-bin
+%attr(755,root,root) %{_libdir}/%{name}/xulrunner
 
 # symlinks
 %{_libdir}/%{name}/chrome
diff --git a/system-cairo.patch b/system-cairo.patch
index 9ae0888..d395822 100644
--- a/system-cairo.patch
+++ b/system-cairo.patch
@@ -25,21 +25,16 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
  {
    void *userData = aSurface->GetData(&kSourceSurface);
  
-@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
-         NS_RUNTIMEABORT("Invalid surface format!");
-     }
+@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
  
-     srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
-                                                      IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
-                                                      imgSurface->Stride(),
-                                                      format);
+     }
  
 -    cairo_surface_t *nullSurf =
 -	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
 -    cairo_surface_set_user_data(nullSurf,
--				&kSourceSurface,
--				imgSurface,
--				NULL);
+-                                &kSourceSurface,
+-                                imgSurface,
+-                                NULL);
 -    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
 -    cairo_surface_destroy(nullSurf);
 +    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
@@ -47,8 +42,3 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
    }
  
    srcBuffer->AddRef();
-   aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
- 
-   return srcBuffer;
- }
- 
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
new file mode 100644
index 0000000..bc76d83
--- /dev/null
+++ b/system-virtualenv.patch
@@ -0,0 +1,24 @@
+Restore --system-site-packages when system virtualenv gets 1.7 upgrade
+
+--- xulrunner-15.0/mozilla/configure.in~	2012-08-29 11:06:34.517985819 +0200
++++ xulrunner-15.0/mozilla/configure.in	2012-08-29 11:23:47.234616054 +0200
+@@ -9069,7 +9069,7 @@
+ AC_MSG_RESULT([Creating Python virtualenv])
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+--- xulrunner-15.0/mozilla/configure~	2012-08-29 11:25:28.121279162 +0200
++++ xulrunner-15.0/mozilla/configure	2012-08-29 11:27:27.981274936 +0200
+@@ -25468,7 +25468,7 @@
+ echo "$ac_t""Creating Python virtualenv" 1>&6
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
diff --git a/xulrunner-install.patch b/xulrunner-install.patch
index 8c437e4..c3ec74e 100644
--- a/xulrunner-install.patch
+++ b/xulrunner-install.patch
@@ -9,8 +9,8 @@
  endif
  else
  	@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
-@@ -725,26 +725,29 @@
- 	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
+@@ -725,27 +725,30 @@
+ endif
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)
 -	(cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
@@ -35,6 +35,7 @@
  	if test -f $(DIST)/include/xpcom-config.h; then \
  	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
  	fi
+ 	find $(DIST)/sdk -name "*.pyc" | xargs rm
 -	(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
================================================================

---- gitweb:

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

More information about the pld-cvs-commit mailing list