From 94c03c2705d1e0ce9fe6dd298d0efbe770012599 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Oct 2015 09:13:53 -0500 Subject: [PATCH 1/5] drop (unused) system_angle support/patches at least until anyone else is interested in picking up maintenance of angleproject in fedora, see also: https://bugzilla.redhat.com/show_bug.cgi?id=967234 --- qt5-qtwebkit.spec | 22 +--- ...it-opensource-src-5.0.2-system_angle.patch | 114 ------------------ webkit-commit-142567.patch | 57 --------- 3 files changed, 4 insertions(+), 189 deletions(-) delete mode 100644 qtwebkit-opensource-src-5.0.2-system_angle.patch delete mode 100644 webkit-commit-142567.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8495a2b..7383767 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.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 @@ -36,14 +36,6 @@ Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch # tweak linker flags to minimize memory usage on "small" platforms Patch4: qtwebkit-opensource-src-5.2.0-save_memory.patch -# use unbundled system angleproject library -#define system_angle 1 -# NEEDS REBASE -- rex -Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch -# Fix compilation against latest ANGLE -# https://bugs.webkit.org/show_bug.cgi?id=109127 -Patch6: webkit-commit-142567.patch - # Add AArch64 support Patch7: 0001-Add-ARM-64-support.patch @@ -121,10 +113,6 @@ BuildArch: noarch %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo %patch4 -p1 -b .save_memory -%if 0%{?system_angle} -#patch5 -p1 -b .system_angle -%patch6 -p1 -b .svn142567 -%endif %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath @@ -134,17 +122,12 @@ mkdir Source/ThirdParty/orig mv Source/ThirdParty/{gtest/,qunit/} \ Source/ThirdParty/orig/ -%if 0%{?system_angle} -mv Source/ThirdParty/ANGLE/ \ - Source/ThirdParty/orig/ -%endif %build mkdir %{_target_platform} pushd %{_target_platform} %{qmake_qt5} .. \ - %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \ %ifnarch %{arm} %{ix86} x86_64 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 %endif @@ -205,6 +188,9 @@ popd %changelog +* Fri Oct 16 2015 Rex Dieter 5.5.1-3 +- drop (unused) system_angle support/patches + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/qtwebkit-opensource-src-5.0.2-system_angle.patch b/qtwebkit-opensource-src-5.0.2-system_angle.patch deleted file mode 100644 index 6d5009c..0000000 --- a/qtwebkit-opensource-src-5.0.2-system_angle.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up qtwebkit-opensource-src-5.0.2/Source/api.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/api.pri ---- qtwebkit-opensource-src-5.0.2/Source/api.pri.system_angle 2013-04-08 19:11:51.000000000 -0500 -+++ qtwebkit-opensource-src-5.0.2/Source/api.pri 2013-05-25 07:24:57.723118634 -0500 -@@ -24,8 +24,6 @@ build?(webkit1): { - } - build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri - --use?(3D_GRAPHICS): WEBKIT += angle -- - MODULE = webkit - CONFIG += creating_module - -diff -up qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri ---- qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri.system_angle 2013-04-08 19:11:51.000000000 -0500 -+++ qtwebkit-opensource-src-5.0.2/Source/WebCore/Target.pri 2013-05-25 07:24:57.722118644 -0500 -@@ -3988,7 +3988,7 @@ use?(3D_GRAPHICS) { - platform/graphics/texmap/TextureMapperGL.cpp \ - platform/graphics/texmap/TextureMapperShaderManager.cpp - -- INCLUDEPATH += $$PWD/platform/graphics/gpu -+ INCLUDEPATH += $$PWD/platform/graphics/gpu /usr/include/GLSLANG - - contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { - !contains(QT_CONFIG, opengles2) { -diff -up qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri ---- qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri.system_angle 2013-05-25 07:24:57.718118687 -0500 -+++ qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri 2013-05-25 09:24:18.318809566 -0500 -@@ -214,12 +214,13 @@ enable?(WEB_AUDIO) { - - use?(3D_GRAPHICS) { - win32: { -- win32-g++: { -+ win32-g++*: { - # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols - contains(QT_CONFIG, opengles2) { - CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { - LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG - } else { -+ INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG - LIBS += $$QMAKE_LIBS_OPENGL_ES2 - } - } else { -@@ -228,6 +229,8 @@ use?(3D_GRAPHICS) { - } - } else { - contains(QT_CONFIG, opengles2): LIBS += -lEGL -+ INCLUDEPATH += /usr/include/GLSLANG -+ LIBS += -ltranslator_glsl -ltranslator_common -lpreprocessor - } - } - -diff -up qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri.system_angle qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri ---- qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri.system_angle 2013-04-08 19:11:42.000000000 -0500 -+++ qtwebkit-opensource-src-5.0.2/Source/WebKit2/Target.pri 2013-05-25 07:24:57.723118634 -0500 -@@ -938,7 +938,10 @@ enable?(TOUCH_EVENTS) { - - enable?(GEOLOCATION): QT += location - --use?(3D_GRAPHICS): WEBKIT += angle -+use?(3D_GRAPHICS) { -+ WEBKIT += angle -+ INCLUDEPATH += /usr/include/GLSLANG -+} - - use?(PLUGIN_BACKEND_XLIB) { - DEFINES += XP_UNIX -diff -up qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro.system_angle qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro ---- qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro.system_angle 2013-04-08 19:11:39.000000000 -0500 -+++ qtwebkit-opensource-src-5.0.2/Source/WebKit/WebKit1.pro 2013-05-25 07:24:57.722118644 -0500 -@@ -92,7 +92,10 @@ HEADERS += \ - INCLUDEPATH += \ - $$PWD/qt/WebCoreSupport - --use?(3D_GRAPHICS): WEBKIT += angle -+use?(3D_GRAPHICS) { -+ WEBKIT += angle -+ INCLUDEPATH += /usr/include/GLSLANG -+} - - enable?(GEOLOCATION) { - HEADERS += \ -diff -up qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf.system_angle qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf ---- qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf.system_angle 2013-04-08 19:11:53.000000000 -0500 -+++ qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/features/webkit_modules.prf 2013-05-25 07:24:57.723118634 -0500 -@@ -7,7 +7,7 @@ - - # Reorder libraries so that the link and include order is correct, - # and make sure the case matches the original case. --libraries = WebKit1 WebKit2 WebCore ANGLE JavaScriptCore WTF -+libraries = WebKit1 WebKit2 WebCore JavaScriptCore WTF - for(library, libraries) { - contains(WEBKIT, $$lower($$library)) { - WEBKIT -= $$lower($$library) -diff -up qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/modules/angle.prf.system_angle qtwebkit-opensource-src-5.0.2/Tools/qmake/mkspecs/modules/angle.prf -diff -up qtwebkit-opensource-src-5.0.2/WebKit.pro.system_angle qtwebkit-opensource-src-5.0.2/WebKit.pro ---- qtwebkit-opensource-src-5.0.2/WebKit.pro.system_angle 2013-04-08 19:11:32.000000000 -0500 -+++ qtwebkit-opensource-src-5.0.2/WebKit.pro 2013-05-25 07:24:57.720118666 -0500 -@@ -18,11 +18,11 @@ JavaScriptCore.file = Source/JavaScriptC - JavaScriptCore.makefile = Makefile.JavaScriptCore - SUBDIRS += JavaScriptCore - --use?(3D_GRAPHICS) { -- ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro -- ANGLE.makefile = Makefile.ANGLE -- SUBDIRS += ANGLE --} -+#use?(3D_GRAPHICS) { -+# ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro -+# ANGLE.makefile = Makefile.ANGLE -+# SUBDIRS += ANGLE -+#} - - WebCore.file = Source/WebCore/WebCore.pro - WebCore.makefile = Makefile.WebCore diff --git a/webkit-commit-142567.patch b/webkit-commit-142567.patch deleted file mode 100644 index af8c3e8..0000000 --- a/webkit-commit-142567.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp -=================================================================== ---- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 136430) -+++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp (revision 142567) -@@ -33,7 +33,14 @@ - namespace WebCore { - --inline static int getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo) --{ -- int value = -1; -+// Temporary typedef to support an incompatible change in the ANGLE API. -+#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108 -+typedef int ANGLEGetInfoType; -+#else -+typedef size_t ANGLEGetInfoType; -+#endif -+ -+inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo) -+{ -+ ANGLEGetInfoType value = 0; - ShGetInfo(compiler, shaderInfo, &value); - return value; -@@ -56,13 +63,11 @@ - } - -- int numSymbols = getValidationResultValue(compiler, symbolType); -- if (numSymbols < 0) -- return false; -- -- int maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType); -+ ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType); -+ -+ ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType); - if (maxNameLength <= 1) - return false; - -- int maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH); -+ ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH); - if (maxMappedNameLength <= 1) - return false; -@@ -72,7 +77,7 @@ - Vector mappedNameBuffer(maxMappedNameLength); - -- for (int i = 0; i < numSymbols; ++i) { -+ for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) { - ANGLEShaderSymbol symbol; -- int nameLength = -1; -+ ANGLEGetInfoType nameLength = 0; - switch (symbolType) { - case SH_ACTIVE_ATTRIBUTES: -@@ -88,5 +93,5 @@ - return false; - } -- if (nameLength <= 0) -+ if (!nameLength) - return false; - From 62ddb7faf720fbea74f8a8dc35b936074a0ec5c4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Oct 2015 13:05:27 -0500 Subject: [PATCH 2/5] angle remnants --- qt5-qtwebkit.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7383767..151493e 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -42,10 +42,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 -%if 0%{?system_angle} -BuildRequires: angleproject-devel angleproject-static -%endif - BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: qt5-qtlocation-devel From 4d2e659f10f8a170d30580f754f49cf68e1e9981 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 28 Oct 2015 14:08:47 +0100 Subject: [PATCH 3/5] rebuild for ICU 56.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 151493e..7a82725 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.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 Oct 28 2015 David Tardon - 5.5.1-4 +- rebuild for ICU 56.1 + * Fri Oct 16 2015 Rex Dieter 5.5.1-3 - drop (unused) system_angle support/patches From d63219812be5d496beb14ad38583e1506bed0282 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 16:25:51 -0600 Subject: [PATCH 4/5] 5.6.0 (sync with qt5 copr), re-add bootstrap macro support --- .gitignore | 7 +------ qt5-qtwebkit.spec | 24 +++++++++++++++--------- sources | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index d818f91..cdd7ca0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -/qtwebkit-opensource-src-5.4.0.tar.xz -/qtwebkit-opensource-src-5.4.1.tar.xz -/qtwebkit-opensource-src-5.4.2.tar.xz -/qtwebkit-opensource-src-5.5.0-rc.tar.xz -/qtwebkit-opensource-src-5.5.0.tar.xz -/qtwebkit-opensource-src-5.5.1-rc1.tar.xz /qtwebkit-opensource-src-5.5.1.tar.xz +/qtwebkit-opensource-src-5.6.0-beta1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7a82725..4f86188 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,7 +6,7 @@ # 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 -#global bootstrap 1 +%global bootstrap 1 %if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 @@ -14,12 +14,12 @@ %endif %endif -## define prerelease rc1 +%define prerelease beta1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.5.1 -Release: 4%{?dist} +Version: 5.6.0 +Release: 0.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 @@ -43,11 +43,10 @@ Patch7: 0001-Add-ARM-64-support.patch Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: qt5-qtdeclarative-devel >= %{version} -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtsensors-devel -BuildRequires: qt5-qtwebchannel - +BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5Location) +BuildRequires: pkgconfig(Qt5WebChannel) BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -96,6 +95,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %if 0%{?docs} %package doc Summary: API documentation for %{name} +BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc @@ -184,6 +184,12 @@ popd %changelog +* Sun Dec 06 2015 Rex Dieter 5.6.0-0.2 +- (re)add bootstrap macro support + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Wed Oct 28 2015 David Tardon - 5.5.1-4 - rebuild for ICU 56.1 diff --git a/sources b/sources index c3c4633..e6c50bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -681328edb539b8fa3a273b38c90b3e31 qtwebkit-opensource-src-5.5.1.tar.xz +7f06fdbf4fd1eff94c1c85068c155c1c qtwebkit-opensource-src-5.6.0-beta1.tar.xz From 78da47ae310e6a526442b314ee224ad44fbd9991 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 6 Dec 2015 19:40:56 -0600 Subject: [PATCH 5/5] new-sources (for real this time) --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e6c50bd..f0e6f07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f06fdbf4fd1eff94c1c85068c155c1c qtwebkit-opensource-src-5.6.0-beta1.tar.xz +cce8bfe12016c85313c0087a280a6d2f qtwebkit-opensource-src-5.6.0-beta1.tar.xz