[packages/qt5-qttools] fix build with qtwebkit

atler atler at pld-linux.org
Mon Jun 1 17:16:05 CEST 2020


commit 9b7eb7648f12cb804120c79f3841f773a2ab1127
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jun 1 17:14:50 2020 +0200

    fix build with qtwebkit
    
    see https://bugreports.qt.io/browse/QTBUG-83938

 qt5-qttools.spec |  2 ++
 qtwebkit.patch   | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
---
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index 950496f..d1db187 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -29,6 +29,7 @@ Source0:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/%
 # Source0-md5:	cbf72f34c9d53508f95b9a4db5322ffa
 Source1:	http://download.qt.io/official_releases/qt/5.15/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
 # Source1-md5:	7cbff3badaf760badbcdb5fcba109c1b
+Patch0:		qtwebkit.patch
 URL:		http://www.qt.io/
 BuildRequires:	OpenGL-devel
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
@@ -323,6 +324,7 @@ Przykłady do narzędzi Qt5.
 
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
+%patch0 -p1
 
 %build
 qmake-qt5
diff --git a/qtwebkit.patch b/qtwebkit.patch
new file mode 100644
index 0000000..c1811d5
--- /dev/null
+++ b/qtwebkit.patch
@@ -0,0 +1,14 @@
+--- qttools-everywhere-src-5.15.0/src/assistant/assistant/helpviewer_qwv.cpp.orig	2020-06-01 17:00:23.023062657 +0200
++++ qttools-everywhere-src-5.15.0/src/assistant/assistant/helpviewer_qwv.cpp	2020-06-01 17:00:44.593008843 +0200
+@@ -363,6 +363,11 @@
+     QWebView::mouseReleaseEvent(event);
+ }
+ 
++void HelpViewer::resizeEvent(QResizeEvent *e)
++{
++    QWebView::resizeEvent(e);
++}
++
+ // -- private slots
+ 
+ void HelpViewer::actionChanged()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qttools.git/commitdiff/9b7eb7648f12cb804120c79f3841f773a2ab1127



More information about the pld-cvs-commit mailing list