[qtwebkit] qt_webkit_version.pri is missing in 2.3-rc1 package (#919477)
Rex Dieter
rdieter at fedoraproject.org
Sat Mar 9 15:03:42 UTC 2013
commit 5b212d2113efa1b05856ba45391693fa8fd14cca
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Mar 9 09:03:20 2013 -0600
qt_webkit_version.pri is missing in 2.3-rc1 package (#919477)
...h-objects-won-t-load-until-scrolling-page.patch | 62 ++++++++++++++++++++
...SSION-r110272-qt_webkit.pri-not-installed.patch | 29 +++++++++
qtwebkit.spec | 12 +++-
3 files changed, 100 insertions(+), 3 deletions(-)
---
diff --git a/0001-Qt-Flash-objects-won-t-load-until-scrolling-page.patch b/0001-Qt-Flash-objects-won-t-load-until-scrolling-page.patch
new file mode 100644
index 0000000..f1c45aa
--- /dev/null
+++ b/0001-Qt-Flash-objects-won-t-load-until-scrolling-page.patch
@@ -0,0 +1,62 @@
+From f4777381ce10a5db904d120f4e14993af3dec39d Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at digia.com>
+Date: Mon, 4 Mar 2013 16:32:02 +0100
+Subject: [PATCH 1/2] [Qt] Flash objects won't load until scrolling page
+ https://bugs.webkit.org/show_bug.cgi?id=110149
+
+Reviewed by Simon Hausmann.
+
+Revert r134222. The issue from bug 101836 is no longer reproducable,
+and the fix was causing flash objects to not load properly.
+
+* plugins/PluginPackage.cpp:
+(WebCore::PluginPackage::determineQuirks):
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144191 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebCore/ChangeLog | 13 +++++++++++++
+ Source/WebCore/plugins/PluginPackage.cpp | 4 +---
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
+index 833470c..a5acc4a 100644
+--- a/Source/WebCore/ChangeLog
++++ b/Source/WebCore/ChangeLog
+@@ -13,6 +13,19 @@
+
+ 2013-02-27 Allan Sandfeld Jensen <allan.jensen at digia.com>
+
++ [Qt] Flash objects won't load until scrolling page
++ https://bugs.webkit.org/show_bug.cgi?id=110149
++
++ Reviewed by Simon Hausmann.
++
++ Revert r134222. The issue from bug 101836 is no longer reproducable,
++ and the fix was causing flash objects to not load properly.
++
++ * plugins/PluginPackage.cpp:
++ (WebCore::PluginPackage::determineQuirks):
++
++2013-02-27 Allan Sandfeld Jensen <allan.jensen at digia.com>
++
+ [TexMap] Flickering after transitions on Apple HTML5 demo
+ https://bugs.webkit.org/show_bug.cgi?id=102501
+
+diff --git a/Source/WebCore/plugins/PluginPackage.cpp b/Source/WebCore/plugins/PluginPackage.cpp
+index 05b3eb6..5927719 100644
+--- a/Source/WebCore/plugins/PluginPackage.cpp
++++ b/Source/WebCore/plugins/PluginPackage.cpp
+@@ -205,9 +205,7 @@ void PluginPackage::determineQuirks(const String& mimeType)
+ }
+
+ #if PLATFORM(QT)
+- // Flash will crash on repeated calls to SetWindow in windowed mode.
+- // Defer the setWindow, so we don't set it to the wrong size too early.
+- m_quirks.add(PluginQuirkDeferFirstSetWindowCall);
++ // Flash will crash on repeated calls to SetWindow in windowed mode
+ m_quirks.add(PluginQuirkDontCallSetWindowMoreThanOnce);
+ #endif
+
+--
+1.8.1.4
+
diff --git a/0002-REGRESSION-r110272-qt_webkit.pri-not-installed.patch b/0002-REGRESSION-r110272-qt_webkit.pri-not-installed.patch
new file mode 100644
index 0000000..415baa1
--- /dev/null
+++ b/0002-REGRESSION-r110272-qt_webkit.pri-not-installed.patch
@@ -0,0 +1,29 @@
+From e28288309b95a1d4ea343c86d22f9b83983c7238 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at digia.com>
+Date: Fri, 8 Mar 2013 17:16:53 +0100
+Subject: [PATCH 2/2] REGRESSION(r110272) qt_webkit.pri not installed
+
+Readd modulefile to the INSTALLS.
+---
+ Source/api.pri | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Source/api.pri b/Source/api.pri
+index 7b604d8..9da4b9f 100644
+--- a/Source/api.pri
++++ b/Source/api.pri
+@@ -105,6 +105,11 @@ haveQt(5) {
+ # Install rules handled by Qt's module system
+ } else {
+ # For Qt4 we have to set up install rules manually
++ modulefile.files = $${ROOT_WEBKIT_DIR}/Tools/qmake/qt_webkit.pri
++ mkspecs = $$[QMAKE_MKSPECS]
++ mkspecs = $$split(mkspecs, :)
++ modulefile.path = $$last(mkspecs)/modules
++ INSTALLS += modulefile
+
+ # Syncqt has already run at this point, so we can use headers.pri
+ # as a basis for our install-rules
+--
+1.8.1.4
+
diff --git a/qtwebkit.spec b/qtwebkit.spec
index de8c464..b02f602 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -3,7 +3,7 @@
Name: qtwebkit
Version: 2.3
-Release: 0.4.%{pre}%{?dist}
+Release: 0.5.%{pre}%{?dist}
Summary: Qt WebKit bindings
Group: System Environment/Libraries
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -44,6 +44,8 @@ Patch10: qtwebkit-ppc.patch
Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
## upstream patches
+Patch101: 0001-Qt-Flash-objects-won-t-load-until-scrolling-page.patch
+Patch102: 0002-REGRESSION-r110272-qt_webkit.pri-not-installed.patch
BuildRequires: bison
BuildRequires: chrpath
@@ -83,8 +85,6 @@ Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: qt4-devel
-# when qt_webkit_version.pri was moved from qt-devel => qt-webkit-devel
-Conflicts: qt-devel < 1:4.7.2-9
Obsoletes: qt-webkit-devel < 1:4.9.0
Provides: qt-webkit-devel = 2:%{version}-%{release}
Provides: qt4-webkit-devel = 2:%{version}-%{release}
@@ -103,6 +103,8 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
%patch10 -p1 -b .system-malloc
%patch11 -p1 -b .Double2Ints
%endif
+%patch101 -p1 -b .0001
+%patch102 -p1 -b .0002
%build
@@ -154,6 +156,7 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
+%{_qt4_datadir}/mkspecs/modules/qt_webkit.pri
%{_qt4_headerdir}/QtWebKit/
%{_qt4_libdir}/libQtWebKit.prl
%{_qt4_libdir}/libQtWebKit.so
@@ -161,6 +164,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Mar 09 2013 Rex Dieter <rdieter at fedoraproject.org> 2.3-0.5.rc1
+- qt_webkit_version.pri is missing in 2.3-rc1 package (#919477)
+
* Tue Mar 05 2013 Rex Dieter <rdieter at fedoraproject.org> 2.3-0.4.rc1
- 2.3-rc1
More information about the scm-commits
mailing list