[packages/xulrunner] - updated to 29.0
baggins
baggins at pld-linux.org
Fri May 2 19:05:30 CEST 2014
commit e79e07b563f1a5399fbdaab08a4eecd7c3ed9c74
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri May 2 19:05:15 2014 +0200
- updated to 29.0
xulrunner-gyp-slashism.patch | 57 --------------------------------------------
xulrunner-paths.patch | 16 +++++++------
xulrunner-prefs.patch | 12 ----------
xulrunner.spec | 11 ++-------
4 files changed, 11 insertions(+), 85 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index efe6de7..ae42105 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -17,7 +17,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: 28.0
+Version: 29.0
Release: 1
Epoch: 2
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -25,16 +25,14 @@ 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: db06b6da6b826cfc6a49c15bca115a6b
+# Source0-md5: 07c515fc487824f107a947d23f420e9d
Patch0: %{name}-new-libxul.patch
Patch1: %{name}-rpath.patch
Patch2: %{name}-paths.patch
Patch3: %{name}-pc.patch
Patch4: %{name}-prefs.patch
Patch6: idl-parser.patch
-# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch7: system-virtualenv.patch
-Patch8: %{name}-gyp-slashism.patch
URL: https://developer.mozilla.org/en/XULRunner
BuildRequires: GConf2-devel >= 1.2.1
BuildRequires: alsa-lib-devel
@@ -188,11 +186,6 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
%patch4 -p1
%patch6 -p2
%patch7 -p2
-%patch8 -p2
-
-# config/rules.mk is patched by us and js/src/config/rules.mk
-# is supposed to be exact copy
-cp -a config/rules.mk js/src/config/rules.mk
%build
if [ "$(grep -E '^[0-9]+\.' mozilla/config/milestone.txt)" != "%{version}" ]; then
diff --git a/xulrunner-gyp-slashism.patch b/xulrunner-gyp-slashism.patch
deleted file mode 100644
index 5100011..0000000
--- a/xulrunner-gyp-slashism.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig 2013-01-05 00:44:41.000000000 +0100
-+++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-13 20:13:40.033894757 +0100
-@@ -114,6 +114,12 @@
- if dir and not os.path.exists(dir):
- os.makedirs(dir)
-
-+def append_relative(base, rel):
-+ if rel == '':
-+ return base
-+ else:
-+ return base + '/' + rel
-+
- def GetFlavor(params):
- """Returns |params.flavor| if it's set, the system's default flavor else."""
- flavors = {
-@@ -142,9 +148,9 @@
-
- def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None):
- if not os.path.isabs(topsrcdir):
-- topsrcdir = depth + "/" + topsrcdir
-+ topsrcdir = append_relative(depth, topsrcdir)
- if not os.path.isabs(srcdir):
-- srcdir = depth + "/" + srcdir
-+ srcdir = append_relative(depth, srcdir)
- #TODO: should compare with the existing file and not overwrite it if the
- # contents are the same!
- ensure_directory_exists(filename)
-@@ -261,7 +267,7 @@
- qualified_target)
- build_file = os.path.abspath(build_file)
- rel_path, output_file = self.CalculateMakefilePath(build_file, target)
-- subdepth = self.depth + "/" + getdepth(rel_path)
-+ subdepth = append_relative(self.depth, getdepth(rel_path))
- 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)
-@@ -399,7 +405,7 @@
- # The relative path from objdir to gyp_file_dir
- srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
- # The absolute path to the source dir
-- abs_srcdir = topsrcdir + "/" + relative_srcdir
-+ abs_srcdir = append_relative(topsrcdir, relative_srcdir)
- # The path to get up to the root of the objdir from the output dir.
- depth = getdepth(relative_srcdir)
- # The output directory.
-@@ -408,9 +414,9 @@
- makefile_path = os.path.join(output_dir, "Makefile")
-
- def topsrcdir_path(path):
-- return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir))
-+ return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir)))
- def objdir_path(path):
-- return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir))
-+ return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir)))
-
- # Find the list of targets that derive from the gyp file(s) being built.
- needed_targets = set()
diff --git a/xulrunner-paths.patch b/xulrunner-paths.patch
index bb93246..cc0b83e 100644
--- a/xulrunner-paths.patch
+++ b/xulrunner-paths.patch
@@ -1,6 +1,9 @@
---- xulrunner-16.0.1/mozilla/config/baseconfig.mk~ 2012-10-10 23:42:45.000000000 +0200
-+++ xulrunner-16.0.1/mozilla/config/baseconfig.mk 2012-10-23 23:56:58.222368136 +0200
-@@ -1,7 +1,7 @@
+--- xulrunner-29.0/mozilla/config/baseconfig.mk~ 2012-10-10 23:42:45.000000000 +0200
++++ xulrunner-29.0/mozilla/config/baseconfig.mk 2012-10-23 23:56:58.222368136 +0200
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
@@ -9,7 +12,6 @@
+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
+installdir = $(libdir)/$(MOZ_APP_NAME)
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
-
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-
+ ifndef TOP_DIST
+ TOP_DIST = dist
+ endif
diff --git a/xulrunner-prefs.patch b/xulrunner-prefs.patch
index cffbff6..cde2ea4 100644
--- a/xulrunner-prefs.patch
+++ b/xulrunner-prefs.patch
@@ -1,15 +1,3 @@
-diff -ur mozilla.orig/toolkit/content/about.xhtml mozilla/toolkit/content/about.xhtml
---- mozilla.orig/toolkit/content/about.xhtml 2008-03-31 22:13:37.000000000 +0200
-+++ mozilla/toolkit/content/about.xhtml 2008-06-22 15:44:55.000000000 +0200
-@@ -91,7 +91,7 @@
- .getService(Components.interfaces.nsIXULAppInfo)
- .version;
- var version = document.getElementById("version");
-- version.appendChild(document.createTextNode("&about.version; " + versionNum));
-+ version.appendChild(document.createTextNode("XULRunner " + versionNum));
-
- // append user agent
- var ua = navigator.userAgent;
--- mozilla/xulrunner/app/xulrunner.js.orig 2007-09-05 15:47:24.000000000 +0200
+++ mozilla/xulrunner/app/xulrunner.js 2008-07-23 13:57:13.000000000 +0200
@@ -69,3 +69,5 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/e79e07b563f1a5399fbdaab08a4eecd7c3ed9c74
More information about the pld-cvs-commit
mailing list