[xulrunner] Update to 20.0
Martin Stransky
stransky at fedoraproject.org
Mon Apr 1 09:30:16 UTC 2013
commit 38dfdbf9ef24aa76f5f0170a2347c8a1b66be9a1
Author: Martin Stransky <stransky at anakreon.cz>
Date: Mon Apr 1 11:30:09 2013 +0200
Update to 20.0
mozilla-826171.patch | 33 ---------------------------------
rhbz-304121.patch | 13 ++++++-------
sources | 2 +-
xulrunner.spec | 9 +++++----
4 files changed, 12 insertions(+), 45 deletions(-)
---
diff --git a/rhbz-304121.patch b/rhbz-304121.patch
index 941aca2..d8d8ac3 100644
--- a/rhbz-304121.patch
+++ b/rhbz-304121.patch
@@ -1,13 +1,12 @@
-diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile.old firefox-18.0/mozilla-release/media/webrtc/trunk/Makefile
-diff -up firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
---- firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.old 2013-01-05 00:44:41.000000000 +0100
-+++ firefox-18.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-10 14:48:58.418321640 +0100
-@@ -376,7 +376,7 @@ class MakefileGenerator(object):
+diff -up xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.rhbz-304121 xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py
+--- xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.rhbz-304121 2013-03-26 23:17:58.000000000 +0100
++++ xulrunner-20.0/mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-04-01 11:11:56.938411785 +0200
+@@ -377,7 +377,7 @@ class MakefileGenerator(object):
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(os.path.normpath(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0]))),
- self.relative_srcdir)
+ self.relative_srcdir,
+ self.common_mk_path)
return True
-
diff --git a/sources b/sources
index a9d71e1..1dbc77f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de09d603c3b768a1698d90141f3b2644 firefox-19.0.2.source.tar.bz2
+e664416da2075f13089fe3e883cadb73 firefox-20.0.source.tar.bz2
diff --git a/xulrunner.spec b/xulrunner.spec
index cadd5e1..2a1a056 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -75,8 +75,8 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 19.0.2
-Release: 4%{?pre_tag}%{?dist}
+Version: 20.0
+Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -102,7 +102,6 @@ Patch21: rhbz-911314.patch
# Upstream patches
Patch101: mozilla-791626.patch
Patch102: mozilla-239254.patch
-Patch103: mozilla-826171.patch
Patch104: mozilla-844883.patch
# ---------------------------------------------------
@@ -240,7 +239,6 @@ cd %{tarballdir}
%patch101 -p1 -b .791626
%patch102 -p1 -b .239254
-%patch103 -p1 -b .826171
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -520,6 +518,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Tue Mar 19 2013 Martin Stransky <stransky at redhat.com> - 20.0-1
+- Update to latest upstream (20.0)
+
* Tue Mar 19 2013 Martin Stransky <stransky at redhat.com> - 19.0.2-4
- Added fix for rhbz#913284 - Firefox segfaults
in mozilla::gfx::AlphaBoxBlur::BoxBlur_C() on PPC64
More information about the scm-commits
mailing list