rpms/qt5-qtwebkit
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

5.2.0-rc1

Browse Source
This commit is contained in:
Rex Dieter 2013-12-02 11:26:15 -06:00
parent b1bf1f4f0b
commit d0e4474d2f
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/qtwebkit-opensource-src-5.1.1.tar.xz /qtwebkit-opensource-src-5.1.1.tar.xz
/qtwebkit-opensource-src-5.2.0-beta1.tar.xz /qtwebkit-opensource-src-5.2.0-beta1.tar.xz
/qtwebkit-opensource-src-5.2.0-rc1.tar.xz

11
qt5-qtwebkit.spec
View File

@ -1,6 +1,6 @@
%global qt_module qtwebkit %global qt_module qtwebkit
%define pre beta1 %define pre rc1
# define to build docs, need to undef this for bootstrapping # define to build docs, need to undef this for bootstrapping
# where qt5-qttools builds are not yet available # where qt5-qttools builds are not yet available
@ -12,7 +12,7 @@
Summary: Qt5 - QtWebKit components Summary: Qt5 - QtWebKit components
Name: qt5-qtwebkit Name: qt5-qtwebkit
Version: 5.2.0 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 LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html # 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 %endif
# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too # 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 # smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit
Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch
# tweak linker flags to minimize memory usage on "small" platforms # 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 # use unbundled system angleproject library
#define system_angle 1 #define system_angle 1
@ -206,6 +206,9 @@ popd
%changelog %changelog
* Mon Dec 02 2013 Rex Dieter <rdieter@fedoraproject.org> 5.2.0-0.10.rc1
- 5.2.0-rc1
* Thu Nov 28 2013 Dan Horák <dan[at]danny.cz> 5.2.0-0.6.beta1 * Thu Nov 28 2013 Dan Horák <dan[at]danny.cz> 5.2.0-0.6.beta1
- disable JIT on secondary arches, fix build with JIT disabled (#1034940) - disable JIT on secondary arches, fix build with JIT disabled (#1034940)

10
webkit-qtwebkit-2.2-tp1-pluginpath.patch → qtwebkit-opensource-src-5.2.0-pluginpath.patch
View File

@ -1,7 +1,7 @@
diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 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
--- webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-05-12 10:06:43.000000000 +0200 --- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath 2013-11-26 19:01:47.000000000 -0600
+++ webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 2011-05-12 10:08:08.000000000 +0200 +++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp 2013-12-02 11:14:43.306114402 -0600
@@ -380,6 +380,7 @@ Vector<String> PluginDatabase::defaultPl @@ -407,6 +407,7 @@ Vector<String> PluginDatabase::defaultPl
paths.append("/usr/lib/firefox/plugins"); paths.append("/usr/lib/firefox/plugins");
paths.append("/usr/lib64/browser-plugins"); paths.append("/usr/lib64/browser-plugins");
paths.append("/usr/lib/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/lib/mozilla/plugins");
paths.append("/usr/local/netscape/plugins"); paths.append("/usr/local/netscape/plugins");
paths.append("/opt/mozilla/plugins"); paths.append("/opt/mozilla/plugins");
@@ -389,6 +390,7 @@ Vector<String> PluginDatabase::defaultPl @@ -416,6 +417,7 @@ Vector<String> PluginDatabase::defaultPl
paths.append("/usr/lib/netscape/plugins"); paths.append("/usr/lib/netscape/plugins");
paths.append("/usr/lib/netscape/plugins-libc5"); paths.append("/usr/lib/netscape/plugins-libc5");
paths.append("/usr/lib/netscape/plugins-libc6"); paths.append("/usr/lib/netscape/plugins-libc6");

8
qtwebkit-save_memory.patch → qtwebkit-opensource-src-5.2.0-save_memory.patch
View File

@ -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 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-alpha/Source/WebCore/WebCore.pri.save_memory 2013-10-01 22:26:15.648285154 -0500 --- 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-alpha/Source/WebCore/WebCore.pri 2013-10-01 22:27:41.299383226 -0500 +++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri 2013-12-02 11:15:56.421351563 -0600
@@ -304,6 +304,8 @@ mac { @@ -306,6 +306,8 @@ mac {
} }
unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections
unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections

2
sources
View File

@ -1 +1 @@
6cb3df7132ef71ad5faee8f0246b4b7d qtwebkit-opensource-src-5.2.0-beta1.tar.xz 0236ee173b2ba63a6a98974ffd791261 qtwebkit-opensource-src-5.2.0-rc1.tar.xz