From d0e4474d2ffdc570bdded7cf262ca64306c0414f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 2 Dec 2013 11:26:15 -0600 Subject: [PATCH] 5.2.0-rc1 --- .gitignore | 1 + qt5-qtwebkit.spec | 11 +++++++---- ... => qtwebkit-opensource-src-5.2.0-pluginpath.patch | 10 +++++----- ...=> qtwebkit-opensource-src-5.2.0-save_memory.patch | 8 ++++---- sources | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) rename webkit-qtwebkit-2.2-tp1-pluginpath.patch => qtwebkit-opensource-src-5.2.0-pluginpath.patch (56%) rename qtwebkit-save_memory.patch => qtwebkit-opensource-src-5.2.0-save_memory.patch (58%) diff --git a/.gitignore b/.gitignore index 33f5d5a..aa56a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.1.1.tar.xz /qtwebkit-opensource-src-5.2.0-beta1.tar.xz +/qtwebkit-opensource-src-5.2.0-rc1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3239028..3827084 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,6 +1,6 @@ %global qt_module qtwebkit -%define pre beta1 +%define pre rc1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available @@ -12,7 +12,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.6.%{pre}%{?dist} +Release: 0.10.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -25,13 +25,13 @@ Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/subm %endif # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too -Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch +Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch # smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch # tweak linker flags to minimize memory usage on "small" platforms -Patch4: qtwebkit-save_memory.patch +Patch4: qtwebkit-opensource-src-5.2.0-save_memory.patch # use unbundled system angleproject library #define system_angle 1 @@ -206,6 +206,9 @@ popd %changelog +* Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 +- 5.2.0-rc1 + * Thu Nov 28 2013 Dan Horák 5.2.0-0.6.beta1 - disable JIT on secondary arches, fix build with JIT disabled (#1034940) diff --git a/webkit-qtwebkit-2.2-tp1-pluginpath.patch b/qtwebkit-opensource-src-5.2.0-pluginpath.patch similarity index 56% rename from webkit-qtwebkit-2.2-tp1-pluginpath.patch rename to qtwebkit-opensource-src-5.2.0-pluginpath.patch index b1e8e2f..26f4f3e 100644 --- a/webkit-qtwebkit-2.2-tp1-pluginpath.patch +++ b/qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -1,7 +1,7 @@ -diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp ---- webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-05-12 10:06:43.000000000 +0200 -+++ webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 2011-05-12 10:08:08.000000000 +0200 -@@ -380,6 +380,7 @@ Vector PluginDatabase::defaultPl +diff -up qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp +--- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath 2013-11-26 19:01:47.000000000 -0600 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp 2013-12-02 11:14:43.306114402 -0600 +@@ -407,6 +407,7 @@ Vector PluginDatabase::defaultPl paths.append("/usr/lib/firefox/plugins"); paths.append("/usr/lib64/browser-plugins"); paths.append("/usr/lib/browser-plugins"); @@ -9,7 +9,7 @@ diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-q paths.append("/usr/lib/mozilla/plugins"); paths.append("/usr/local/netscape/plugins"); paths.append("/opt/mozilla/plugins"); -@@ -389,6 +390,7 @@ Vector PluginDatabase::defaultPl +@@ -416,6 +417,7 @@ Vector PluginDatabase::defaultPl paths.append("/usr/lib/netscape/plugins"); paths.append("/usr/lib/netscape/plugins-libc5"); paths.append("/usr/lib/netscape/plugins-libc6"); diff --git a/qtwebkit-save_memory.patch b/qtwebkit-opensource-src-5.2.0-save_memory.patch similarity index 58% rename from qtwebkit-save_memory.patch rename to qtwebkit-opensource-src-5.2.0-save_memory.patch index db8151d..2db9beb 100644 --- a/qtwebkit-save_memory.patch +++ b/qtwebkit-opensource-src-5.2.0-save_memory.patch @@ -1,7 +1,7 @@ -diff -up qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri ---- qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri.save_memory 2013-10-01 22:26:15.648285154 -0500 -+++ qtwebkit-opensource-src-5.2.0-alpha/Source/WebCore/WebCore.pri 2013-10-01 22:27:41.299383226 -0500 -@@ -304,6 +304,8 @@ mac { +diff -up qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memory 2013-12-02 11:15:56.417351604 -0600 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri 2013-12-02 11:15:56.421351563 -0600 +@@ -306,6 +306,8 @@ mac { } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections diff --git a/sources b/sources index 9f9195d..a0a98f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cb3df7132ef71ad5faee8f0246b4b7d qtwebkit-opensource-src-5.2.0-beta1.tar.xz +0236ee173b2ba63a6a98974ffd791261 qtwebkit-opensource-src-5.2.0-rc1.tar.xz