From ef1aec50293e35c7274eec0bd6dc8514b8b9394b Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sat, 16 Jul 2016 00:52:34 +0200 Subject: [PATCH 01/16] - Update Qt 5.7.0 --- .gitignore | 1 + qt5-qtwebkit.spec | 57 +++++++++++++---------------------------------- sources | 2 +- 3 files changed, 18 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 2a3da9b..a3eba18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebkit-opensource-src-5.5.1.tar.xz /qtwebkit-opensource-src-5.6.0.tar.xz /qtwebkit-opensource-src-5.6.1-b889f46.tar.xz +/qtwebkit-opensource-src-5.7.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7c4e068..4cef959 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,40 +3,15 @@ %global _hardened_build 1 -#global bootstrap 1 - -# define to build docs, need to undef this for bootstrapping -# where qt5-qttools builds are not yet available -# only primary archs (for now), allow secondary to bootstrap -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 -%define docs 1 -%endif -%endif - -%global commit0 b889f460280ad98c89ede179bd3b9ce9cb02002b -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - Summary: Qt5 - QtWebKit components -Name: qt5-qtwebkit -Version: 5.6.1 -Release: 3.%{shortcommit0}git%{?dist} +Name: qt5-qtwebkit +Version: 5.7.0 +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://www.qt.io -%if 0%{?commit0:1} -# The source for this package was pulled from upstream's vcs. Use the -# following commands to generate the tarball: -# git clone git@github.com:qtproject/qtqebkit.git && cd qtwebkit -# git archive --prefix=qtwebkit-opensource-src-5.6.1/ origin/5.6.1 | tar -x -C .. -# cd ../qtwebkit-opensource-src-5.6.1 && syncqt.pl -version 5.6.1 Source/sync.profile && cd .. -# tar cfJ qt5-webkit-opensource-src-5.6.1.tar.xz qtwebkit-opensource-src-5.6.1/ -Source0: %{qt_module}-opensource-src-%{version}-%{shortcommit0}.tar.xz -%else -Source0: http://download.qt.io/community_releases/5.6/%{version}/qtwebkit-opensource-src-%{version}.tar.xz -%endif +Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/latest_src/submodules/qtwebkit-opensource-src-%{version}.tar.xz ## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -60,11 +35,11 @@ Patch109: 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel >= %{version} +BuildRequires: pkgconfig(Qt5Qml) >= %{version} %if ! 0%{?bootstrap} -BuildRequires: qt5-qtsensors-devel -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtwebchannel-devel +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Location) +BuildRequires: pkgconfig(Qt5WebChannel) %endif BuildRequires: bison BuildRequires: flex @@ -91,13 +66,10 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) BuildRequires: perl perl(version) BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) -BuildRequires: ruby rubygems -%if 0%{?fedora} -BuildRequires: rubypick -%endif +BuildRequires: ruby rubypick rubygems BuildRequires: zlib-devel -BuildRequires: qt5-qtbase-private-devel +BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} BuildRequires: qt5-qtdeclarative-private-devel %{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} @@ -156,7 +128,7 @@ pushd %{_target_platform} %{qmake_qt5} .. \ %ifnarch %{arm} %{ix86} x86_64 - DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 + DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 %endif # workaround, disable parallel compilation as it fails to compile in brew @@ -216,8 +188,11 @@ popd %changelog -* Wed Jun 15 2016 Rex Dieter - 5.6.1-3.b889f46git -- drop pkgconfig-style deps +* Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0-2 +- Compiled with gcc + +* Wed Jun 15 2016 Helio Chissini de Castro - 5.7.0-1 +- Qt 5.7.0 release ( non git, official package ) * Tue Jun 14 2016 Rex Dieter - 5.6.1-2.b889f46git - rebuild (glibc) diff --git a/sources b/sources index cb3acc2..c460ef3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a7f3953c457c57a942bdd6a92d198fb qtwebkit-opensource-src-5.6.1-b889f46.tar.xz +9379b8829639645c184fa63532035098 qtwebkit-opensource-src-5.7.0.tar.xz From 81f2a2b7150cbe0af0874c51a5d9d07d7ab1b43e Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 1 Dec 2016 11:40:54 +0100 Subject: [PATCH 02/16] - Update for 5.7.1 tentative final packages --- .gitignore | 1 + 0005-Added-missing-break-statement.patch | 26 ------------------------ qt5-qtwebkit.spec | 14 +++++-------- sources | 2 +- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 0005-Added-missing-break-statement.patch diff --git a/.gitignore b/.gitignore index a3eba18..1479790 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qtwebkit-opensource-src-5.6.0.tar.xz /qtwebkit-opensource-src-5.6.1-b889f46.tar.xz /qtwebkit-opensource-src-5.7.0.tar.xz +/qtwebkit-opensource-src-5.7.1.tar.xz diff --git a/0005-Added-missing-break-statement.patch b/0005-Added-missing-break-statement.patch deleted file mode 100644 index 558f2dd..0000000 --- a/0005-Added-missing-break-statement.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9d69c357ca97785eee385b14942a27ec2a680ede Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Fri, 20 May 2016 13:59:05 +0300 -Subject: [PATCH 5/9] Added missing break statement. - -Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74 -Reviewed-by: Allan Sandfeld Jensen ---- - Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp -index d1a7f6c..554ab89 100644 ---- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp -+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp -@@ -1179,6 +1179,7 @@ void QWebPageAdapter::triggerAction(QWebPageAdapter::MenuAction action, QWebHitT - case ToggleMediaPlayPause: - if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode)) - mediaElt->togglePlayState(); -+ break; - case ToggleMediaMute: - if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode)) - mediaElt->setMuted(!mediaElt->muted()); --- -2.7.4 - diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4cef959..f4d64b0 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -5,8 +5,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.7.0 -Release: 2%{?dist} +Version: 5.7.1 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -29,10 +29,6 @@ Patch7: 0001-Add-ARM-64-support.patch # truly madly deeply no rpath please, kthxbye Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch -## upstream patches -Patch105: 0005-Added-missing-break-statement.patch -Patch109: 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch - BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) >= %{version} @@ -102,9 +98,6 @@ BuildArch: noarch %prep %setup -q -n %{qt_module}-opensource-src-%{version} -%patch105 -p1 -b .0005 -%patch109 -p1 -b .0009 - %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo %patch4 -p1 -b .save_memory @@ -188,6 +181,9 @@ popd %changelog +* Wed Nov 09 2016 Helio Chissini de Castro - 5.7.1-1 +- New upstream version + * Mon Jul 04 2016 Helio Chissini de Castro - 5.7.0-2 - Compiled with gcc diff --git a/sources b/sources index c460ef3..2359e1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9379b8829639645c184fa63532035098 qtwebkit-opensource-src-5.7.0.tar.xz +93fb6f059904921bf8768b89513fcbd9 qtwebkit-opensource-src-5.7.1.tar.xz From d742cc3bedaccff7d2458505bb2c2ae526c9231f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 Dec 2016 06:42:33 -0600 Subject: [PATCH 03/16] drop BR: cmake (handled by qt5-rpm-macros now) 5.7.1 dec5 snapshot --- .gitignore | 4 ---- qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1479790..aba0364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -/qtwebkit-opensource-src-5.5.1.tar.xz -/qtwebkit-opensource-src-5.6.0.tar.xz -/qtwebkit-opensource-src-5.6.1-b889f46.tar.xz -/qtwebkit-opensource-src-5.7.0.tar.xz /qtwebkit-opensource-src-5.7.1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f4d64b0..0769db1 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.7.1 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -29,7 +29,6 @@ Patch7: 0001-Add-ARM-64-support.patch # truly madly deeply no rpath please, kthxbye Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch -BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) >= %{version} %if ! 0%{?bootstrap} @@ -181,6 +180,10 @@ popd %changelog +* Sat Dec 10 2016 Rex Dieter - 5.7.1-2 +- drop BR: cmake (handled by qt5-rpm-macros now) +- 5.7.1 dec5 snapshot + * Wed Nov 09 2016 Helio Chissini de Castro - 5.7.1-1 - New upstream version diff --git a/sources b/sources index 2359e1c..8c925ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93fb6f059904921bf8768b89513fcbd9 qtwebkit-opensource-src-5.7.1.tar.xz +SHA512 (qtwebkit-opensource-src-5.7.1.tar.xz) = 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a From ec9a0dc3ab4b3776da75ebab6ca614650d5266ef Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 14 Dec 2016 07:48:21 -0600 Subject: [PATCH 04/16] update source URL --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0769db1..ac868de 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/latest_src/submodules/qtwebkit-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/community_releases/5.7/%{version}/%{qt_module}-opensource-src-%{version}.tar.xz ## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too From d7a708c965ed17a415984c9f7e5457c05ba7c4f3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 2 Jan 2017 07:35:12 -0600 Subject: [PATCH 05/16] filter qml provides --- qt5-qtwebkit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ac868de..19c4c66 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.7.1 -Release: 2%{?dist} +Release: 3%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -29,6 +29,9 @@ Patch7: 0001-Add-ARM-64-support.patch # truly madly deeply no rpath please, kthxbye Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch +# filter qml provides +%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ + BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) >= %{version} %if ! 0%{?bootstrap} @@ -180,6 +183,9 @@ popd %changelog +* Mon Jan 02 2017 Rex Dieter - 5.7.1-3 +- filter qml provides + * Sat Dec 10 2016 Rex Dieter - 5.7.1-2 - drop BR: cmake (handled by qt5-rpm-macros now) - 5.7.1 dec5 snapshot From 923e800c90aed6a1491d08cdf8a316cee43a69f6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 2 Jan 2017 09:55:40 -0600 Subject: [PATCH 06/16] BR: python (and make qtdeclarative dep explicit) --- qt5-qtwebkit.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 19c4c66..cb646b1 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -33,7 +33,7 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: qt5-qtdeclarative-devel >= %{version} %if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5Sensors) BuildRequires: pkgconfig(Qt5Location) @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) BuildRequires: perl perl(version) BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) +BuildRequires: python BuildRequires: ruby rubypick rubygems BuildRequires: zlib-devel @@ -184,7 +185,7 @@ popd %changelog * Mon Jan 02 2017 Rex Dieter - 5.7.1-3 -- filter qml provides +- filter qml provides, BR: qtdeclarative python expicitly * Sat Dec 10 2016 Rex Dieter - 5.7.1-2 - drop BR: cmake (handled by qt5-rpm-macros now) From b40fef1b112242a9aa736d2355b1d6757b4caa68 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 1 Feb 2017 19:30:47 +0100 Subject: [PATCH 07/16] Rebuild (libwebp) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index cb646b1..79ff276 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.7.1 -Release: 3%{?dist} +Release: 4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -184,6 +184,9 @@ popd %changelog +* Wed Feb 01 2017 Sandro Mani - 5.7.1-4 +- Rebuild (libwebp) + * Mon Jan 02 2017 Rex Dieter - 5.7.1-3 - filter qml provides, BR: qtdeclarative python expicitly From ab93e5c1fa4d09f7273bababf4702f25c7bcb4d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 11:22:55 +0000 Subject: [PATCH 08/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 79ff276..9283a5c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.7.1 -Release: 4%{?dist} +Release: 5%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -184,6 +184,9 @@ popd %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 5.7.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 01 2017 Sandro Mani - 5.7.1-4 - Rebuild (libwebp) From 7b1797e44c1b0a91495fcab5b77b5d847e4a870e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 30 Mar 2017 13:32:28 -0500 Subject: [PATCH 09/16] 5.8.0 --- .gitignore | 1 + qt5-qtwebkit.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index aba0364..d5a94fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.7.1.tar.xz +/qtwebkit-opensource-src-5.8.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9283a5c..0898aec 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -5,13 +5,13 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.7.1 -Release: 5%{?dist} +Version: 5.8.0 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Source0: http://download.qt.io/community_releases/5.7/%{version}/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/community_releases/5.8/%{version}-final/%{qt_module}-opensource-src-%{version}.tar.xz ## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -75,7 +75,6 @@ BuildRequires: qt5-qtdeclarative-private-devel ##upstream patches - %description %{summary} @@ -184,6 +183,9 @@ popd %changelog +* Thu Mar 30 2017 Rex Dieter - 5.8.0-1 +- 5.8.0 + * Sat Feb 11 2017 Fedora Release Engineering - 5.7.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 8c925ec..9ee62b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-opensource-src-5.7.1.tar.xz) = 538928ada8fd25c01f0b78efac79e004904e6e4ec110108c492877e334acd5d9253653d3b207e535d1e08d092af2833a7566cebb2bf8b90069944634bf24f60a +SHA512 (qtwebkit-opensource-src-5.8.0.tar.xz) = 980b5d267d31911f96822656d33407749eb7aa705d17051fe024505d51b0a6418cbd3492ba703057e8e22b0b1242a923f8b119ef9d52b70b7e6c28f36b2c9b84 From 4b8a455781ee625128fdc48eb378df400698800a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 31 Mar 2017 05:51:52 -0500 Subject: [PATCH 10/16] update %%files --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0898aec..60617b8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -163,7 +163,7 @@ popd %doc ChangeLog* VERSION %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* -%{_qt5_libexecdir}/QtWebPluginProcess +#{_qt5_libexecdir}/QtWebPluginProcess %{_qt5_libexecdir}/QtWebProcess %{_qt5_archdatadir}/qml/QtWebKit/ From 18a4a0846437a30fe2c911b286b76e5fffed11ec Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 10 May 2017 20:37:16 +0200 Subject: [PATCH 11/16] - Beta 3 community --- .gitignore | 1 + qt5-qtwebkit.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d5a94fe..c7bfa97 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.7.1.tar.xz /qtwebkit-opensource-src-5.8.0.tar.xz +/qtwebkit-opensource-src-5.9.0-beta3.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 60617b8..913855f 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -5,13 +5,13 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.8.0 -Release: 1%{?dist} +Version: 5.9.0 +Release: 0.beta.3%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Source0: http://download.qt.io/community_releases/5.8/%{version}-final/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt.io/community_releases/5.9/%{version}-beta3/%{qt_module}-opensource-src-%{version}-beta3.tar.xz ## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -73,8 +73,6 @@ BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-private-devel %{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} -##upstream patches - %description %{summary} @@ -98,7 +96,7 @@ BuildArch: noarch %prep -%setup -q -n %{qt_module}-opensource-src-%{version} +%setup -q -n %{qt_module}-opensource-src-%{version}-beta3 %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo @@ -163,7 +161,7 @@ popd %doc ChangeLog* VERSION %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* -#{_qt5_libexecdir}/QtWebPluginProcess +%{_qt5_libexecdir}/QtWebPluginProcess %{_qt5_libexecdir}/QtWebProcess %{_qt5_archdatadir}/qml/QtWebKit/ @@ -183,6 +181,9 @@ popd %changelog +* Wed May 10 2017 Helio Chissini de Castro - 5.9.0-0.beta.3 +- Community beta3 + * Thu Mar 30 2017 Rex Dieter - 5.8.0-1 - 5.8.0 diff --git a/sources b/sources index 9ee62b9..650d33c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-opensource-src-5.8.0.tar.xz) = 980b5d267d31911f96822656d33407749eb7aa705d17051fe024505d51b0a6418cbd3492ba703057e8e22b0b1242a923f8b119ef9d52b70b7e6c28f36b2c9b84 +SHA512 (qtwebkit-opensource-src-5.9.0-beta3.tar.xz) = 188d5abcb964a880fa00d80a9791f750a4328f7ccb6339f38e2b5e8876538522eae170e42af6ffc9ce9130c1639d9b7cfdb56e825c2e89f355a9489972338395 From 2146421991dcd905a2011866e8bf7ff3d61a255d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 21:02:24 +0000 Subject: [PATCH 12/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 913855f..d7438b3 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.9.0 -Release: 0.beta.3%{?dist} +Release: 0.beta.3%{?dist}.1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -181,6 +181,9 @@ popd %changelog +* Mon May 15 2017 Fedora Release Engineering - 5.9.0-0.beta.3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Wed May 10 2017 Helio Chissini de Castro - 5.9.0-0.beta.3 - Community beta3 From cc17939ccf07b04487b66ba77d5960d01d8727f5 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 28 May 2017 15:21:54 +0200 Subject: [PATCH 13/16] Release candidate --- .gitignore | 1 + qt5-qtwebkit.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c7bfa97..ddfce08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebkit-opensource-src-5.7.1.tar.xz /qtwebkit-opensource-src-5.8.0.tar.xz /qtwebkit-opensource-src-5.9.0-beta3.tar.xz +/qtwebkit-opensource-src-5.9.0-rc.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d7438b3..268f155 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,12 +6,12 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.9.0 -Release: 0.beta.3%{?dist}.1 +Release: 0.1.rc%{?dist}.1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Source0: http://download.qt.io/community_releases/5.9/%{version}-beta3/%{qt_module}-opensource-src-%{version}-beta3.tar.xz +Source0: http://download.qt.io/community_releases/5.9/%{version}-rc/%{qt_module}-opensource-src-%{version}-rc.tar.xz ## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -96,7 +96,7 @@ BuildArch: noarch %prep -%setup -q -n %{qt_module}-opensource-src-%{version}-beta3 +%setup -q -n %{qt_module}-opensource-src-%{version}-rc %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo @@ -181,6 +181,9 @@ popd %changelog +* Sun May 28 2017 Helio Chissini de Castro - 5.9.0-0.1.rc +- Release candidate community + * Mon May 15 2017 Fedora Release Engineering - 5.9.0-0.beta.3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild diff --git a/sources b/sources index 650d33c..4a4dc65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-opensource-src-5.9.0-beta3.tar.xz) = 188d5abcb964a880fa00d80a9791f750a4328f7ccb6339f38e2b5e8876538522eae170e42af6ffc9ce9130c1639d9b7cfdb56e825c2e89f355a9489972338395 +SHA512 (qtwebkit-opensource-src-5.9.0-rc.tar.xz) = b7e32afa52795d33a856db9709868326e2b821f210ddc0704cb1107b92eaa475e2f069fab0f53ad7f0558139c0bebb16d4e7bfd6f296c9dbbb57d1cef8d0b6a3 From 8c002dcc6fb0e5d3fe098efa427e026139209a58 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 Jun 2017 19:58:51 -0500 Subject: [PATCH 14/16] fix epel7 build no rubypick on epel7 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 268f155..b79af0a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -65,7 +65,10 @@ BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) BuildRequires: perl perl(version) BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) BuildRequires: python -BuildRequires: ruby rubypick rubygems +BuildRequires: ruby rubygems +%if 0%{?fedora} +BuildRequires: rubypick +%endif BuildRequires: zlib-devel BuildRequires: qt5-qtbase-private-devel From 2c7140fb8d7af3ceb513c5562926a2b3fff7d581 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 Jun 2017 20:31:20 -0500 Subject: [PATCH 15/16] 5.9.0 (final) --- .gitignore | 5 +---- qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ddfce08..8e53980 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/qtwebkit-opensource-src-5.7.1.tar.xz -/qtwebkit-opensource-src-5.8.0.tar.xz -/qtwebkit-opensource-src-5.9.0-beta3.tar.xz -/qtwebkit-opensource-src-5.9.0-rc.tar.xz +/qtwebkit-opensource-src-5.9.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b79af0a..3ae2a01 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,12 +6,12 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.9.0 -Release: 0.1.rc%{?dist}.1 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html License: LGPLv2 with exceptions or GPLv3 with exceptions -Source0: http://download.qt.io/community_releases/5.9/%{version}-rc/%{qt_module}-opensource-src-%{version}-rc.tar.xz +Source0: http://download.qt.io/community_releases/5.9/%{version}-final/%{qt_module}-opensource-src-%{version}.tar.xz ## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -184,6 +184,9 @@ popd %changelog +* Sat Jun 10 2017 Rex Dieter - 5.9.0-1 +- 5.9.0 (final) + * Sun May 28 2017 Helio Chissini de Castro - 5.9.0-0.1.rc - Release candidate community diff --git a/sources b/sources index 4a4dc65..720974c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-opensource-src-5.9.0-rc.tar.xz) = b7e32afa52795d33a856db9709868326e2b821f210ddc0704cb1107b92eaa475e2f069fab0f53ad7f0558139c0bebb16d4e7bfd6f296c9dbbb57d1cef8d0b6a3 +SHA512 (qtwebkit-opensource-src-5.9.0.tar.xz) = 3a889cda4604db66ce95957ca415d68591d8e8cf1f87e4fced2c180e0ff8ed1298260b6048b79cb8f72ad2e1b47be2d58b361cd9d31256f6deee7c1600d046ea From 030994b40625bd0e78f629ea9842620c6b56e3c5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 Jun 2017 21:19:30 -0500 Subject: [PATCH 16/16] fix %%setup --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3ae2a01..2fc4b90 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -99,7 +99,7 @@ BuildArch: noarch %prep -%setup -q -n %{qt_module}-opensource-src-%{version}-rc +%setup -q -n %{qt_module}-opensource-src-%{version} %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo