commit 85e80acf3e4a067b2cac61bd096c4188dc950072
Author: Jan Rękorajski <[email protected]>
Date: Sun Feb 9 00:38:14 2014 +0100
- updated to 27.0, doesn't build (libxul.so linking fails)
system-virtualenv.patch | 4 ++--
xulrunner-rpath.patch | 8 ++++----
xulrunner.spec | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 75eebb1..1f4f928 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -17,15 +17,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: 26.0
-Release: 1
+Version: 27.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: 91ce51cc6474f1269484e5327643a59c
+# Source0-md5: 212827908144b43e7c80ed9d56a08ca9
Patch0: %{name}-new-libxul.patch
Patch1: %{name}-rpath.patch
Patch2: %{name}-paths.patch
@@ -73,7 +73,7 @@ BuildRequires: python-virtualenv >= 1.9.1-4
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.7.17
+BuildRequires: sqlite3-devel >= 3.8.0.2
BuildRequires: startup-notification-devel >= 0.8
BuildRequires: unzip
%if "%{pld_release}" == "ac"
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index a2d150f..3650d56 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,5 +1,5 @@
---- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~
2013-05-11 21:19:23.000000000 +0200
-+++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py
2013-05-14 22:51:32.136719267 +0200
+--- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~
2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py
2013-05-14 22:51:32.136719267 +0200
@@ -37,8 +37,7 @@
@property
def virtualenv_script_path(self):
diff --git a/xulrunner-rpath.patch b/xulrunner-rpath.patch
index 593886a..2cdab6d 100644
--- a/xulrunner-rpath.patch
+++ b/xulrunner-rpath.patch
@@ -1,22 +1,22 @@
--- 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 @@
+
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)'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxul -lxpcom_core -lmozalloc'
-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='-L$(LIBXUL_DIST)/bin -lxul -lmozalloc'
+ 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)'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxul -lxpcom_core -lmozalloc'
-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='-L$(LIBXUL_DIST)/bin -lxul -lmozalloc'
+ 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)'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/85e80acf3e4a067b2cac61bd096c4188dc950072
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
