[packages/xulrunner] - up to 34.0

Mon Dec 1 23:54:28 CET 2014

commit 59144556096a57ded932a64ce77f011eb8a60899
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Dec 1 23:54:21 2014 +0100

    - up to 34.0

 xulrunner-pc.patch    |  6 +++---
 xulrunner-rpath.patch | 29 +++++++++++++++--------------
 xulrunner.spec        | 11 ++++++-----
 3 files changed, 24 insertions(+), 22 deletions(-)
---

diff --git a/xulrunner.spec b/xulrunner.spec
index 31fe3c9..c317a89 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -14,13 +14,13 @@
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
 
-%define		nspr_ver	4.10.6
-%define		nss_ver		3.17.2
+%define		nspr_ver	4.10.7
+%define		nss_ver		3.17.3
 
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	33.1.1
+Version:	34.0
 Release:	1
 Epoch:		2
 License:	MPL v2.0
@@ -28,7 +28,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:	2c23350a10d508f1d9b9a5f82df5dd93
+# Source0-md5:	8ce294a40ecaaf8a1ae6a6c6a6e2c3c9
 Patch0:		%{name}-new-libxul.patch
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-paths.patch
@@ -77,7 +77,7 @@ BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	sed >= 4.0
-BuildRequires:	sqlite3-devel >= 3.8.5
+BuildRequires:	sqlite3-devel >= 3.8.6
 BuildRequires:	startup-notification-devel >= 0.8
 BuildRequires:	unzip
 %if "%{pld_release}" == "ac"
@@ -419,6 +419,7 @@ fi
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/platform.ini
 %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
 %{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %{_libdir}/%{name}/dependentlibs.list
diff --git a/xulrunner-pc.patch b/xulrunner-pc.patch
index d59f75f..55bb1a1 100644
--- a/xulrunner-pc.patch
+++ b/xulrunner-pc.patch
@@ -32,12 +32,12 @@ diff -urN mozilla-2.0/xulrunner//installer/Makefile.in mozilla-2.0.new/xulrunner
 diff -urN mozilla-2.0/xulrunner//installer/mozilla-js.pc.in mozilla-2.0.new/xulrunner//installer/mozilla-js.pc.in
 --- mozilla-2.0/xulrunner//installer/mozilla-js.pc.in	2011-03-19 00:34:14.000000000 +0100
 +++ mozilla-2.0.new/xulrunner//installer/mozilla-js.pc.in	2011-03-23 16:26:25.390008869 +0100
-@@ -7,4 +7,4 @@
+@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Libr
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
  Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+-Cflags: -I${includedir} -DXP_UNIX
++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX
 diff -urN mozilla-2.0/xulrunner//installer/mozilla-plugin.pc.in mozilla-2.0.new/xulrunner//installer/mozilla-plugin.pc.in
 --- mozilla-2.0/xulrunner//installer/mozilla-plugin.pc.in	2011-03-19 00:34:14.000000000 +0100
 +++ mozilla-2.0.new/xulrunner//installer/mozilla-plugin.pc.in	2011-03-23 16:26:00.333333556 +0100
diff --git a/xulrunner-rpath.patch b/xulrunner-rpath.patch
index 2cdab6d..683108d 100644
--- a/xulrunner-rpath.patch
+++ b/xulrunner-rpath.patch
@@ -1,22 +1,23 @@
 --- mozilla-2.0/configure.in	2011-03-19 00:33:33.000000000 +0100
 +++ mozilla-2.0.new/configure.in	2011-03-23 16:18:45.746667659 +0100
-@@ -1229,7 +1229,7 @@
+@@ -960,7 +960,7 @@ TARGET_MD_ARCH=unix
+ DIRENT_INO=d_ino
+ MOZ_USER_DIR=".mozilla"
  
- MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
- MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
 -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath,$(installdir)'
- XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
---- mozilla-2.0/configure	2011-03-19 00:48:56.000000000 +0100
-+++ mozilla-2.0.new/configure	2011-03-23 16:19:10.449995855 +0100
-@@ -5856,7 +5856,7 @@
  
- MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
- MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
+ MOZ_FS_LAYOUT=unix
+ 
+--- mozilla-2.0/configure~	2014-11-26 03:18:44.000000000 +0100
++++ mozilla-2.0/configure	2014-12-01 23:14:34.554999919 +0100
+@@ -6473,7 +6473,7 @@ TARGET_MD_ARCH=unix
+ DIRENT_INO=d_ino
+ MOZ_USER_DIR=".mozilla"
+ 
 -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath,$(installdir)'
- XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
+ 
+ MOZ_FS_LAYOUT=unix
+ 
+
================================================================

---- gitweb:

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

