From dad7cc4164010c2598b2b18b17004e92a87d6a63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 24 Jun 2013 12:21:40 +0000 Subject: [PATCH 001/208] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 41a11e7409295c684694719b6500a2d71353cbb4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 2 Aug 2013 08:25:47 -0500 Subject: [PATCH 002/208] import --- .gitignore | 1 + qt5-qtwebkit.spec | 198 ++++++++++++++++++ qtwebkit-2.3-save_memory.patch | 12 ++ qtwebkit-opensource-src-5.0.1-debuginfo.patch | 80 +++++++ ...it-opensource-src-5.0.2-system_angle.patch | 114 ++++++++++ sources | 1 + webkit-commit-142567.patch | 57 +++++ webkit-commit-147345.patch | 105 ++++++++++ webkit-commit-147640.patch | 12 ++ webkit-qtwebkit-2.2-tp1-pluginpath.patch | 19 ++ 10 files changed, 599 insertions(+) create mode 100644 qt5-qtwebkit.spec create mode 100644 qtwebkit-2.3-save_memory.patch create mode 100644 qtwebkit-opensource-src-5.0.1-debuginfo.patch create mode 100644 qtwebkit-opensource-src-5.0.2-system_angle.patch create mode 100644 webkit-commit-142567.patch create mode 100644 webkit-commit-147345.patch create mode 100644 webkit-commit-147640.patch create mode 100644 webkit-qtwebkit-2.2-tp1-pluginpath.patch diff --git a/.gitignore b/.gitignore index e69de29..44a97fc 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/qtwebkit-opensource-src-5.0.2.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec new file mode 100644 index 0000000..2fe909b --- /dev/null +++ b/qt5-qtwebkit.spec @@ -0,0 +1,198 @@ + +%global qt_module qtwebkit + +Summary: Qt5 - QtWebKit components +Name: qt5-qtwebkit +Version: 5.0.2 +Release: 6%{?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://qt-project.org/ +Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz + +# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too +Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch + +# smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit +Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch + +# tweak linker flags to minimize memory usage on "small" platforms +Patch4: qtwebkit-2.3-save_memory.patch + +# try to use unbundled system angleproject library +%define system_angle 1 +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 +%if 0%{?system_angle} +BuildRequires: angleproject-devel angleproject-static +%endif + +# Prevent flooding the logs with warnings about COMPILE_ASSERT +# https://bugs.webkit.org/show_bug.cgi?id=113147 +# Based on upstream commit r147640 +Patch7: webkit-commit-147640.patch + +# Prevent flooding the logs with warnings about HashMap +# https://bugs.webkit.org/show_bug.cgi?id=113454 +Patch9: webkit-commit-147345.patch + + +BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qtdeclarative-devel >= %{version} + +BuildRequires: bison +BuildRequires: chrpath +BuildRequires: flex +BuildRequires: gperf +BuildRequires: libicu-devel +BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gl) +# gstreamer media support +BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) +BuildRequires: perl perl(version) perl(Digest::MD5) +BuildRequires: ruby +BuildRequires: zlib-devel + +%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} + +##upstream patches + + +%description +%{summary} + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +Requires: qt5-qtdeclarative-devel%{?_isa} +%description devel +%{summary}. + + +%prep +%setup -q -n qtwebkit-opensource-src-%{version}%{?pre:-%{pre}} + +%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 .svn147640 +%patch9 -p1 -b .svn147345 + +echo "nuke bundled code..." +# nuke bundled code +mkdir Source/ThirdParty/orig +mv Source/ThirdParty/{glu/,gtest/,gyp/,mt19937ar.c,qunit/} \ + Source/ThirdParty/orig/ + +%if 0%{?system_angle} +mv Source/ThirdParty/ANGLE/ \ + Source/ThirdParty/orig/ +%endif + + +%build +%{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} + +make %{?_smp_mflags} + + +%install + +make install INSTALL_ROOT=%{buildroot} + +## .prl file love (maybe consider just deleting these -- rex +# nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs +sed -i \ + -e "/^QMAKE_PRL_BUILD_DIR/d" \ + -e "/^QMAKE_PRL_LIBS/d" \ + %{buildroot}%{_qt5_libdir}/*.prl + +## unpackaged files +# .la files, die, die, die. +rm -fv %{buildroot}%{_qt5_libdir}/lib*.la + +## kill rpath's +pushd %{buildroot} +for remove_rpath in \ + %{_qt5_libexecdir}/QtWebPluginProcess \ + %{_qt5_libexecdir}/QtWebProcess \ + %{_qt5_archdatadir}/qml/QtWebKit/libqmlwebkitplugin.so \ + %{_qt5_archdatadir}/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so \ +; do +chrpath --list %{buildroot}$remove_rpath +chrpath --delete %{buildroot}$remove_rpath +done +popd + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%doc Source/WebCore/LICENSE* +%doc ChangeLog VERSION +%{_qt5_libdir}/libQt5WebKit.so.5* +%{_qt5_libdir}/libQt5WebKitWidgets.so.5* +%{_qt5_libexecdir}/QtWebPluginProcess +%{_qt5_libexecdir}/QtWebProcess +%{_qt5_archdatadir}/qml/QtWebKit/ + +%files devel +%{_qt5_headerdir}/Qt*/ +%{_qt5_libdir}/libQt5*.so +%{_qt5_libdir}/libQt5*.prl +%{_qt5_libdir}/cmake/Qt5*/ +%{_qt5_libdir}/pkgconfig/Qt5*.pc +%{_qt5_archdatadir}/mkspecs/modules/*.pri + + +%changelog +* Fri Jun 21 2013 Rex Dieter 5.0.2-6 +- %%doc ChangeLog VERSION +- %%doc Source/WebCore/LICENSE* +- squash more rpaths + +* Fri May 17 2013 Rex Dieter 5.0.2-5 +- unbundle angleproject code + +* Wed May 15 2013 Rex Dieter 5.0.2-4 +- BR: perl(version) perl(Digest::MD5) pkgconfig(xslt) +- deal with bundled code +- add (commented) upstream link http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html + to clarify licensing + +* Thu May 09 2013 Rex Dieter 5.0.2-3 +- -devel: Requires: qt5-qtdeclarative-devel + +* Fri Apr 12 2013 Rex Dieter 5.0.2-2 +- BR: qt5-qtdeclarative-devel + +* Thu Apr 11 2013 Rex Dieter 5.0.2-1 +- 5.0.2 + +* Mon Feb 25 2013 Rex Dieter 5.0.1-2 +- .prl love +- BR: pkgconfig(gl) + +* Sat Feb 23 2013 Rex Dieter 5.0.1-1 +- first try + diff --git a/qtwebkit-2.3-save_memory.patch b/qtwebkit-2.3-save_memory.patch new file mode 100644 index 0000000..6ccb158 --- /dev/null +++ b/qtwebkit-2.3-save_memory.patch @@ -0,0 +1,12 @@ +diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebkit-23/Source/WebCore/WebCore.pri +--- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory 2013-02-15 09:46:12.000000000 -0600 ++++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 16:42:30.996634743 -0600 +@@ -336,6 +336,8 @@ mac { + } + unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections + unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections ++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory ++unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF + + unix|win32-g++* { diff --git a/qtwebkit-opensource-src-5.0.1-debuginfo.patch b/qtwebkit-opensource-src-5.0.1-debuginfo.patch new file mode 100644 index 0000000..b9224a9 --- /dev/null +++ b/qtwebkit-opensource-src-5.0.1-debuginfo.patch @@ -0,0 +1,80 @@ +diff -up qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri +--- qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-01-29 13:03:49.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-23 13:54:22.578460045 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR} + + INCLUDEPATH += \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo 2013-01-29 13:03:41.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri 2013-02-23 13:57:16.984279672 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore + ++equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1") ++ QMAKE_CXXFLAGS_RELEASE -= -g ++ QMAKE_CXXFLAGS_RELEASE += -g1 ++} ++ + QT *= network sql core-private gui-private + + WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR} +diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo 2013-01-29 13:03:39.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri 2013-02-23 13:54:22.579460033 -0600 +@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ + + WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR} + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR \ + $$SOURCE_DIR/Platform \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri +--- qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo 2013-01-29 13:03:54.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri 2013-02-23 13:54:22.579460033 -0600 +@@ -7,6 +7,12 @@ + + SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + INCLUDEPATH += \ + $$SOURCE_DIR/qt/Api \ + $$SOURCE_DIR/qt/WebCoreSupport \ +diff -up qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri +--- qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo 2013-01-29 13:03:38.000000000 -0600 ++++ qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri 2013-02-23 13:56:23.584947256 -0600 +@@ -8,6 +8,12 @@ + # All external modules should include WTF headers by prefixing with "wtf" (#include ). + INCLUDEPATH += $$PWD + ++#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { ++# message("WTF workaround for QtWebkit: do not build with -g, but with -g1") ++# QMAKE_CXXFLAGS_RELEASE -= -g ++# QMAKE_CXXFLAGS_RELEASE += -g1 ++#} ++ + mac { + # Mac OS does ship libicu but not the associated header files. + # Therefore WebKit provides adequate header files. diff --git a/qtwebkit-opensource-src-5.0.2-system_angle.patch b/qtwebkit-opensource-src-5.0.2-system_angle.patch new file mode 100644 index 0000000..6d5009c --- /dev/null +++ b/qtwebkit-opensource-src-5.0.2-system_angle.patch @@ -0,0 +1,114 @@ +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/sources b/sources index e69de29..84c2a5e 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +85aad9f287910c21c8464d7d1ea010a9 qtwebkit-opensource-src-5.0.2.tar.xz diff --git a/webkit-commit-142567.patch b/webkit-commit-142567.patch new file mode 100644 index 0000000..af8c3e8 --- /dev/null +++ b/webkit-commit-142567.patch @@ -0,0 +1,57 @@ +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; + diff --git a/webkit-commit-147345.patch b/webkit-commit-147345.patch new file mode 100644 index 0000000..6fa6a14 --- /dev/null +++ b/webkit-commit-147345.patch @@ -0,0 +1,105 @@ +Index: trunk/Source/WTF/wtf/HashMap.h +=================================================================== +--- trunk/Source/WTF/wtf/HashMap.h (revision 147344) ++++ trunk/Source/WTF/wtf/HashMap.h (revision 147345) +@@ -137,27 +137,33 @@ + AddResult inlineAdd(const KeyType&, MappedPassInReferenceType); + +- class HashMapKeysProxy : private HashMap { ++ HashTableType m_impl; ++ }; ++ ++ template ++ class HashMap::HashMapKeysProxy : ++ private HashMap { + public: +- typedef typename HashMap::iterator::Keys iterator; +- typedef typename HashMap::const_iterator::Keys const_iterator; +- ++ typedef HashMap HashMapType; ++ typedef typename HashMapType::iterator::Keys iterator; ++ typedef typename HashMapType::const_iterator::Keys const_iterator; ++ + iterator begin() + { +- return HashMap::begin().keys(); +- } +- ++ return HashMapType::begin().keys(); ++ } ++ + iterator end() + { +- return HashMap::end().keys(); ++ return HashMapType::end().keys(); + } + + const_iterator begin() const + { +- return HashMap::begin().keys(); +- } +- ++ return HashMapType::begin().keys(); ++ } ++ + const_iterator end() const + { +- return HashMap::end().keys(); ++ return HashMapType::end().keys(); + } + +@@ -170,29 +176,32 @@ + HashMapKeysProxy& operator=(const HashMapKeysProxy&); + ~HashMapKeysProxy(); +- }; +- +- class HashMapValuesProxy : private HashMap { ++ }; ++ ++ template ++ class HashMap::HashMapValuesProxy : ++ private HashMap { + public: +- typedef typename HashMap::iterator::Values iterator; +- typedef typename HashMap::const_iterator::Values const_iterator; +- ++ typedef HashMap HashMapType; ++ typedef typename HashMapType::iterator::Values iterator; ++ typedef typename HashMapType::const_iterator::Values const_iterator; ++ + iterator begin() + { +- return HashMap::begin().values(); +- } +- ++ return HashMapType::begin().values(); ++ } ++ + iterator end() + { +- return HashMap::end().values(); ++ return HashMapType::end().values(); + } + + const_iterator begin() const + { +- return HashMap::begin().values(); +- } +- ++ return HashMapType::begin().values(); ++ } ++ + const_iterator end() const + { +- return HashMap::end().values(); ++ return HashMapType::end().values(); + } + +@@ -205,7 +214,4 @@ + HashMapValuesProxy& operator=(const HashMapValuesProxy&); + ~HashMapValuesProxy(); +- }; +- +- HashTableType m_impl; + }; + diff --git a/webkit-commit-147640.patch b/webkit-commit-147640.patch new file mode 100644 index 0000000..3d6f704 --- /dev/null +++ b/webkit-commit-147640.patch @@ -0,0 +1,12 @@ +--- qtwebkit-opensource-src-5.0.2/Source/WTF/wtf/Compiler.h.static_assert 2013-05-18 00:27:58.755311019 +0200 ++++ qtwebkit-opensource-src-5.0.2/Source/WTF/wtf/Compiler.h 2013-05-18 00:36:49.386262802 +0200 +@@ -122,6 +122,9 @@ + + /* Specific compiler features */ + #if COMPILER(GCC) && !COMPILER(CLANG) ++#if GCC_VERSION_AT_LEAST(4, 8, 0) ++#pragma GCC diagnostic ignored "-Wunused-local-typedefs" ++#endif + #if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L + #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1 + #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 diff --git a/webkit-qtwebkit-2.2-tp1-pluginpath.patch b/webkit-qtwebkit-2.2-tp1-pluginpath.patch new file mode 100644 index 0000000..b1e8e2f --- /dev/null +++ b/webkit-qtwebkit-2.2-tp1-pluginpath.patch @@ -0,0 +1,19 @@ +diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp +--- webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-05-12 10:06:43.000000000 +0200 ++++ webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 2011-05-12 10:08:08.000000000 +0200 +@@ -380,6 +380,7 @@ Vector PluginDatabase::defaultPl + paths.append("/usr/lib/firefox/plugins"); + paths.append("/usr/lib64/browser-plugins"); + paths.append("/usr/lib/browser-plugins"); ++ paths.append("/usr/lib/mozilla/plugins-wrapped"); + paths.append("/usr/lib/mozilla/plugins"); + paths.append("/usr/local/netscape/plugins"); + paths.append("/opt/mozilla/plugins"); +@@ -389,6 +390,7 @@ Vector PluginDatabase::defaultPl + paths.append("/usr/lib/netscape/plugins"); + paths.append("/usr/lib/netscape/plugins-libc5"); + paths.append("/usr/lib/netscape/plugins-libc6"); ++ paths.append("/usr/lib64/mozilla/plugins-wrapped"); + paths.append("/usr/lib64/netscape/plugins"); + paths.append("/usr/lib64/mozilla/plugins"); + paths.append("/usr/lib/nsbrowser/plugins"); From 0684ba1ea6eaa017799263829740be3d90ea883f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 2 Aug 2013 10:47:35 -0500 Subject: [PATCH 003/208] use bundled angleproject (until system version passes review) --- qt5-qtwebkit.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2fe909b..4501f3c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,7 +4,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.0.2 -Release: 6%{?dist} +Release: 7%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -21,8 +21,8 @@ Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch # tweak linker flags to minimize memory usage on "small" platforms Patch4: qtwebkit-2.3-save_memory.patch -# try to use unbundled system angleproject library -%define system_angle 1 +# use unbundled system angleproject library +#define system_angle 1 Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch # Fix compilation against latest ANGLE # https://bugs.webkit.org/show_bug.cgi?id=109127 @@ -166,6 +166,9 @@ popd %changelog +* Fri Aug 02 2013 Rex Dieter 5.0.2-7 +- use bundled angleproject (until system version passes review) + * Fri Jun 21 2013 Rex Dieter 5.0.2-6 - %%doc ChangeLog VERSION - %%doc Source/WebCore/LICENSE* From 8a33448ee0303bb5eea6b5f89075606082ca6c57 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 20 Aug 2013 07:06:39 -0500 Subject: [PATCH 004/208] qt5-qtjsbackend only supports ix86, x86_64 and arm --- qt5-qtwebkit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4501f3c..a586426 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,7 +4,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.0.2 -Release: 7%{?dist} +Release: 8%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -12,6 +12,9 @@ License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://qt-project.org/ Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +# qt5-qtjsbackend (and qtdeclarative) supports only ix86, x86_64 and arm , and so do we here +ExclusiveArch: %{ix86} x86_64 %{arm} + # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch @@ -166,6 +169,9 @@ popd %changelog +* Tue Aug 20 2013 Rex Dieter 5.0.2-8 +- qt5-qtjsbackend only supports ix86, x86_64 and arm + * Fri Aug 02 2013 Rex Dieter 5.0.2-7 - use bundled angleproject (until system version passes review) From 74803cd694376c2dcad8cb256d751f3aca1ca964 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 28 Aug 2013 12:36:15 -0500 Subject: [PATCH 005/208] 5.1.1 --- .gitignore | 1 + qt5-qtwebkit.spec | 26 ++--- ...memory.patch => qtwebkit-save_memory.patch | 10 +- sources | 2 +- webkit-commit-147345.patch | 105 ------------------ webkit-commit-147640.patch | 12 -- 6 files changed, 16 insertions(+), 140 deletions(-) rename qtwebkit-2.3-save_memory.patch => qtwebkit-save_memory.patch (53%) delete mode 100644 webkit-commit-147345.patch delete mode 100644 webkit-commit-147640.patch diff --git a/.gitignore b/.gitignore index 44a97fc..a5e99c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.0.2.tar.xz +/qtwebkit-opensource-src-5.1.1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a586426..212fa0c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,14 +3,14 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.0.2 -Release: 8%{?dist} +Version: 5.1.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 Url: http://qt-project.org/ -Source0: http://releases.qt-project.org/qt5/%{version}%{?pre:-%{pre}}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz # qt5-qtjsbackend (and qtdeclarative) supports only ix86, x86_64 and arm , and so do we here ExclusiveArch: %{ix86} x86_64 %{arm} @@ -22,10 +22,11 @@ Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch # tweak linker flags to minimize memory usage on "small" platforms -Patch4: qtwebkit-2.3-save_memory.patch +Patch4: qtwebkit-save_memory.patch # use unbundled system angleproject library #define system_angle 1 +# NEEDS REBASE for 5.1 -- 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 @@ -34,15 +35,6 @@ Patch6: webkit-commit-142567.patch BuildRequires: angleproject-devel angleproject-static %endif -# Prevent flooding the logs with warnings about COMPILE_ASSERT -# https://bugs.webkit.org/show_bug.cgi?id=113147 -# Based on upstream commit r147640 -Patch7: webkit-commit-147640.patch - -# Prevent flooding the logs with warnings about HashMap -# https://bugs.webkit.org/show_bug.cgi?id=113454 -Patch9: webkit-commit-147345.patch - BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -93,13 +85,10 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %patch3 -p1 -b .debuginfo %patch4 -p1 -b .save_memory %if 0%{?system_angle} -%patch5 -p1 -b .system_angle +#patch5 -p1 -b .system_angle %patch6 -p1 -b .svn142567 %endif -%patch7 -p1 -b .svn147640 -%patch9 -p1 -b .svn147345 - echo "nuke bundled code..." # nuke bundled code mkdir Source/ThirdParty/orig @@ -169,6 +158,9 @@ popd %changelog +* Wed Aug 28 2013 Rex Dieter 5.1.1-1 +- 5.1.1 + * Tue Aug 20 2013 Rex Dieter 5.0.2-8 - qt5-qtjsbackend only supports ix86, x86_64 and arm diff --git a/qtwebkit-2.3-save_memory.patch b/qtwebkit-save_memory.patch similarity index 53% rename from qtwebkit-2.3-save_memory.patch rename to qtwebkit-save_memory.patch index 6ccb158..0f5958b 100644 --- a/qtwebkit-2.3-save_memory.patch +++ b/qtwebkit-save_memory.patch @@ -1,7 +1,7 @@ -diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebkit-23/Source/WebCore/WebCore.pri ---- webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory 2013-02-15 09:46:12.000000000 -0600 -+++ webkit-qtwebkit-23/Source/WebCore/WebCore.pri 2013-02-21 16:42:30.996634743 -0600 -@@ -336,6 +336,8 @@ mac { +diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri +--- qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory 2013-08-28 11:11:19.218230963 -0500 ++++ qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri 2013-08-28 11:12:34.855410992 -0500 +@@ -296,6 +296,8 @@ mac { } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections @@ -9,4 +9,4 @@ diff -up webkit-qtwebkit-23/Source/WebCore/WebCore.pri.save_memory webkit-qtwebk +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - unix|win32-g++* { + contains(DEFINES, ENABLE_OPENCL=1) { diff --git a/sources b/sources index 84c2a5e..143a4f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -85aad9f287910c21c8464d7d1ea010a9 qtwebkit-opensource-src-5.0.2.tar.xz +70e956dafcee1969de53d4de7b4691ad qtwebkit-opensource-src-5.1.1.tar.xz diff --git a/webkit-commit-147345.patch b/webkit-commit-147345.patch deleted file mode 100644 index 6fa6a14..0000000 --- a/webkit-commit-147345.patch +++ /dev/null @@ -1,105 +0,0 @@ -Index: trunk/Source/WTF/wtf/HashMap.h -=================================================================== ---- trunk/Source/WTF/wtf/HashMap.h (revision 147344) -+++ trunk/Source/WTF/wtf/HashMap.h (revision 147345) -@@ -137,27 +137,33 @@ - AddResult inlineAdd(const KeyType&, MappedPassInReferenceType); - -- class HashMapKeysProxy : private HashMap { -+ HashTableType m_impl; -+ }; -+ -+ template -+ class HashMap::HashMapKeysProxy : -+ private HashMap { - public: -- typedef typename HashMap::iterator::Keys iterator; -- typedef typename HashMap::const_iterator::Keys const_iterator; -- -+ typedef HashMap HashMapType; -+ typedef typename HashMapType::iterator::Keys iterator; -+ typedef typename HashMapType::const_iterator::Keys const_iterator; -+ - iterator begin() - { -- return HashMap::begin().keys(); -- } -- -+ return HashMapType::begin().keys(); -+ } -+ - iterator end() - { -- return HashMap::end().keys(); -+ return HashMapType::end().keys(); - } - - const_iterator begin() const - { -- return HashMap::begin().keys(); -- } -- -+ return HashMapType::begin().keys(); -+ } -+ - const_iterator end() const - { -- return HashMap::end().keys(); -+ return HashMapType::end().keys(); - } - -@@ -170,29 +176,32 @@ - HashMapKeysProxy& operator=(const HashMapKeysProxy&); - ~HashMapKeysProxy(); -- }; -- -- class HashMapValuesProxy : private HashMap { -+ }; -+ -+ template -+ class HashMap::HashMapValuesProxy : -+ private HashMap { - public: -- typedef typename HashMap::iterator::Values iterator; -- typedef typename HashMap::const_iterator::Values const_iterator; -- -+ typedef HashMap HashMapType; -+ typedef typename HashMapType::iterator::Values iterator; -+ typedef typename HashMapType::const_iterator::Values const_iterator; -+ - iterator begin() - { -- return HashMap::begin().values(); -- } -- -+ return HashMapType::begin().values(); -+ } -+ - iterator end() - { -- return HashMap::end().values(); -+ return HashMapType::end().values(); - } - - const_iterator begin() const - { -- return HashMap::begin().values(); -- } -- -+ return HashMapType::begin().values(); -+ } -+ - const_iterator end() const - { -- return HashMap::end().values(); -+ return HashMapType::end().values(); - } - -@@ -205,7 +214,4 @@ - HashMapValuesProxy& operator=(const HashMapValuesProxy&); - ~HashMapValuesProxy(); -- }; -- -- HashTableType m_impl; - }; - diff --git a/webkit-commit-147640.patch b/webkit-commit-147640.patch deleted file mode 100644 index 3d6f704..0000000 --- a/webkit-commit-147640.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qtwebkit-opensource-src-5.0.2/Source/WTF/wtf/Compiler.h.static_assert 2013-05-18 00:27:58.755311019 +0200 -+++ qtwebkit-opensource-src-5.0.2/Source/WTF/wtf/Compiler.h 2013-05-18 00:36:49.386262802 +0200 -@@ -122,6 +122,9 @@ - - /* Specific compiler features */ - #if COMPILER(GCC) && !COMPILER(CLANG) -+#if GCC_VERSION_AT_LEAST(4, 8, 0) -+#pragma GCC diagnostic ignored "-Wunused-local-typedefs" -+#endif - #if GCC_VERSION_AT_LEAST(4, 7, 0) && defined(__cplusplus) && __cplusplus >= 201103L - #define WTF_COMPILER_SUPPORTS_CXX_RVALUE_REFERENCES 1 - #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 From c0cc713b55175cd8915978b1d9a4e82fbf030f21 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 6 Sep 2013 09:24:32 -0500 Subject: [PATCH 006/208] el6 love --- qt5-qtwebkit.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 212fa0c..64fde4b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -50,7 +50,11 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gl) # gstreamer media support BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) +%if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: pkgconfig(icu-i18n) +%else +BuildRequires: libicu-devel +%endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libwebp) From cc5022175b051eda629b4bf4a2da3b34b1fed7ed Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 10 Sep 2013 14:08:21 -0500 Subject: [PATCH 007/208] no libwebp on el6 (yet) --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 64fde4b..39540c5 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -52,12 +52,12 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) %if 0%{?fedora} || 0%{?rhel} > 6 BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libwebp) %else BuildRequires: libicu-devel %endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) From 2f4d5322a9f753e2f5ec660931352933c36c6feb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Oct 2013 09:30:17 -0500 Subject: [PATCH 008/208] 5.2.0-0.1.alpha - 5.2.0-alpha - -doc subpkg - use gstreamer1 (where available) --- .gitignore | 2 +- qt5-qtwebkit.spec | 62 ++++++++++++++++++++++++++++++-------- qtwebkit-save_memory.patch | 10 +++--- sources | 2 +- 4 files changed, 57 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index a5e99c4..3914346 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/qtwebkit-opensource-src-5.0.2.tar.xz /qtwebkit-opensource-src-5.1.1.tar.xz +/qtwebkit-opensource-src-5.2.0-alpha.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 39540c5..c3931ef 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,19 +1,28 @@ %global qt_module qtwebkit +%define pre alpha + +# define to build docs, need to undef this for bootstrapping +# where qt5-qttools builds are not yet available +%define docs 1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.1.1 -Release: 1%{?dist} +Version: 5.2.0 +Release: 0.1.%{pre}%{?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://qt-project.org/ -Source0: http://download.qt-project.org/official_releases/qt/5.1/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%if 0%{?pre:1} +Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz +%else +Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%endif -# qt5-qtjsbackend (and qtdeclarative) supports only ix86, x86_64 and arm , and so do we here -ExclusiveArch: %{ix86} x86_64 %{arm} +# http://bugzilla.redhat.com/1005482 +ExcludeArch: ppc64 ppc # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch @@ -35,7 +44,6 @@ Patch6: webkit-commit-142567.patch BuildRequires: angleproject-devel angleproject-static %endif - BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -43,17 +51,18 @@ BuildRequires: bison BuildRequires: chrpath BuildRequires: flex BuildRequires: gperf -BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gl) -# gstreamer media support -BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) %if 0%{?fedora} || 0%{?rhel} > 6 +# gstreamer media support +BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libwebp) %else +# gstreamer media support +BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) BuildRequires: libicu-devel %endif BuildRequires: pkgconfig(libpng) @@ -81,6 +90,17 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %description devel %{summary}. +%if 0%{?docs} +%package doc +Summary: API documentation for %{name} +Requires: %{name} = %{version}-%{release} +# for qhelpgenerator +BuildRequires: qt5-qttools-devel +BuildArch: noarch +%description doc +%{summary}. +%endif + %prep %setup -q -n qtwebkit-opensource-src-%{version}%{?pre:-%{pre}} @@ -96,7 +116,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa} echo "nuke bundled code..." # nuke bundled code mkdir Source/ThirdParty/orig -mv Source/ThirdParty/{glu/,gtest/,gyp/,mt19937ar.c,qunit/} \ +mv Source/ThirdParty/{gtest/,qunit/} \ Source/ThirdParty/orig/ %if 0%{?system_angle} @@ -110,11 +130,18 @@ mv Source/ThirdParty/ANGLE/ \ make %{?_smp_mflags} +%if 0%{?docs} +make %{?_smp_mflags} docs +%endif -%install +%install make install INSTALL_ROOT=%{buildroot} +%if 0%{?docs} +make install_docs INSTALL_ROOT=%{buildroot} +%endif + ## .prl file love (maybe consider just deleting these -- rex # nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs sed -i \ @@ -145,7 +172,7 @@ popd %files %doc Source/WebCore/LICENSE* -%doc ChangeLog VERSION +%doc ChangeLog* VERSION %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* %{_qt5_libexecdir}/QtWebPluginProcess @@ -160,8 +187,19 @@ popd %{_qt5_libdir}/pkgconfig/Qt5*.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri +%if 0%{?docs} +%files doc +%{_qt5_docdir}/qtwebkit.qch +%{_qt5_docdir}/qtwebkit/ +%endif + %changelog +* Wed Oct 02 2013 Rex Dieter 5.2.0-0.1.alpha +- 5.2.0-alpha +- -doc subpkg +- use gstreamer1 (where available) + * Wed Aug 28 2013 Rex Dieter 5.1.1-1 - 5.1.1 diff --git a/qtwebkit-save_memory.patch b/qtwebkit-save_memory.patch index 0f5958b..db8151d 100644 --- a/qtwebkit-save_memory.patch +++ b/qtwebkit-save_memory.patch @@ -1,7 +1,7 @@ -diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri ---- qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory 2013-08-28 11:11:19.218230963 -0500 -+++ qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri 2013-08-28 11:12:34.855410992 -0500 -@@ -296,6 +296,8 @@ mac { +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 +--- 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-alpha/Source/WebCore/WebCore.pri 2013-10-01 22:27:41.299383226 -0500 +@@ -304,6 +304,8 @@ mac { } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections @@ -9,4 +9,4 @@ diff -up qtwebkit-opensource-src-5.1.1/Source/WebCore/WebCore.pri.save_memory qt +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - contains(DEFINES, ENABLE_OPENCL=1) { + enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 diff --git a/sources b/sources index 143a4f7..989f67f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70e956dafcee1969de53d4de7b4691ad qtwebkit-opensource-src-5.1.1.tar.xz +1a2a5958564737ed260758ac2ca4dee8 qtwebkit-opensource-src-5.2.0-alpha.tar.xz From 1a3207549d67d8708cbfcd0c213b0c338ff7446f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 16 Oct 2013 13:11:12 -0500 Subject: [PATCH 009/208] bootstrap ppc --- qt5-qtwebkit.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c3931ef..a529545 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,12 +4,12 @@ # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available -%define docs 1 +#define docs 1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.1.%{pre}%{?dist} +Release: 0.2.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -21,9 +21,6 @@ Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-% Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif -# http://bugzilla.redhat.com/1005482 -ExcludeArch: ppc64 ppc - # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch @@ -195,6 +192,9 @@ popd %changelog +* Wed Oct 16 2013 Rex Dieter 5.2.0-0.2.alpha +- bootstrap ppc + * Wed Oct 02 2013 Rex Dieter 5.2.0-0.1.alpha - 5.2.0-alpha - -doc subpkg From f69aac1c2fc1a931eeef35bdcf413eeeb136b891 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 18 Oct 2013 14:54:29 -0500 Subject: [PATCH 010/208] BR: perl(Text::ParseWords) --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a529545..815c458 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -67,7 +67,7 @@ BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) -BuildRequires: perl perl(version) perl(Digest::MD5) +BuildRequires: perl perl(version) perl(Digest::MD5) perl(Text::ParseWords) BuildRequires: ruby BuildRequires: zlib-devel From d7573fb346b349c2c1d97c5fe9fd0aca8cb42170 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 24 Oct 2013 19:55:49 -0500 Subject: [PATCH 011/208] 5.2.0-beta1 --- .gitignore | 2 +- qt5-qtwebkit.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3914346..33f5d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /qtwebkit-opensource-src-5.1.1.tar.xz -/qtwebkit-opensource-src-5.2.0-alpha.tar.xz +/qtwebkit-opensource-src-5.2.0-beta1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 815c458..1626896 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,15 +1,15 @@ %global qt_module qtwebkit -%define pre alpha +%define pre beta1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available -#define docs 1 +%define docs 1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.2.%{pre}%{?dist} +Release: 0.3.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -192,6 +192,9 @@ popd %changelog +* Thu Oct 24 2013 Rex Dieter 5.2.0-0.3.beta1 +- 5.2.0-beta1 + * Wed Oct 16 2013 Rex Dieter 5.2.0-0.2.alpha - bootstrap ppc diff --git a/sources b/sources index 989f67f..9f9195d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a2a5958564737ed260758ac2ca4dee8 qtwebkit-opensource-src-5.2.0-alpha.tar.xz +6cb3df7132ef71ad5faee8f0246b4b7d qtwebkit-opensource-src-5.2.0-beta1.tar.xz From bde25b8613518c87ee854bc38d3ea21e90e49e84 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 24 Oct 2013 21:54:44 -0500 Subject: [PATCH 012/208] BR: pkgconfig(libudev) --- qt5-qtwebkit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1626896..26554df 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -64,6 +64,7 @@ BuildRequires: libicu-devel %endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) From 560c2a27654fdd98e8722aeb90f0e35ca1cd70ac Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 9 Nov 2013 13:22:38 -0600 Subject: [PATCH 013/208] rebuild (arm/qreal) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 26554df..78fadd5 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -9,7 +9,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.3.%{pre}%{?dist} +Release: 0.4.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -193,6 +193,9 @@ popd %changelog +* Sat Nov 09 2013 Rex Dieter 5.2.0-0.4.beta1 +- rebuild (arm/qreal) + * Thu Oct 24 2013 Rex Dieter 5.2.0-0.3.beta1 - 5.2.0-beta1 From 726efaf0dcaeee3998bf052344baf030aeb04215 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 25 Nov 2013 07:40:13 -0600 Subject: [PATCH 014/208] enable -doc only on primary archs (allow secondary bootstrap) --- qt5-qtwebkit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 78fadd5..d31caf2 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,12 +4,15 @@ # 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 +%ifarch %{arm} %{ix86} x86_64 %define docs 1 +%endif Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.4.%{pre}%{?dist} +Release: 0.5.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -193,6 +196,9 @@ popd %changelog +* Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.beta1 +- enable -doc only on primary archs (allow secondary bootstrap) + * Sat Nov 09 2013 Rex Dieter 5.2.0-0.4.beta1 - rebuild (arm/qreal) From b1bf1f4f0bb4828d97526f1dc7762c3b0650b756 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 29 Nov 2013 08:01:04 -0600 Subject: [PATCH 015/208] disable JIT on secondary arches, fix build with JIT disabled (#1034940) --- qt5-qtwebkit.spec | 17 +++++++++++++++-- qtwebkit-opensource-src-5.2.0-beta1-nojit.patch | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 qtwebkit-opensource-src-5.2.0-beta1-nojit.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d31caf2..3239028 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -12,7 +12,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.5.%{pre}%{?dist} +Release: 0.6.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -44,6 +44,10 @@ Patch6: webkit-commit-142567.patch BuildRequires: angleproject-devel angleproject-static %endif +# fix build with JIT disabled +# https://bugzilla.redhat.com/show_bug.cgi?id=1034940 +Patch10: qtwebkit-opensource-src-5.2.0-beta1-nojit.patch + BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -113,6 +117,7 @@ BuildArch: noarch #patch5 -p1 -b .system_angle %patch6 -p1 -b .svn142567 %endif +%patch10 -p1 -b .nojit echo "nuke bundled code..." # nuke bundled code @@ -127,7 +132,12 @@ mv Source/ThirdParty/ANGLE/ \ %build -%{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} +%{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \ +%ifnarch %{arm} %{ix86} x86_64 + DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 +%else + %{nil} +%endif make %{?_smp_mflags} @@ -196,6 +206,9 @@ popd %changelog +* Thu Nov 28 2013 Dan Horák 5.2.0-0.6.beta1 +- disable JIT on secondary arches, fix build with JIT disabled (#1034940) + * Mon Nov 25 2013 Rex Dieter 5.2.0-0.5.beta1 - enable -doc only on primary archs (allow secondary bootstrap) diff --git a/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch b/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch new file mode 100644 index 0000000..00f5074 --- /dev/null +++ b/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch @@ -0,0 +1,16 @@ +diff -up qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp.nojit qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp +--- qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp.nojit 2013-11-28 15:43:39.169409385 -0500 ++++ qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2013-11-28 15:44:17.399410231 -0500 +@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() + + unsigned CodeBlock::numberOfDFGCompiles() + { ++#if ENABLE(JIT) + ASSERT(JITCode::isBaselineCode(getJITType())); + return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; ++#else ++ return 0; ++#endif + } + + int32_t CodeBlock::codeTypeThresholdMultiplier() const From d0e4474d2ffdc570bdded7cf262ca64306c0414f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 2 Dec 2013 11:26:15 -0600 Subject: [PATCH 016/208] 5.2.0-rc1 --- .gitignore | 1 + qt5-qtwebkit.spec | 11 +++++++---- ... => qtwebkit-opensource-src-5.2.0-pluginpath.patch | 10 +++++----- ...=> qtwebkit-opensource-src-5.2.0-save_memory.patch | 8 ++++---- sources | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) rename webkit-qtwebkit-2.2-tp1-pluginpath.patch => qtwebkit-opensource-src-5.2.0-pluginpath.patch (56%) rename qtwebkit-save_memory.patch => qtwebkit-opensource-src-5.2.0-save_memory.patch (58%) diff --git a/.gitignore b/.gitignore index 33f5d5a..aa56a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.1.1.tar.xz /qtwebkit-opensource-src-5.2.0-beta1.tar.xz +/qtwebkit-opensource-src-5.2.0-rc1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3239028..3827084 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,6 +1,6 @@ %global qt_module qtwebkit -%define pre beta1 +%define pre rc1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available @@ -12,7 +12,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit 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 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 # 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 Patch3: qtwebkit-opensource-src-5.0.1-debuginfo.patch # 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 #define system_angle 1 @@ -206,6 +206,9 @@ popd %changelog +* Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 +- 5.2.0-rc1 + * Thu Nov 28 2013 Dan Horák 5.2.0-0.6.beta1 - disable JIT on secondary arches, fix build with JIT disabled (#1034940) diff --git a/webkit-qtwebkit-2.2-tp1-pluginpath.patch b/qtwebkit-opensource-src-5.2.0-pluginpath.patch similarity index 56% rename from webkit-qtwebkit-2.2-tp1-pluginpath.patch rename to qtwebkit-opensource-src-5.2.0-pluginpath.patch index b1e8e2f..26f4f3e 100644 --- a/webkit-qtwebkit-2.2-tp1-pluginpath.patch +++ b/qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -1,7 +1,7 @@ -diff -up webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp ---- webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-05-12 10:06:43.000000000 +0200 -+++ webkit-qtwebkit/Source/WebCore/plugins/PluginDatabase.cpp 2011-05-12 10:08:08.000000000 +0200 -@@ -380,6 +380,7 @@ Vector PluginDatabase::defaultPl +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 +--- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath 2013-11-26 19:01:47.000000000 -0600 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp 2013-12-02 11:14:43.306114402 -0600 +@@ -407,6 +407,7 @@ Vector PluginDatabase::defaultPl paths.append("/usr/lib/firefox/plugins"); paths.append("/usr/lib64/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/local/netscape/plugins"); paths.append("/opt/mozilla/plugins"); -@@ -389,6 +390,7 @@ Vector PluginDatabase::defaultPl +@@ -416,6 +417,7 @@ Vector PluginDatabase::defaultPl paths.append("/usr/lib/netscape/plugins"); paths.append("/usr/lib/netscape/plugins-libc5"); paths.append("/usr/lib/netscape/plugins-libc6"); diff --git a/qtwebkit-save_memory.patch b/qtwebkit-opensource-src-5.2.0-save_memory.patch similarity index 58% rename from qtwebkit-save_memory.patch rename to qtwebkit-opensource-src-5.2.0-save_memory.patch index db8151d..2db9beb 100644 --- a/qtwebkit-save_memory.patch +++ b/qtwebkit-opensource-src-5.2.0-save_memory.patch @@ -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 ---- 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-alpha/Source/WebCore/WebCore.pri 2013-10-01 22:27:41.299383226 -0500 -@@ -304,6 +304,8 @@ mac { +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-rc1/Source/WebCore/WebCore.pri.save_memory 2013-12-02 11:15:56.417351604 -0600 ++++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri 2013-12-02 11:15:56.421351563 -0600 +@@ -306,6 +306,8 @@ mac { } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections diff --git a/sources b/sources index 9f9195d..a0a98f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cb3df7132ef71ad5faee8f0246b4b7d qtwebkit-opensource-src-5.2.0-beta1.tar.xz +0236ee173b2ba63a6a98974ffd791261 qtwebkit-opensource-src-5.2.0-rc1.tar.xz From 0aeb17e4f9618337db4d7d2e05883aa3688a66bc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 12 Dec 2013 07:28:00 -0600 Subject: [PATCH 017/208] 5.2.0 --- .gitignore | 4 +--- qt5-qtwebkit.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index aa56a1b..07d18ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/qtwebkit-opensource-src-5.1.1.tar.xz -/qtwebkit-opensource-src-5.2.0-beta1.tar.xz -/qtwebkit-opensource-src-5.2.0-rc1.tar.xz +/qtwebkit-opensource-src-5.2.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3827084..7bcdb4a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,6 +1,5 @@ %global qt_module qtwebkit -%define pre rc1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available @@ -12,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -Release: 0.10.%{pre}%{?dist} +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 @@ -206,6 +205,9 @@ popd %changelog +* Thu Dec 12 2013 Rex Dieter 5.2.0-1 +- 5.2.0 + * Mon Dec 02 2013 Rex Dieter 5.2.0-0.10.rc1 - 5.2.0-rc1 diff --git a/sources b/sources index a0a98f7..ddf117b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0236ee173b2ba63a6a98974ffd791261 qtwebkit-opensource-src-5.2.0-rc1.tar.xz +1378e18aecd8cc223deb729c8f0a735d qtwebkit-opensource-src-5.2.0.tar.xz From 056eebdcc006a22b26a91e846621bb146147eabf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 1 Jan 2014 22:34:33 -0600 Subject: [PATCH 018/208] rebuild (libwebp) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7bcdb4a..bd884a6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -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 @@ -205,6 +205,9 @@ popd %changelog +* Wed Jan 01 2014 Rex Dieter 5.2.0-2 +- rebuild (libwebp) + * Thu Dec 12 2013 Rex Dieter 5.2.0-1 - 5.2.0 From f8b98b88ca46031143e158cab150a44ff08cf4c4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 Jan 2014 14:49:38 -0600 Subject: [PATCH 019/208] bootstrap epel7 --- qt5-qtwebkit.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7bcdb4a..b71f061 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,9 +4,11 @@ # 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%{?rhel} < 6 %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif +%endif Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit From eb69008fa9f59ce99874fe7c70df50952c863aa8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Jan 2014 07:52:03 -0600 Subject: [PATCH 020/208] Revert "bootstrap epel7" This reverts commit f8b98b88ca46031143e158cab150a44ff08cf4c4. --- qt5-qtwebkit.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b71f061..7bcdb4a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,11 +4,9 @@ # 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%{?rhel} < 6 %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif -%endif Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit From 0c9acfe03f6eaa29946aef449961b6a9df0bb872 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 2 Feb 2014 15:32:20 -0600 Subject: [PATCH 021/208] Add AArch64 support to qtwebkit (#1056160) --- 0001-Add-ARM-64-support.patch | 48 +++++++++++++++++++++++++++++++++++ qt5-qtwebkit.spec | 10 +++++++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 0001-Add-ARM-64-support.patch diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch new file mode 100644 index 0000000..acf83fe --- /dev/null +++ b/0001-Add-ARM-64-support.patch @@ -0,0 +1,48 @@ +Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h +=================================================================== +--- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/dtoa/utils.h ++++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) ++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) +Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h +=================================================================== +--- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/Platform.h ++++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h +@@ -167,6 +167,11 @@ + #define WTF_CPU_X86_64 1 + #endif + ++/* CPU(AARCH64) - AArch64 */ ++#if defined(__aarch64__) ++#define WTF_CPU_AARCH64 1 ++#endif ++ + /* CPU(ARM) - ARM, any version*/ + #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N) + +@@ -322,7 +327,7 @@ + + #endif /* ARM */ + +-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) ++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(AARCH64) + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif + +@@ -725,7 +730,8 @@ + || CPU(ALPHA) \ + || CPU(SPARC64) \ + || CPU(S390X) \ +- || CPU(PPC64) ++ || CPU(PPC64) \ ++ || CPU(AARCH64) + #define WTF_USE_JSVALUE64 1 + #else + #define WTF_USE_JSVALUE32_64 1 diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index bd884a6..5ff5142 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.0 -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 @@ -39,6 +39,10 @@ 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 + %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -116,6 +120,7 @@ BuildArch: noarch #patch5 -p1 -b .system_angle %patch6 -p1 -b .svn142567 %endif +%patch7 -p1 -b .aarch64 %patch10 -p1 -b .nojit echo "nuke bundled code..." @@ -205,6 +210,9 @@ popd %changelog +* Sun Feb 02 2014 Rex Dieter 5.2.0-3 +- Add AArch64 support to qtwebkit (#1056160) + * Wed Jan 01 2014 Rex Dieter 5.2.0-2 - rebuild (libwebp) From 495d55d8320f982c8f16b46a70f0c7ccafb0181f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 5 Feb 2014 09:24:45 -0600 Subject: [PATCH 022/208] 5.2.1 --- .gitignore | 2 +- qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 07d18ce..480faab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/qtwebkit-opensource-src-5.2.0.tar.xz +/qtwebkit-opensource-src-5.2.1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 5ff5142..09a3152 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -10,8 +10,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.2.0 -Release: 3%{?dist} +Version: 5.2.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 @@ -210,6 +210,9 @@ popd %changelog +* Wed Feb 05 2014 Rex Dieter 5.2.1-1 +- 5.2.1 + * Sun Feb 02 2014 Rex Dieter 5.2.0-3 - Add AArch64 support to qtwebkit (#1056160) diff --git a/sources b/sources index ddf117b..3ebb414 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1378e18aecd8cc223deb729c8f0a735d qtwebkit-opensource-src-5.2.0.tar.xz +a20d99a1c2afbd6a7c6f54e615f1bd63 qtwebkit-opensource-src-5.2.1.tar.xz From c7c27988aeeb2eabd2ae8b9a801d085706c56c66 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 12 Feb 2014 14:41:18 -0600 Subject: [PATCH 023/208] rebuild (libicu) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 09a3152..d882211 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.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 @@ -210,6 +210,9 @@ popd %changelog +* Wed Feb 12 2014 Rex Dieter 5.2.1-2 +- rebuild (libicu) + * Wed Feb 05 2014 Rex Dieter 5.2.1-1 - 5.2.1 From b077973b457ec5dbb4dea5c2c10ddc8b71ab200c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 2 May 2014 18:50:48 -0500 Subject: [PATCH 024/208] 5.2.1-3 - no rpath, drop chrpath hacks - BR: qt5-qtlocation qt5-qtsensors --- qt5-qtwebkit.spec | 27 +++++++++----------- qtwebkit-opensource-src-5.2.1-no_rpath.patch | 12 +++++++++ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 qtwebkit-opensource-src-5.2.1-no_rpath.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d882211..89e4ab7 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.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 @@ -43,6 +43,9 @@ Patch6: webkit-commit-142567.patch # Add AArch64 support 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 @@ -53,9 +56,10 @@ Patch10: qtwebkit-opensource-src-5.2.0-beta1-nojit.patch BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} +BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtsensors-devel BuildRequires: bison -BuildRequires: chrpath BuildRequires: flex BuildRequires: gperf BuildRequires: libjpeg-devel @@ -121,6 +125,7 @@ BuildArch: noarch %patch6 -p1 -b .svn142567 %endif %patch7 -p1 -b .aarch64 +%patch8 -p1 -b .no_rpath %patch10 -p1 -b .nojit echo "nuke bundled code..." @@ -168,19 +173,6 @@ sed -i \ # .la files, die, die, die. rm -fv %{buildroot}%{_qt5_libdir}/lib*.la -## kill rpath's -pushd %{buildroot} -for remove_rpath in \ - %{_qt5_libexecdir}/QtWebPluginProcess \ - %{_qt5_libexecdir}/QtWebProcess \ - %{_qt5_archdatadir}/qml/QtWebKit/libqmlwebkitplugin.so \ - %{_qt5_archdatadir}/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so \ -; do -chrpath --list %{buildroot}$remove_rpath -chrpath --delete %{buildroot}$remove_rpath -done -popd - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -210,6 +202,11 @@ popd %changelog +* Fri May 02 2014 Rex Dieter +- 5.2.1-3 +- no rpath, drop chrpath hacks +- BR: qt5-qtlocation qt5-qtsensors + * Wed Feb 12 2014 Rex Dieter 5.2.1-2 - rebuild (libicu) diff --git a/qtwebkit-opensource-src-5.2.1-no_rpath.patch b/qtwebkit-opensource-src-5.2.1-no_rpath.patch new file mode 100644 index 0000000..0871fa7 --- /dev/null +++ b/qtwebkit-opensource-src-5.2.1-no_rpath.patch @@ -0,0 +1,12 @@ +diff -up qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf +--- qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath 2014-02-01 14:37:41.000000000 -0600 ++++ qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf 2014-05-02 18:47:26.789051711 -0500 +@@ -6,7 +6,7 @@ + + equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib + +-linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) { ++linux-rpath_me_harder_no_no_no:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) { + # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR + # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. + QMAKE_RPATHDIR = \$\$ORIGIN/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR} From 4417a9d361c3d7131083c093c32da345e81e4229 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 5 May 2014 14:06:49 -0500 Subject: [PATCH 025/208] use standard (same as qtbase) .prl sanitation --- qt5-qtwebkit.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 89e4ab7..60d7b84 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.2.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 @@ -162,16 +162,17 @@ make install INSTALL_ROOT=%{buildroot} make install_docs INSTALL_ROOT=%{buildroot} %endif -## .prl file love (maybe consider just deleting these -- rex -# nuke dangling reference(s) to %%buildroot, excessive (.la-like) libs -sed -i \ - -e "/^QMAKE_PRL_BUILD_DIR/d" \ - -e "/^QMAKE_PRL_LIBS/d" \ - %{buildroot}%{_qt5_libdir}/*.prl - -## unpackaged files -# .la files, die, die, die. -rm -fv %{buildroot}%{_qt5_libdir}/lib*.la +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt5_libdir} +for prl_file in libQt5*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd %post -p /sbin/ldconfig @@ -202,8 +203,10 @@ rm -fv %{buildroot}%{_qt5_libdir}/lib*.la %changelog -* Fri May 02 2014 Rex Dieter -- 5.2.1-3 +* Mon May 05 2014 Rex Dieter 5.2.1-4 +- use standard (same as qtbase) .prl sanitation + +* Fri May 02 2014 Rex Dieter 5.2.1-3 - no rpath, drop chrpath hacks - BR: qt5-qtlocation qt5-qtsensors From a9268dc6a1766b9075b204a437c941e3dd30adcb Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 21 May 2014 17:51:56 +0200 Subject: [PATCH 026/208] Update to 5.3.0 --- .gitignore | 1 + 0001-Add-ARM-64-support.patch | 53 ++++--------------- qt5-qtwebkit.spec | 16 +++--- ...kit-opensource-src-5.2.0-beta1-nojit.patch | 16 ------ sources | 2 +- 5 files changed, 18 insertions(+), 70 deletions(-) delete mode 100644 qtwebkit-opensource-src-5.2.0-beta1-nojit.patch diff --git a/.gitignore b/.gitignore index 480faab..2cf0f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.2.1.tar.xz +/qtwebkit-opensource-src-5.3.0.tar.xz diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch index acf83fe..73f5c97 100644 --- a/0001-Add-ARM-64-support.patch +++ b/0001-Add-ARM-64-support.patch @@ -1,48 +1,13 @@ -Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h -=================================================================== ---- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/dtoa/utils.h -+++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h -@@ -49,7 +49,7 @@ - defined(__ARMEL__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 --#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) -+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) - #if defined(_WIN32) -Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h -=================================================================== ---- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/Platform.h -+++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h -@@ -167,6 +167,11 @@ - #define WTF_CPU_X86_64 1 +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 4594ec8..639f28f 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -342,7 +342,7 @@ + #endif #endif -+/* CPU(AARCH64) - AArch64 */ -+#if defined(__aarch64__) -+#define WTF_CPU_AARCH64 1 -+#endif -+ - /* CPU(ARM) - ARM, any version*/ - #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N) - -@@ -322,7 +327,7 @@ - - #endif /* ARM */ - --#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) -+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(AARCH64) +-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) ++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(AARCH64) #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif - -@@ -725,7 +730,8 @@ - || CPU(ALPHA) \ - || CPU(SPARC64) \ - || CPU(S390X) \ -- || CPU(PPC64) -+ || CPU(PPC64) \ -+ || CPU(AARCH64) - #define WTF_USE_JSVALUE64 1 - #else - #define WTF_USE_JSVALUE32_64 1 + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 60d7b84..0d307b1 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -10,17 +10,17 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.2.1 -Release: 4%{?dist} +Version: 5.3.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 Url: http://qt-project.org/ %if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.2/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz +Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz %else -Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -50,10 +50,6 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch BuildRequires: angleproject-devel angleproject-static %endif -# fix build with JIT disabled -# https://bugzilla.redhat.com/show_bug.cgi?id=1034940 -Patch10: qtwebkit-opensource-src-5.2.0-beta1-nojit.patch - BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: qt5-qtlocation-devel @@ -126,7 +122,6 @@ BuildArch: noarch %endif %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath -%patch10 -p1 -b .nojit echo "nuke bundled code..." # nuke bundled code @@ -203,6 +198,9 @@ popd %changelog +* Wed May 21 2014 Jan Grulich 5.3.0-1 +- 5.3.0 + * Mon May 05 2014 Rex Dieter 5.2.1-4 - use standard (same as qtbase) .prl sanitation diff --git a/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch b/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch deleted file mode 100644 index 00f5074..0000000 --- a/qtwebkit-opensource-src-5.2.0-beta1-nojit.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp.nojit qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp ---- qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp.nojit 2013-11-28 15:43:39.169409385 -0500 -+++ qtwebkit-opensource-src-5.2.0-beta1/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2013-11-28 15:44:17.399410231 -0500 -@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() - - unsigned CodeBlock::numberOfDFGCompiles() - { -+#if ENABLE(JIT) - ASSERT(JITCode::isBaselineCode(getJITType())); - return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; -+#else -+ return 0; -+#endif - } - - int32_t CodeBlock::codeTypeThresholdMultiplier() const diff --git a/sources b/sources index 3ebb414..fa574e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a20d99a1c2afbd6a7c6f54e615f1bd63 qtwebkit-opensource-src-5.2.1.tar.xz +cc9197eaef9e7950e907635f9bde1e98 qtwebkit-opensource-src-5.3.0.tar.xz From 0198e1accee19ad1eee1c92655adce75c275f2fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 20:25:19 -0500 Subject: [PATCH 027/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0d307b1..c6a3ec5 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.3.0 -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 @@ -198,6 +198,9 @@ popd %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed May 21 2014 Jan Grulich 5.3.0-1 - 5.3.0 From 19aea8b9be7ab21299786ef66a3bb891a405b5ee Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 Jun 2014 21:00:31 +0200 Subject: [PATCH 028/208] Update to 5.3.1 --- .gitignore | 1 + qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2cf0f7c..dc24b07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.2.1.tar.xz /qtwebkit-opensource-src-5.3.0.tar.xz +/qtwebkit-opensource-src-5.3.1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c6a3ec5..a68a10d 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -10,8 +10,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.3.0 -Release: 2%{?dist} +Version: 5.3.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 @@ -198,6 +198,9 @@ popd %changelog +* Tue Jun 17 2014 Jan Grulich - 5.3.1-1 +- 5.3.1 + * Sun Jun 08 2014 Fedora Release Engineering - 5.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index fa574e4..fda2639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc9197eaef9e7950e907635f9bde1e98 qtwebkit-opensource-src-5.3.0.tar.xz +0f2bb8af6be2306b2b4d194a7ebf6fcc qtwebkit-opensource-src-5.3.1.tar.xz From e73771cafe885303937c9de6aceb9721c9f523c7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 22:54:31 +0000 Subject: [PATCH 029/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a68a10d..ff505ef 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.3.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 @@ -198,6 +198,9 @@ popd %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jun 17 2014 Jan Grulich - 5.3.1-1 - 5.3.1 From 0d9fab1f9a1f8a45c8d23efc37da8003fcb09df1 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 26 Aug 2014 13:57:32 +0200 Subject: [PATCH 030/208] rebuild for ICU 53.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ff505ef..add830d 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,7 +11,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.3.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 @@ -198,6 +198,9 @@ popd %changelog +* Tue Aug 26 2014 David Tardon - 5.3.1-3 +- rebuild for ICU 53.1 + * Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 43cb7ffc4481df73677ec2b9b0840afff9a76384 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 16 Sep 2014 15:53:11 -0500 Subject: [PATCH 031/208] 5.3.2 --- .gitignore | 4 +--- qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index dc24b07..7877a3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/qtwebkit-opensource-src-5.2.1.tar.xz -/qtwebkit-opensource-src-5.3.0.tar.xz -/qtwebkit-opensource-src-5.3.1.tar.xz +/qtwebkit-opensource-src-5.3.2.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index add830d..cf4bfb5 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -10,8 +10,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.3.1 -Release: 3%{?dist} +Version: 5.3.2 +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 @@ -198,6 +198,9 @@ popd %changelog +* Tue Sep 16 2014 Rex Dieter 5.3.2-1 +- 5.3.2 + * Tue Aug 26 2014 David Tardon - 5.3.1-3 - rebuild for ICU 53.1 diff --git a/sources b/sources index fda2639..83a6c7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f2bb8af6be2306b2b4d194a7ebf6fcc qtwebkit-opensource-src-5.3.1.tar.xz +0497b5b46540848e0db6a9e219d756fb qtwebkit-opensource-src-5.3.2.tar.xz From e2fab0cf7a43ea8220d8e21c8c34e3447a133e12 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 18 Oct 2014 20:10:48 -0500 Subject: [PATCH 032/208] 5.4.0-beta --- .gitignore | 1 + qt5-qtwebkit.spec | 15 ++++++++++----- sources | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7877a3e..3795ae5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.3.2.tar.xz +/qtwebkit-opensource-src-5.4.0-beta.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index cf4bfb5..b792223 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -8,19 +8,21 @@ %define docs 1 %endif +%define pre beta + Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.3.2 -Release: 1%{?dist} +Version: 5.4.0 +Release: 0.1.%{pre}%{?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://qt-project.org/ %if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz +Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz %else -Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -34,7 +36,7 @@ Patch4: qtwebkit-opensource-src-5.2.0-save_memory.patch # use unbundled system angleproject library #define system_angle 1 -# NEEDS REBASE for 5.1 -- rex +# 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 @@ -198,6 +200,9 @@ popd %changelog +* Sat Oct 18 2014 Rex Dieter 5.4.0-0.1.beta +- 5.4.0-beta + * Tue Sep 16 2014 Rex Dieter 5.3.2-1 - 5.3.2 diff --git a/sources b/sources index 83a6c7d..d201e63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0497b5b46540848e0db6a9e219d756fb qtwebkit-opensource-src-5.3.2.tar.xz +79a3dd0ec5be6b1cb886097382211a34 qtwebkit-opensource-src-5.4.0-beta.tar.xz From 4c182bc86a14e0d7b4bee47157161555fac3b401 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 18 Oct 2014 21:34:21 -0500 Subject: [PATCH 033/208] rawhide's linker doesn't like --reduce-memory-overheads /usr/bin/ld.gold: --reduce-memory-overheads: unknown option --- qtwebkit-opensource-src-5.2.0-save_memory.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebkit-opensource-src-5.2.0-save_memory.patch b/qtwebkit-opensource-src-5.2.0-save_memory.patch index 2db9beb..24e1060 100644 --- a/qtwebkit-opensource-src-5.2.0-save_memory.patch +++ b/qtwebkit-opensource-src-5.2.0-save_memory.patch @@ -6,7 +6,7 @@ diff -up qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri.save_memor unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections +unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory -+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads ++#unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 From ac75aa0a64aa1f204c666293b8d4150c9c17ccb7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 1 Nov 2014 16:47:19 -0500 Subject: [PATCH 034/208] enable hardened build, out-of-src tree build --- qmake.sh | 7 +++++++ qt5-qtwebkit.spec | 26 ++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100755 qmake.sh diff --git a/qmake.sh b/qmake.sh new file mode 100755 index 0000000..ff7222c --- /dev/null +++ b/qmake.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +qmake-qt5 \ + $@ \ + QMAKE_CFLAGS="${CFLAGS}" \ + QMAKE_CXXFLAGS="${CXXFLAGS}" \ + QMAKE_LFLAGS="${LDFLAGS}" \ diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b792223..16ad83a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,6 +1,8 @@ %global qt_module qtwebkit +%global _hardened_build 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 @@ -13,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -Release: 0.1.%{pre}%{?dist} +Release: 0.2.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -24,6 +26,8 @@ Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-% %else Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif +# qmake wrapper +Source1: qmake.sh # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -125,6 +129,8 @@ BuildArch: noarch %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath +install -m755 -D %{SOURCE1} bin/qmake + echo "nuke bundled code..." # nuke bundled code mkdir Source/ThirdParty/orig @@ -138,22 +144,31 @@ mv Source/ThirdParty/ANGLE/ \ %build + +CFLAGS="%{optflags}"; export CFLAGS +CXXFLAGS="%{optflags}"; export CXXFLAGS +LDFLAGS="%{?__global_ldflags}"; export LDFLAGS +PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH + +mkdir %{_target_platform} +pushd %{_target_platform} + %{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \ %ifnarch %{arm} %{ix86} x86_64 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 -%else - %{nil} %endif + .. make %{?_smp_mflags} %if 0%{?docs} make %{?_smp_mflags} docs %endif +popd %install -make install INSTALL_ROOT=%{buildroot} +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %if 0%{?docs} make install_docs INSTALL_ROOT=%{buildroot} @@ -200,6 +215,9 @@ popd %changelog +* Sat Nov 01 2014 Rex Dieter 5.4.0-0.2.beta +- enable hardened build, out-of-src tree build + * Sat Oct 18 2014 Rex Dieter 5.4.0-0.1.beta - 5.4.0-beta From 5913ea8b839d4726b1fca1f34902a8b7d2d1bd1b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 2 Nov 2014 16:16:36 -0600 Subject: [PATCH 035/208] use new build dir for make install_docs too --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 16ad83a..e27e40b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -171,7 +171,7 @@ popd make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} +make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} %endif ## .prl/.la file love From 2dddc14d4ef994d781ee9df46e14a46e3f56dd9d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Nov 2014 08:12:56 -0600 Subject: [PATCH 036/208] fix hardening, use new %qmake_qt5 macro --- qmake.sh | 7 ------- qt5-qtwebkit.spec | 19 ++++++------------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100755 qmake.sh diff --git a/qmake.sh b/qmake.sh deleted file mode 100755 index ff7222c..0000000 --- a/qmake.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -qmake-qt5 \ - $@ \ - QMAKE_CFLAGS="${CFLAGS}" \ - QMAKE_CXXFLAGS="${CXXFLAGS}" \ - QMAKE_LFLAGS="${LDFLAGS}" \ diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e27e40b..946626a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -Release: 0.2.%{pre}%{?dist} +Release: 0.3.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -26,8 +26,6 @@ Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-% %else Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz %endif -# qmake wrapper -Source1: qmake.sh # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -129,8 +127,6 @@ BuildArch: noarch %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath -install -m755 -D %{SOURCE1} bin/qmake - echo "nuke bundled code..." # nuke bundled code mkdir Source/ThirdParty/orig @@ -144,20 +140,14 @@ mv Source/ThirdParty/ANGLE/ \ %build - -CFLAGS="%{optflags}"; export CFLAGS -CXXFLAGS="%{optflags}"; export CXXFLAGS -LDFLAGS="%{?__global_ldflags}"; export LDFLAGS -PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH - mkdir %{_target_platform} pushd %{_target_platform} -%{_qt5_qmake} %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \ +%{qmake_qt5} .. \ + %{?system_angle:DEFINES+=USE_SYSTEM_ANGLE=1} \ %ifnarch %{arm} %{ix86} x86_64 DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 %endif - .. make %{?_smp_mflags} @@ -215,6 +205,9 @@ popd %changelog +* Mon Nov 03 2014 Rex Dieter 5.4.0-0.3.beta +- fix hardening, use new %%qmake_qt5 macro + * Sat Nov 01 2014 Rex Dieter 5.4.0-0.2.beta - enable hardened build, out-of-src tree build From 21a75720d84ea8eecd5e9fd0020625dc86f6bb64 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 18 Nov 2014 18:45:49 -0600 Subject: [PATCH 037/208] use gst1 only fc21+ (and el8+) only --- qt5-qtwebkit.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 946626a..43ed7c6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -Release: 0.3.%{pre}%{?dist} +Release: 0.4.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -62,23 +62,23 @@ BuildRequires: qt5-qtsensors-devel BuildRequires: bison BuildRequires: flex BuildRequires: gperf +BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gl) -%if 0%{?fedora} || 0%{?rhel} > 6 # gstreamer media support +%if 0%{?fedora} > 20 || 0%{?rhel} > 7 BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-app-1.0) -BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(libwebp) %else -# gstreamer media support BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) -BuildRequires: libicu-devel %endif BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libudev) +%if 0%{?fedora} || 0%{?rhel} > 6 +BuildRequires: pkgconfig(libwebp) +%endif BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) @@ -205,6 +205,9 @@ popd %changelog +* Tue Nov 18 2014 Rex Dieter 5.4.0-0.4.beta +- use gst1 only fc21+ (and el8+) only + * Mon Nov 03 2014 Rex Dieter 5.4.0-0.3.beta - fix hardening, use new %%qmake_qt5 macro From 1a0ac9e26f0856b49f35c1f5ecc8638500fb1343 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 28 Nov 2014 10:03:51 -0600 Subject: [PATCH 038/208] 5.4.0-rc --- .gitignore | 2 +- qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3795ae5..ea6603f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /qtwebkit-opensource-src-5.3.2.tar.xz -/qtwebkit-opensource-src-5.4.0-beta.tar.xz +/qtwebkit-opensource-src-5.4.0-rc.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 43ed7c6..cce1afc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -10,12 +10,12 @@ %define docs 1 %endif -%define pre beta +%define pre rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -Release: 0.4.%{pre}%{?dist} +Release: 0.5.%{pre}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -205,6 +205,9 @@ popd %changelog +* Fri Nov 28 2014 Rex Dieter 5.4.0-0.5.rc +- 5.4.0-rc + * Tue Nov 18 2014 Rex Dieter 5.4.0-0.4.beta - use gst1 only fc21+ (and el8+) only diff --git a/sources b/sources index d201e63..bc17c04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79a3dd0ec5be6b1cb886097382211a34 qtwebkit-opensource-src-5.4.0-beta.tar.xz +2c9ab0de7798f1f16acd22e103cb0254 qtwebkit-opensource-src-5.4.0-rc.tar.xz From 819fbe6dff12ce7c9fda11b7b1c77760056a5057 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 10 Dec 2014 07:31:29 -0600 Subject: [PATCH 039/208] 5.4.0 (final) --- .gitignore | 3 +-- qt5-qtwebkit.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ea6603f..b983e87 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/qtwebkit-opensource-src-5.3.2.tar.xz -/qtwebkit-opensource-src-5.4.0-rc.tar.xz +/qtwebkit-opensource-src-5.4.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index cce1afc..76f209f 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -10,12 +10,10 @@ %define docs 1 %endif -%define pre rc - Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -Release: 0.5.%{pre}%{?dist} +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 @@ -205,6 +203,9 @@ popd %changelog +* Wed Dec 10 2014 Rex Dieter 5.4.0-1 +- 5.4.0 (final) + * Fri Nov 28 2014 Rex Dieter 5.4.0-0.5.rc - 5.4.0-rc diff --git a/sources b/sources index bc17c04..68f48db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c9ab0de7798f1f16acd22e103cb0254 qtwebkit-opensource-src-5.4.0-rc.tar.xz +e62d72c410dffe5129043f80f624c896 qtwebkit-opensource-src-5.4.0.tar.xz From d2c4435f8f6435c83ce361136d52d6fb8eedb836 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 26 Jan 2015 17:03:24 +0100 Subject: [PATCH 040/208] rebuild for ICU 54.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 76f209f..41a7f96 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -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 @@ -203,6 +203,9 @@ popd %changelog +* Mon Jan 26 2015 David Tardon - 5.4.0-2 +- rebuild for ICU 54.1 + * Wed Dec 10 2014 Rex Dieter 5.4.0-1 - 5.4.0 (final) From 4b2ee546a0a01bf9b386b04b97511aebf1883543 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 17 Feb 2015 06:30:45 -0600 Subject: [PATCH 041/208] rebuild (gcc5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 41a7f96..e248e2c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -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 @@ -203,6 +203,9 @@ popd %changelog +* Tue Feb 17 2015 Rex Dieter 5.4.0-3 +- rebuild (gcc5) + * Mon Jan 26 2015 David Tardon - 5.4.0-2 - rebuild for ICU 54.1 From 6c3bd3a3ad6f89b2befa0dad4f1f12985f7d4a1e Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 17 Feb 2015 17:14:22 +0100 Subject: [PATCH 042/208] fix GMutexLocker build problem with new glib --- qt5-qtwebkit.spec | 9 +- ...kit-opensource-src-5.4.0-mutexlocker.patch | 219 ++++++++++++++++++ 2 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 qtwebkit-opensource-src-5.4.0-mutexlocker.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e248e2c..de87a8b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.0 -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 @@ -48,6 +48,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 +# fix GMutexLocker build issue +Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch + %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -124,6 +127,7 @@ BuildArch: noarch %endif %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath +%patch9 -p1 -b .MutexLocker echo "nuke bundled code..." # nuke bundled code @@ -203,6 +207,9 @@ popd %changelog +* Tue Feb 17 2015 Than Ngo 5.4.0-4 +- fix GMutexLocker build problem + * Tue Feb 17 2015 Rex Dieter 5.4.0-3 - rebuild (gcc5) diff --git a/qtwebkit-opensource-src-5.4.0-mutexlocker.patch b/qtwebkit-opensource-src-5.4.0-mutexlocker.patch new file mode 100644 index 0000000..2ad951d --- /dev/null +++ b/qtwebkit-opensource-src-5.4.0-mutexlocker.patch @@ -0,0 +1,219 @@ +diff -up qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +--- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than 2015-02-17 15:22:29.921309725 +0100 ++++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-17 15:26:05.340557547 +0100 +@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObj + + switch (propID) { + case PROP_IRADIO_MODE: { +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + priv->iradioMode = g_value_get_boolean(value); + break; + } +@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObj + WebKitWebSrc* src = WEBKIT_WEB_SRC(object); + WebKitWebSrcPrivate* priv = src->priv; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + switch (propID) { + case PROP_IRADIO_MODE: + g_value_set_boolean(value, priv->iradioMode); +@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitW + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + bool seeking = priv->seekID; + +@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKit + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + priv->startID = 0; + +@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrc + return ret; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + switch (transition) { + case GST_STATE_CHANGE_READY_TO_PAUSED: + GST_DEBUG_OBJECT(src, "READY->PAUSED"); +@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithPar + gst_query_parse_duration(query, &format, NULL); + + GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (format == GST_FORMAT_BYTES && src->priv->size > 0) { + gst_query_set_duration(query, format, src->priv->size); + result = TRUE; +@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithPar + break; + } + case GST_QUERY_URI: { +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + gst_query_set_uri(query, src->priv->uri); + result = TRUE; + break; +@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIH + WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); + gchar* ret; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + ret = g_strdup(src->priv->uri); + return ret; + } +@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstUR + return FALSE; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + g_free(priv->uri); + priv->uri = 0; +@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(G + WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); + gchar* ret; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + ret = g_strdup(src->priv->uri); + return ret; + } +@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstUR + return FALSE; + } + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + g_free(priv->uri); + priv->uri = 0; +@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMain + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->needDataID) + return FALSE; +@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAp + + GST_DEBUG_OBJECT(src, "Need more data: %u", length); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (priv->needDataID || !priv->paused) { + return; + } +@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMa + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->enoughDataID) + return FALSE; +@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(Gst + + GST_DEBUG_OBJECT(src, "Have enough data"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (priv->enoughDataID || priv->paused) { + return; + } +@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(W + + ASSERT(isMainThread()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + // already stopped + if (!priv->seekID) + return FALSE; +@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(G + WebKitWebSrcPrivate* priv = src->priv; + + GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (offset == priv->offset && priv->requestedOffset == priv->offset) + return TRUE; + +@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(G + void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) + { + ASSERT(player); +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + src->priv->player = player; + s_cachedResourceLoader = player->cachedResourceLoader(); + } +@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer( + mapGstBuffer(buffer); + #endif + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + priv->buffer = adoptGRef(buffer); + locker.unlock(); + +@@ -921,7 +921,7 @@ void StreamingClient::handleResponseRece + + GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + // If we seeked we need 206 == PARTIAL_CONTENT + if (priv->requestedOffset && response.httpStatusCode() != 206) { +@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived + WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); + WebKitWebSrcPrivate* priv = src->priv; + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + + GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); + +@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinish + + GST_DEBUG_OBJECT(src, "Have EOS"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + if (!priv->seekID) { + locker.unlock(); + gst_app_src_end_of_stream(priv->appsrc); +@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasB + + GST_ERROR_OBJECT(src, "Request was blocked"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + uri.set(g_strdup(src->priv->uri)); + locker.unlock(); + +@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cann + + GST_ERROR_OBJECT(src, "Cannot show URL"); + +- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); ++ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); + uri.set(g_strdup(src->priv->uri)); + locker.unlock(); + From 5e1d34d1dfe0ea134cfdfff8e8e886f2f2500f01 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 24 Feb 2015 17:26:28 +0100 Subject: [PATCH 043/208] Update to 5.4.1 --- .gitignore | 1 + qt5-qtwebkit.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b983e87..83fb7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.4.0.tar.xz +/qtwebkit-opensource-src-5.4.1.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index de87a8b..602de25 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -12,8 +12,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.4.0 -Release: 4%{?dist} +Version: 5.4.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 @@ -207,6 +207,9 @@ popd %changelog +* Tue Feb 24 2015 Jan Grulich 5.4.1-1 +- 5.4.1 + * Tue Feb 17 2015 Than Ngo 5.4.0-4 - fix GMutexLocker build problem diff --git a/sources b/sources index 68f48db..e4687e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e62d72c410dffe5129043f80f624c896 qtwebkit-opensource-src-5.4.0.tar.xz +186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz From d23817305e1a3d35ab2253d5e7156f644236ad76 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 27 Feb 2015 10:48:09 -0600 Subject: [PATCH 044/208] rebuild (gcc5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 602de25..415510d 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.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 @@ -207,6 +207,9 @@ popd %changelog +* Fri Feb 27 2015 Rex Dieter - 5.4.1-2 +- rebuild (gcc5) + * Tue Feb 24 2015 Jan Grulich 5.4.1-1 - 5.4.1 From afaa566e895da1f8fdfcba57f7fe8645318f6856 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 18 Mar 2015 17:45:51 +0100 Subject: [PATCH 045/208] fix build failure with new gcc5 --- qt5-qtwebkit-gcc5-patch | 14 ++++++++++++++ qt5-qtwebkit.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 qt5-qtwebkit-gcc5-patch diff --git a/qt5-qtwebkit-gcc5-patch b/qt5-qtwebkit-gcc5-patch new file mode 100644 index 0000000..e00accd --- /dev/null +++ b/qt5-qtwebkit-gcc5-patch @@ -0,0 +1,14 @@ +diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp +--- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 2015-03-18 10:24:38.683352327 -0400 ++++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-18 10:25:21.953352327 -0400 +@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen + } + } + ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + VM& vm = exec->vm(); diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 415510d..9012cbd 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.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 @@ -51,6 +51,9 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch # fix GMutexLocker build issue Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch +# fix gcc5 template issue +Patch10: qt5-qtwebkit-gcc5-patch + %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -128,6 +131,7 @@ BuildArch: noarch %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath %patch9 -p1 -b .MutexLocker +%patch10 -p1 -b .gcc5-template echo "nuke bundled code..." # nuke bundled code @@ -207,6 +211,9 @@ popd %changelog +* Wed Mar 18 2015 Than Ngo - 5.4.1-3 +- fix build failure with new gcc5 + * Fri Feb 27 2015 Rex Dieter - 5.4.1-2 - rebuild (gcc5) From ef1e1f5020e0626b48e366ec4fd7ac3c52fe8845 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 18 Mar 2015 17:55:54 +0100 Subject: [PATCH 046/208] fix build failure with new gcc5 --- qt5-qtwebkit-gcc5-patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 qt5-qtwebkit-gcc5-patch diff --git a/qt5-qtwebkit-gcc5-patch b/qt5-qtwebkit-gcc5-patch new file mode 100644 index 0000000..e00accd --- /dev/null +++ b/qt5-qtwebkit-gcc5-patch @@ -0,0 +1,14 @@ +diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp +--- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 2015-03-18 10:24:38.683352327 -0400 ++++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-18 10:25:21.953352327 -0400 +@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen + } + } + ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + VM& vm = exec->vm(); From c88e8bfee63bc92eeaec68cf3486a541ee10e24c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 18 Mar 2015 17:57:02 +0100 Subject: [PATCH 047/208] fix build failure with new gcc5 --- qt5-qtwebkit.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 415510d..9012cbd 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.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 @@ -51,6 +51,9 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch # fix GMutexLocker build issue Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch +# fix gcc5 template issue +Patch10: qt5-qtwebkit-gcc5-patch + %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -128,6 +131,7 @@ BuildArch: noarch %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath %patch9 -p1 -b .MutexLocker +%patch10 -p1 -b .gcc5-template echo "nuke bundled code..." # nuke bundled code @@ -207,6 +211,9 @@ popd %changelog +* Wed Mar 18 2015 Than Ngo - 5.4.1-3 +- fix build failure with new gcc5 + * Fri Feb 27 2015 Rex Dieter - 5.4.1-2 - rebuild (gcc5) From 96d817a1b0c9472c77ddf53fb174ef2f9d9847fd Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 19 Mar 2015 13:25:24 +0100 Subject: [PATCH 048/208] workaround, disable parallel compilation as it fails to compile in brew --- qt5-qtwebkit.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9012cbd..849bf11 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -155,7 +155,9 @@ pushd %{_target_platform} DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 %endif -make %{?_smp_mflags} +# workaround, disable parallel compilation as it fails to compile in brew +#make %{?_smp_mflags} +make -j2 %if 0%{?docs} make %{?_smp_mflags} docs From 0980ac063fe9c848f626d5ab5cfaa48282f4f96a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 20 Mar 2015 08:08:00 -0500 Subject: [PATCH 049/208] rename gcc5.patch --- qt5-qtwebkit-gcc5-patch => qt5-qtwebkit-gcc5.patch | 0 qt5-qtwebkit.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename qt5-qtwebkit-gcc5-patch => qt5-qtwebkit-gcc5.patch (100%) diff --git a/qt5-qtwebkit-gcc5-patch b/qt5-qtwebkit-gcc5.patch similarity index 100% rename from qt5-qtwebkit-gcc5-patch rename to qt5-qtwebkit-gcc5.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 849bf11..716c1f7 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -52,7 +52,7 @@ Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch # fix gcc5 template issue -Patch10: qt5-qtwebkit-gcc5-patch +Patch10: qt5-qtwebkit-gcc5.patch %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static From ae50d7df90edc20a9f7427879d39c5b176f17a56 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 23 Mar 2015 11:37:10 -0500 Subject: [PATCH 050/208] QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798) --- qt5-qtwebkit.spec | 10 +++++++- ...pensource-src-5.4.1-private_browsing.patch | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 qtwebkit-opensource-src-5.4.1-private_browsing.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 716c1f7..7b89d15 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.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 @@ -54,6 +54,10 @@ Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch # fix gcc5 template issue Patch10: qt5-qtwebkit-gcc5.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1204795 +# https://codereview.qt-project.org/#/c/108936/ +Patch11: qtwebkit-opensource-src-5.4.1-private_browsing.patch + %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -132,6 +136,7 @@ BuildArch: noarch %patch8 -p1 -b .no_rpath %patch9 -p1 -b .MutexLocker %patch10 -p1 -b .gcc5-template +%patch11 -p1 -b .private_browsing echo "nuke bundled code..." # nuke bundled code @@ -213,6 +218,9 @@ popd %changelog +* Mon Mar 23 2015 Rex Dieter 5.4.1-4 +- QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798) + * Wed Mar 18 2015 Than Ngo - 5.4.1-3 - fix build failure with new gcc5 diff --git a/qtwebkit-opensource-src-5.4.1-private_browsing.patch b/qtwebkit-opensource-src-5.4.1-private_browsing.patch new file mode 100644 index 0000000..5d70def --- /dev/null +++ b/qtwebkit-opensource-src-5.4.1-private_browsing.patch @@ -0,0 +1,25 @@ +diff -up qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp +--- qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing 2015-02-16 22:57:04.000000000 -0600 ++++ qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp 2015-03-23 11:29:41.688034891 -0500 +@@ -159,6 +159,10 @@ void IconController::startLoader() + } + + if (iconDatabase().supportsAsynchronousMode()) { ++ // FIXME () - We should support in-memory-only private browsing icons in asynchronous icon database mode. ++ if (m_frame->page()->settings()->privateBrowsingEnabled()) ++ return; ++ + m_frame->loader()->documentLoader()->getIconLoadDecisionForIconURL(urlString); + // Commit the icon url mapping to the database just in case we don't end up loading later. + commitToDatabase(iconURL); +@@ -202,10 +206,6 @@ void IconController::continueLoadWithDec + { + ASSERT(iconLoadDecision != IconLoadUnknown); + +- // FIXME () - We should support in-memory-only private browsing icons in asynchronous icon database mode. +- if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled()) +- return; +- + if (iconLoadDecision == IconLoadNo) { + KURL iconURL(url()); + String urlString(iconURL.string()); From ee7a6c63d955f0f9b89a2031a1a33ef7e68d071d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Apr 2015 07:53:58 -0500 Subject: [PATCH 051/208] doc: drop dep on main pkg, not strictly required --- qt5-qtwebkit.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7b89d15..53cde69 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.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 @@ -113,7 +113,6 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %if 0%{?docs} %package doc Summary: API documentation for %{name} -Requires: %{name} = %{version}-%{release} # for qhelpgenerator BuildRequires: qt5-qttools-devel BuildArch: noarch @@ -218,6 +217,9 @@ popd %changelog +* Fri Apr 03 2015 Rex Dieter 5.4.1-5 +- -doc: drop dep on main pkg, not strictly required + * Mon Mar 23 2015 Rex Dieter 5.4.1-4 - QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798) From 151a5b777c2e0d8516276c51fc48e9d60c1a8782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 29 Apr 2015 17:46:20 +0200 Subject: [PATCH 052/208] GCC5 rebuild (#1214354) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7b89d15..4fbbe36 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.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 @@ -218,6 +218,9 @@ popd %changelog +* Wed Apr 29 2015 Daniel Vrátil 5.4.1-5 +- GCC5 rebuild (#1214354) + * Mon Mar 23 2015 Rex Dieter 5.4.1-4 - QtWebKit logs visited URLs to WebpageIcons.db in private browsing mode (#1204795,#1204798) From 3af6b564a32ff87432fb0af522dbbada83e1999c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 17:15:37 +0200 Subject: [PATCH 053/208] Rebuilt for GCC 5 C++11 ABI change --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 53cde69..26155cc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.1 -Release: 5%{?dist} +Release: 6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -217,6 +217,9 @@ popd %changelog +* Sat May 02 2015 Kalev Lember - 5.4.1-6 +- Rebuilt for GCC 5 C++11 ABI change + * Fri Apr 03 2015 Rex Dieter 5.4.1-5 - -doc: drop dep on main pkg, not strictly required From 654bf6ca1fffb21d1679b6873938cab595d24dd1 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 3 Jun 2015 15:25:40 +0200 Subject: [PATCH 054/208] Update to 5.4.2 --- .gitignore | 1 + qt5-qtwebkit-gcc5.patch | 14 -- qt5-qtwebkit.spec | 20 +- ...kit-opensource-src-5.4.0-mutexlocker.patch | 219 ------------------ ...pensource-src-5.4.1-private_browsing.patch | 25 -- sources | 2 +- 6 files changed, 7 insertions(+), 274 deletions(-) delete mode 100644 qt5-qtwebkit-gcc5.patch delete mode 100644 qtwebkit-opensource-src-5.4.0-mutexlocker.patch delete mode 100644 qtwebkit-opensource-src-5.4.1-private_browsing.patch diff --git a/.gitignore b/.gitignore index 83fb7cc..9590011 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.4.0.tar.xz /qtwebkit-opensource-src-5.4.1.tar.xz +/qtwebkit-opensource-src-5.4.2.tar.xz diff --git a/qt5-qtwebkit-gcc5.patch b/qt5-qtwebkit-gcc5.patch deleted file mode 100644 index e00accd..0000000 --- a/qt5-qtwebkit-gcc5.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp ---- qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp.than 2015-03-18 10:24:38.683352327 -0400 -+++ qtwebkit-opensource-src-5.4.0/Source/JavaScriptCore/runtime/JSObject.cpp 2015-03-18 10:25:21.953352327 -0400 -@@ -1909,6 +1909,10 @@ void JSObject::putByIndexBeyondVectorLen - } - } - -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 26155cc..c99ad82 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -12,8 +12,8 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.4.1 -Release: 6%{?dist} +Version: 5.4.2 +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 @@ -48,16 +48,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 -# fix GMutexLocker build issue -Patch9: qtwebkit-opensource-src-5.4.0-mutexlocker.patch - -# fix gcc5 template issue -Patch10: qt5-qtwebkit-gcc5.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1204795 -# https://codereview.qt-project.org/#/c/108936/ -Patch11: qtwebkit-opensource-src-5.4.1-private_browsing.patch - %if 0%{?system_angle} BuildRequires: angleproject-devel angleproject-static %endif @@ -133,9 +123,6 @@ BuildArch: noarch %endif %patch7 -p1 -b .aarch64 %patch8 -p1 -b .no_rpath -%patch9 -p1 -b .MutexLocker -%patch10 -p1 -b .gcc5-template -%patch11 -p1 -b .private_browsing echo "nuke bundled code..." # nuke bundled code @@ -217,6 +204,9 @@ popd %changelog +* Wed Jun 03 2015 Jan Grulich - 5.4.2-1 +- 5.4.2 + * Sat May 02 2015 Kalev Lember - 5.4.1-6 - Rebuilt for GCC 5 C++11 ABI change diff --git a/qtwebkit-opensource-src-5.4.0-mutexlocker.patch b/qtwebkit-opensource-src-5.4.0-mutexlocker.patch deleted file mode 100644 index 2ad951d..0000000 --- a/qtwebkit-opensource-src-5.4.0-mutexlocker.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -up qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp ---- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.than 2015-02-17 15:22:29.921309725 +0100 -+++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-02-17 15:26:05.340557547 +0100 -@@ -354,7 +354,7 @@ static void webKitWebSrcSetProperty(GObj - - switch (propID) { - case PROP_IRADIO_MODE: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->iradioMode = g_value_get_boolean(value); - break; - } -@@ -376,7 +376,7 @@ static void webKitWebSrcGetProperty(GObj - WebKitWebSrc* src = WEBKIT_WEB_SRC(object); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (propID) { - case PROP_IRADIO_MODE: - g_value_set_boolean(value, priv->iradioMode); -@@ -429,7 +429,7 @@ static gboolean webKitWebSrcStop(WebKitW - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - bool seeking = priv->seekID; - -@@ -493,7 +493,7 @@ static gboolean webKitWebSrcStart(WebKit - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - priv->startID = 0; - -@@ -584,7 +584,7 @@ static GstStateChangeReturn webKitWebSrc - return ret; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - switch (transition) { - case GST_STATE_CHANGE_READY_TO_PAUSED: - GST_DEBUG_OBJECT(src, "READY->PAUSED"); -@@ -615,7 +615,7 @@ static gboolean webKitWebSrcQueryWithPar - gst_query_parse_duration(query, &format, NULL); - - GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format)); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (format == GST_FORMAT_BYTES && src->priv->size > 0) { - gst_query_set_duration(query, format, src->priv->size); - result = TRUE; -@@ -623,7 +623,7 @@ static gboolean webKitWebSrcQueryWithPar - break; - } - case GST_QUERY_URI: { -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - gst_query_set_uri(query, src->priv->uri); - result = TRUE; - break; -@@ -668,7 +668,7 @@ static gchar* webKitWebSrcGetUri(GstURIH - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -683,7 +683,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -719,7 +719,7 @@ static const gchar* webKitWebSrcGetUri(G - WebKitWebSrc* src = WEBKIT_WEB_SRC(handler); - gchar* ret; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - ret = g_strdup(src->priv->uri); - return ret; - } -@@ -734,7 +734,7 @@ static gboolean webKitWebSrcSetUri(GstUR - return FALSE; - } - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - g_free(priv->uri); - priv->uri = 0; -@@ -772,7 +772,7 @@ static gboolean webKitWebSrcNeedDataMain - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->needDataID) - return FALSE; -@@ -793,7 +793,7 @@ static void webKitWebSrcNeedDataCb(GstAp - - GST_DEBUG_OBJECT(src, "Need more data: %u", length); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->needDataID || !priv->paused) { - return; - } -@@ -807,7 +807,7 @@ static gboolean webKitWebSrcEnoughDataMa - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->enoughDataID) - return FALSE; -@@ -828,7 +828,7 @@ static void webKitWebSrcEnoughDataCb(Gst - - GST_DEBUG_OBJECT(src, "Have enough data"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (priv->enoughDataID || priv->paused) { - return; - } -@@ -842,7 +842,7 @@ static gboolean webKitWebSrcSeekMainCb(W - - ASSERT(isMainThread()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - // already stopped - if (!priv->seekID) - return FALSE; -@@ -860,7 +860,7 @@ static gboolean webKitWebSrcSeekDataCb(G - WebKitWebSrcPrivate* priv = src->priv; - - GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (offset == priv->offset && priv->requestedOffset == priv->offset) - return TRUE; - -@@ -879,7 +879,7 @@ static gboolean webKitWebSrcSeekDataCb(G - void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player) - { - ASSERT(player); -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - src->priv->player = player; - s_cachedResourceLoader = player->cachedResourceLoader(); - } -@@ -906,7 +906,7 @@ char* StreamingClient::createReadBuffer( - mapGstBuffer(buffer); - #endif - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - priv->buffer = adoptGRef(buffer); - locker.unlock(); - -@@ -921,7 +921,7 @@ void StreamingClient::handleResponseRece - - GST_DEBUG_OBJECT(src, "Received response: %d", response.httpStatusCode()); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - // If we seeked we need 206 == PARTIAL_CONTENT - if (priv->requestedOffset && response.httpStatusCode() != 206) { -@@ -1020,7 +1020,7 @@ void StreamingClient::handleDataReceived - WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get()); - WebKitWebSrcPrivate* priv = src->priv; - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - - GST_LOG_OBJECT(src, "Have %d bytes of data", priv->buffer ? getGstBufferSize(priv->buffer.get()) : length); - -@@ -1074,7 +1074,7 @@ void StreamingClient::handleNotifyFinish - - GST_DEBUG_OBJECT(src, "Have EOS"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - if (!priv->seekID) { - locker.unlock(); - gst_app_src_end_of_stream(priv->appsrc); -@@ -1210,7 +1210,7 @@ void ResourceHandleStreamingClient::wasB - - GST_ERROR_OBJECT(src, "Request was blocked"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - -@@ -1224,7 +1224,7 @@ void ResourceHandleStreamingClient::cann - - GST_ERROR_OBJECT(src, "Cannot show URL"); - -- GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); -+ WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src)); - uri.set(g_strdup(src->priv->uri)); - locker.unlock(); - diff --git a/qtwebkit-opensource-src-5.4.1-private_browsing.patch b/qtwebkit-opensource-src-5.4.1-private_browsing.patch deleted file mode 100644 index 5d70def..0000000 --- a/qtwebkit-opensource-src-5.4.1-private_browsing.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp ---- qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp.private_browsing 2015-02-16 22:57:04.000000000 -0600 -+++ qtwebkit-opensource-src-5.4.1/Source/WebCore/loader/icon/IconController.cpp 2015-03-23 11:29:41.688034891 -0500 -@@ -159,6 +159,10 @@ void IconController::startLoader() - } - - if (iconDatabase().supportsAsynchronousMode()) { -+ // FIXME () - We should support in-memory-only private browsing icons in asynchronous icon database mode. -+ if (m_frame->page()->settings()->privateBrowsingEnabled()) -+ return; -+ - m_frame->loader()->documentLoader()->getIconLoadDecisionForIconURL(urlString); - // Commit the icon url mapping to the database just in case we don't end up loading later. - commitToDatabase(iconURL); -@@ -202,10 +206,6 @@ void IconController::continueLoadWithDec - { - ASSERT(iconLoadDecision != IconLoadUnknown); - -- // FIXME () - We should support in-memory-only private browsing icons in asynchronous icon database mode. -- if (iconDatabase().supportsAsynchronousMode() && m_frame->page()->settings()->privateBrowsingEnabled()) -- return; -- - if (iconLoadDecision == IconLoadNo) { - KURL iconURL(url()); - String urlString(iconURL.string()); diff --git a/sources b/sources index e4687e8..d886ed8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -186627b1ea5b614811fbd0cfa9b4d073 qtwebkit-opensource-src-5.4.1.tar.xz +b711b3f32646d72cd281b3c17ab6d14e qtwebkit-opensource-src-5.4.2.tar.xz From e114317dbbdc634ba5700e4a37ba37fecb7fff45 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 21:51:38 +0000 Subject: [PATCH 055/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c99ad82..43280f4 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -13,7 +13,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.4.2 -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 @@ -204,6 +204,9 @@ popd %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 From 5ec8cad9a3767578c41beb546d651cc4295cdc5a Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 29 Jun 2015 18:05:11 -0300 Subject: [PATCH 056/208] - Update rc1 5.5.0 --- .gitignore | 1 + qt5-qtwebkit.spec | 26 +++++++++++--------------- sources | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 9590011..3bf7dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 43280f4..dc6206e 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -7,23 +7,22 @@ # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap %ifarch %{arm} %{ix86} x86_64 -%define docs 1 +#%define docs 1 +%define docs 0 %endif +%define prerelease rc + Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.4.2 -Release: 2%{?dist} +Version: 5.5.0 +Release: 0.2.rc%{?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://qt-project.org/ -%if 0%{?pre:1} -Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz -%else -Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +Url: http://www.qt.io +Source0: http://download.qt.io/development_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -112,7 +111,7 @@ BuildArch: noarch %prep -%setup -q -n qtwebkit-opensource-src-%{version}%{?pre:-%{pre}} +%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo @@ -135,7 +134,6 @@ mv Source/ThirdParty/ANGLE/ \ Source/ThirdParty/orig/ %endif - %build mkdir %{_target_platform} pushd %{_target_platform} @@ -155,7 +153,6 @@ make %{?_smp_mflags} docs %endif popd - %install make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} @@ -175,7 +172,6 @@ for prl_file in libQt5*.prl ; do done popd - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -204,8 +200,8 @@ popd %changelog -* Thu Jun 18 2015 Fedora Release Engineering - 5.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages * Wed Jun 03 2015 Jan Grulich - 5.4.2-1 - 5.4.2 diff --git a/sources b/sources index d886ed8..2de698e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b711b3f32646d72cd281b3c17ab6d14e qtwebkit-opensource-src-5.4.2.tar.xz +170e79f831c6b1f1c46ef815e0f0ebd5 qtwebkit-opensource-src-5.5.0-rc.tar.xz From ccc6c0f297f0eac3dca651898aa34aeb19174853 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 1 Jul 2015 11:46:26 -0300 Subject: [PATCH 057/208] - New final upstream release Qt 5.5.0 --- qt5-qtwebkit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index dc6206e..cacd966 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -11,18 +11,18 @@ %define docs 0 %endif -%define prerelease rc +#define prerelease rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -Release: 0.2.rc%{?dist} +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 Url: http://www.qt.io -Source0: http://download.qt.io/development_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch From cd8caaa8794010ca9958510fdb64d9799ebcb767 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 1 Jul 2015 13:10:32 -0300 Subject: [PATCH 058/208] - Missing proper sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3bf7dd7..4f0e516 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 diff --git a/sources b/sources index 2de698e..217503f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -170e79f831c6b1f1c46ef815e0f0ebd5 qtwebkit-opensource-src-5.5.0-rc.tar.xz +5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz From 1afcd29b87b6f6c5201806e743ca97d8eca1e90a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 13 Jul 2015 21:17:43 -0500 Subject: [PATCH 059/208] 5.5.0-2 - add 5.5.0-1 changelog - BR: qt5-qtwebchannel-devel - (re)enable docs --- qt5-qtwebkit.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index cacd966..78b6281 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -7,8 +7,7 @@ # where qt5-qttools builds are not yet available # only primary archs (for now), allow secondary to bootstrap %ifarch %{arm} %{ix86} x86_64 -#%define docs 1 -%define docs 0 +%define docs 1 %endif #define prerelease rc @@ -16,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -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 @@ -55,6 +54,7 @@ BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} BuildRequires: qt5-qtlocation-devel BuildRequires: qt5-qtsensors-devel +BuildRequires: qt5-qtwebchannel BuildRequires: bison BuildRequires: flex @@ -200,6 +200,14 @@ popd %changelog +* Mon Jul 13 2015 Rex Dieter - 5.5.0-2 +- add 5.5.0-1 changelog +- BR: qt5-qtwebchannel-devel +- (re)enable docs + +* Wed Jul 1 2015 Helio Chissini de Castro - 5.5.0-1 +- New final upstream release Qt 5.5.0 + * Thu Jun 25 2015 Helio Chissini de Castro - 5.5.0-0.2.rc - Update for official RC1 released packages From e82025a33ce69c7ac237ad5dfaf73977044e9592 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Jul 2015 12:02:31 -0500 Subject: [PATCH 060/208] tighten deps (#1233829) --- qt5-qtwebkit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 78b6281..c2ecd86 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -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 @@ -83,7 +83,8 @@ BuildRequires: perl perl(version) perl(Digest::MD5) perl(Text::ParseWords) BuildRequires: ruby BuildRequires: zlib-devel -%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +%{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} ##upstream patches @@ -200,6 +201,9 @@ popd %changelog +* Thu Jul 16 2015 Rex Dieter 5.5.0-3 +- tighten deps (#1233829) + * Mon Jul 13 2015 Rex Dieter - 5.5.0-2 - add 5.5.0-1 changelog - BR: qt5-qtwebchannel-devel From d854d862a5eca07c8830c3d14d720f99e73dc48e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 29 Jul 2015 11:33:45 -0500 Subject: [PATCH 061/208] docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping --- qt5-qtwebkit.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c2ecd86..57476e6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -6,16 +6,20 @@ # 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 + +%if ! 0%{?bootstrap} %ifarch %{arm} %{ix86} x86_64 %define docs 1 %endif +%endif #define prerelease rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.5.0 -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 @@ -103,8 +107,7 @@ Requires: qt5-qtdeclarative-devel%{?_isa} %if 0%{?docs} %package doc Summary: API documentation for %{name} -# for qhelpgenerator -BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qhelpgenerator BuildArch: noarch %description doc %{summary}. @@ -201,6 +204,9 @@ popd %changelog +* Wed Jul 29 2015 Rex Dieter 5.5.0-4 +- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping + * Thu Jul 16 2015 Rex Dieter 5.5.0-3 - tighten deps (#1233829) From d2a7000f583a0a9be697b8af4f15a3a4d1feb0e2 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 5 Oct 2015 13:58:00 -0300 Subject: [PATCH 062/208] - Prepare to 5.5.1 release with Qt 5.5.1 RC --- .gitignore | 1 + qt5-qtwebkit.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4f0e516..48835f3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 57476e6..3cbaa22 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,12 +14,12 @@ %endif %endif -#define prerelease rc +%define prerelease rc1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.5.0 -Release: 4%{?dist} +Version: 5.5.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 @@ -204,6 +204,9 @@ popd %changelog +* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 +- Update to Qt 5.5.1 RC1 + * Wed Jul 29 2015 Rex Dieter 5.5.0-4 - -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping diff --git a/sources b/sources index 217503f..def8eaa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5335fe211f5c0f92a4f6ca370fa9a0ce qtwebkit-opensource-src-5.5.0.tar.xz +9304560261185e5cef7934901626f3c1 qtwebkit-opensource-src-5.5.1-rc1.tar.xz From 74e3f43030216dfb00d4dd99581553f4cd47fda8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Oct 2015 07:27:58 -0500 Subject: [PATCH 063/208] BR: perl(Getopt::Long) --- qt5-qtwebkit.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3cbaa22..8f05518 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -83,7 +83,8 @@ BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) -BuildRequires: perl perl(version) perl(Digest::MD5) perl(Text::ParseWords) +BuildRequires: perl perl(version) +BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) BuildRequires: ruby BuildRequires: zlib-devel From 1a4a3d6c18ea6ff830ea8297e6df6e138563e384 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 15 Oct 2015 11:23:27 -0300 Subject: [PATCH 064/208] - Update to final release --- .gitignore | 1 + qt5-qtwebkit.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48835f3..d818f91 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8f05518..e1fd2f0 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,7 +14,7 @@ %endif %endif -%define prerelease rc1 +## define prerelease rc1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit diff --git a/sources b/sources index def8eaa..c3c4633 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9304560261185e5cef7934901626f3c1 qtwebkit-opensource-src-5.5.1-rc1.tar.xz +681328edb539b8fa3a273b38c90b3e31 qtwebkit-opensource-src-5.5.1.tar.xz From 8e356ef5f0a2d7ca89655a67190dc9e34fc0c2eb Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 15 Oct 2015 11:24:15 -0300 Subject: [PATCH 065/208] - Update to final release --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e1fd2f0..8495a2b 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: 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 @@ -205,6 +205,9 @@ popd %changelog +* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 +- Update to final release 5.5.1 + * Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 - Update to Qt 5.5.1 RC1 From 94c03c2705d1e0ce9fe6dd298d0efbe770012599 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 16 Oct 2015 09:13:53 -0500 Subject: [PATCH 066/208] 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 067/208] 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 068/208] 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 069/208] 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 070/208] 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 From 7b975f156ef68d6a0513077dcbd75325bab90fe2 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Thu, 10 Dec 2015 21:40:15 +0100 Subject: [PATCH 071/208] - Update to final official beta --- .gitignore | 1 + qt5-qtwebkit.spec | 44 ++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index d818f91..31cb1bd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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-beta.tar.gz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8495a2b..a4a5ed8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,29 +3,26 @@ %global _hardened_build 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 -#global bootstrap 1 +%define prerelease beta -%if ! 0%{?bootstrap} -%ifarch %{arm} %{ix86} x86_64 %define docs 1 -%endif -%endif - -## define prerelease rc1 Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.5.1 -Release: 2%{?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 License: LGPLv2 with exceptions or GPLv3 with exceptions -Url: http://www.qt.io -Source0: http://download.qt.io/official_releases/qt/5.5/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Url: http://www.qt.io +# 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/qtwebkit.git && cd qtwebkit +# git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. +# cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. +# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.gz qt5-qtwebkit-opensource-src-5.6.0-beta +Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -51,15 +48,16 @@ Patch7: 0001-Add-ARM-64-support.patch Patch8: qtwebkit-opensource-src-5.2.1-no_rpath.patch %if 0%{?system_angle} -BuildRequires: angleproject-devel angleproject-static +BuildRequires: angleproject-devel +BuildRequires: angleproject-static %endif 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: qt5-qdoc BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -205,6 +203,12 @@ popd %changelog +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + * Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 - Update to final release 5.5.1 diff --git a/sources b/sources index c3c4633..ef5a009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -681328edb539b8fa3a273b38c90b3e31 qtwebkit-opensource-src-5.5.1.tar.xz +7935d48b6c312d2e3cee84c51bb30772 qtwebkit-opensource-src-5.6.0-beta.tar.gz From 003e1cc7c38d5a9da75cc55f6264b5d345dc93b8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 12:12:46 -0600 Subject: [PATCH 072/208] 5.6.0-0.4 - restore bootstrap macro - drop (unused) system_angle support - include -qdoc builddep only in -doc subpkg --- qt5-qtwebkit.spec | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 84736b2..6b9b623 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,19 +3,23 @@ %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 -%global bootstrap 1 +%if ! 0%{?bootstrap} +%ifarch %{arm} %{ix86} x86_64 +%define docs 1 +%endif +%endif %define prerelease beta -%define docs 1 - Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.3%{?dist} +Release: 0.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 @@ -44,16 +48,13 @@ 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 -BuildRequires: angleproject-static -%endif BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: pkgconfig(Qt5Qml) >= %{version} +%if ! 0%{?bootstrap} BuildRequires: pkgconfig(Qt5Sensors) BuildRequires: pkgconfig(Qt5Location) BuildRequires: pkgconfig(Qt5WebChannel) -BuildRequires: qt5-qdoc +%endif BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -191,6 +192,11 @@ popd %changelog +* Fri Dec 11 2015 Rex Dieter - 5.6.0-0.4 +- restore bootstrap macro, omit more optional BR's/features in bootstrap mode +- drop (unused) system_angle support +- include -qdoc builddep only in -doc subpkg + * Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.3 - Official beta release From 2e584ef9ae29583cc9c7401993417427741af4e1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 13:09:31 -0600 Subject: [PATCH 073/208] remove bootstrap inadvertantly left on during local testing --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 6b9b623..7949250 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,7 +3,7 @@ %global _hardened_build 1 -%global bootstrap 1 +#global bootstrap 1 # define to build docs, need to undef this for bootstrapping # where qt5-qttools builds are not yet available From eeae85600fc306af9c5a2f8fa05257c64b18c9f1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Dec 2015 21:57:34 -0600 Subject: [PATCH 074/208] fix FTBFS, missing include/ (and syncqt.pl) --- qt5-qtwebkit.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7949250..fb4e6ca 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -126,6 +126,11 @@ mkdir Source/ThirdParty/orig mv Source/ThirdParty/{gtest/,qunit/} \ Source/ThirdParty/orig/ +# check for prerelease macro instead? --rex +if [ ! -d include ]; then +syncqt.pl -version %{version} Source/sync.profile +fi + %build mkdir %{_target_platform} From 5c9fd784a46c31daf06f171e7f54839918df81d6 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 13 Dec 2015 17:57:55 +0100 Subject: [PATCH 075/208] - Definitive source. Remember: DEPRECATED --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ef5a009..41c4039 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7935d48b6c312d2e3cee84c51bb30772 qtwebkit-opensource-src-5.6.0-beta.tar.gz +29d31fafed9210fd7ce7770523182b60 qtwebkit-opensource-src-5.6.0-beta.tar.gz From 7a4ad93e1a3d929561695faea544712480246931 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sun, 13 Dec 2015 17:59:21 +0100 Subject: [PATCH 076/208] - Definitive source. Remember: DEPRECATED --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index fb4e6ca..2b869bc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.4%{?dist} +Release: 0.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 @@ -197,6 +197,9 @@ popd %changelog +* Sun Dec 13 2015 Helio Chissini de Castro - 5.6.0-0.5 +- Update beta code + * Fri Dec 11 2015 Rex Dieter - 5.6.0-0.4 - restore bootstrap macro, omit more optional BR's/features in bootstrap mode - drop (unused) system_angle support From b2ca620ad8c1d5c8353e850fb772bb70e8b0b960 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Dec 2015 16:02:36 +0100 Subject: [PATCH 077/208] Rebuilt for libwebp soname bump Signed-off-by: Igor Gnatenko --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2b869bc..33b9ecc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.5%{?dist} +Release: 0.6%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -197,6 +197,9 @@ popd %changelog +* Mon Dec 28 2015 Igor Gnatenko - 5.6.0-0.6 +- Rebuilt for libwebp soname bump + * Sun Dec 13 2015 Helio Chissini de Castro - 5.6.0-0.5 - Update beta code From dfc1b20c1df2ad64290ba63a09783de4cbef0bab Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 28 Dec 2015 23:24:17 -0600 Subject: [PATCH 078/208] BR: cmake, use %license --- qt5-qtwebkit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 33b9ecc..59e3c16 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.6%{?dist} +Release: 0.7%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -48,6 +48,7 @@ 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} @@ -173,7 +174,7 @@ popd %postun -p /sbin/ldconfig %files -%doc Source/WebCore/LICENSE* +%license Source/WebCore/LICENSE* %doc ChangeLog* VERSION %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* @@ -197,6 +198,9 @@ popd %changelog +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.7 +- BR: cmake, use %%license + * Mon Dec 28 2015 Igor Gnatenko - 5.6.0-0.6 - Rebuilt for libwebp soname bump From 99123cf4d8fb54120339a3d5bac5bc8836274530 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 21:48:08 +0000 Subject: [PATCH 079/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 59e3c16..e8207af 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.7%{?dist} +Release: 0.8%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -198,6 +198,9 @@ popd %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Dec 28 2015 Rex Dieter 5.6.0-0.7 - BR: cmake, use %%license From edbc96a45bf58d6a679d212f520f45d39a8060ab Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 15 Feb 2016 17:51:57 +0100 Subject: [PATCH 080/208] Update rc release --- .gitignore | 1 + qt5-qtwebkit.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bd86134..3acd1b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebkit-opensource-src-5.5.1.tar.xz /qtwebkit-opensource-src-5.6.0-beta.tar.gz /qtwebkit-opensource-src-5.6.0-beta1.tar.xz +/qtwebkit-opensource-src-5.6.0-rc.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e8207af..b1bc978 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,12 +14,12 @@ %endif %endif -%define prerelease beta +%define prerelease rc Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.8%{?dist} +Release: 0.9%{?dist}.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -30,8 +30,8 @@ Url: http://www.qt.io # git clone git@github.com:qtproject/qtwebkit.git && cd qtwebkit # git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. # cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. -# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.gz qt5-qtwebkit-opensource-src-5.6.0-beta -Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.gz +# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.xz qt5-qtwebkit-opensource-src-5.6.0-beta +Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -198,6 +198,9 @@ popd %changelog +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.9 +- Update RC release + * Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 41c4039..020d63b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29d31fafed9210fd7ce7770523182b60 qtwebkit-opensource-src-5.6.0-beta.tar.gz +7a65d9aa88394b6bde8e435dcd403250 qtwebkit-opensource-src-5.6.0-rc.tar.xz From d4131255a00a90345ed0c65390a4f5cedbcca3e9 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Tue, 23 Feb 2016 16:45:12 +0100 Subject: [PATCH 081/208] Update final RC --- .gitignore | 1 + qt5-qtwebkit.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3acd1b7..1c9ffbb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /qtwebkit-opensource-src-5.6.0-beta.tar.gz /qtwebkit-opensource-src-5.6.0-beta1.tar.xz /qtwebkit-opensource-src-5.6.0-rc.tar.xz +/qtwebkit-opensource-src-5.6.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b1bc978..2bb64ea 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.9%{?dist}.%{prerelease}%{?dist} +Release: 0.10%{?dist}.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -198,6 +198,9 @@ popd %changelog +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.10.rc +- Update to final RC + * Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.9 - Update RC release diff --git a/sources b/sources index 020d63b..aa3fff0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a65d9aa88394b6bde8e435dcd403250 qtwebkit-opensource-src-5.6.0-rc.tar.xz +f93c15d465a12c4598851ab8319be90d qtwebkit-opensource-src-5.6.0.tar.xz From b75f51ece7b28a7e0b5e143569824c3bc142aaf7 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Wed, 24 Feb 2016 17:01:49 +0100 Subject: [PATCH 082/208] - Fix release --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2bb64ea..30736ca 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.10%{?dist}.%{prerelease}%{?dist} +Release: 0.11.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -198,6 +198,9 @@ popd %changelog +* Wed Feb 24 2016 Helio Chissini de Castro - 5.6.0-0.11.rc +- Fix the trap caused by rpmdev-bumpspec + * Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.10.rc - Update to final RC From 5e5fe447016b3d8cb7fe42993d597ff8a6044d8e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 29 Feb 2016 08:01:43 -0600 Subject: [PATCH 083/208] fix sources --- .gitignore | 3 --- qt5-qtwebkit.spec | 14 +++++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1c9ffbb..d32b50a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ /qtwebkit-opensource-src-5.5.1.tar.xz -/qtwebkit-opensource-src-5.6.0-beta.tar.gz -/qtwebkit-opensource-src-5.6.0-beta1.tar.xz -/qtwebkit-opensource-src-5.6.0-rc.tar.xz /qtwebkit-opensource-src-5.6.0.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 30736ca..31e5137 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.11.%{prerelease}%{?dist} +Release: 0.12.%{prerelease}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -31,7 +31,12 @@ Url: http://www.qt.io # git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. # cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. # tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.xz qt5-qtwebkit-opensource-src-5.6.0-beta -Source0: %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz + +%if 0%{?prerelease:1} +Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%else +Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz +%endif # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -113,7 +118,7 @@ BuildArch: noarch %prep -%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%setup -q -n %{qt_module}-opensource-src-%{version} %patch1 -p1 -b .pluginpath %patch3 -p1 -b .debuginfo @@ -198,6 +203,9 @@ popd %changelog +* Mon Feb 29 2016 Rex Dieter 5.6.0-0.12.rc +- fix sources + * Wed Feb 24 2016 Helio Chissini de Castro - 5.6.0-0.11.rc - Fix the trap caused by rpmdev-bumpspec From 1d5f93ff8f79a2f15bd7f209c2834cce1bb81826 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Mon, 14 Mar 2016 17:52:52 +0100 Subject: [PATCH 084/208] - 5.6.0 release --- qt5-qtwebkit.spec | 20 ++++++-------------- sources | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 31e5137..bf0315c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,29 +14,18 @@ %endif %endif -%define prerelease rc +#define prerelease Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 0.12.%{prerelease}%{?dist} +Release: 1%{?prerelease:.%{prerelease}}%{?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 -# 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/qtwebkit.git && cd qtwebkit -# git archive --prefix=qt5-qtwebkit-opensource-src-5.6.0-beta/ origin/5.6 | tar -x -C .. -# cd ../qt5-qtwebkit-opensource-src-5.6.0-beta && syncqt.pl -version 5.6.0 && cd .. -# tar cfz qt5-qtwebkit-opensource-src-5.6.0-beta.tar.xz qt5-qtwebkit-opensource-src-5.6.0-beta - -%if 0%{?prerelease:1} -Source0: http://download.qt.io/development_releases/qt/5.6/%{version}-%{prerelease}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%else -Source0: http://download.qt.io/official_releases/qt/5.6/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz -%endif +Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -203,6 +192,9 @@ popd %changelog +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + * Mon Feb 29 2016 Rex Dieter 5.6.0-0.12.rc - fix sources diff --git a/sources b/sources index aa3fff0..fea13df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f93c15d465a12c4598851ab8319be90d qtwebkit-opensource-src-5.6.0.tar.xz +eba1382587add1c9b1293a532e7dd161 qtwebkit-opensource-src-5.6.0.tar.xz From abe65b09755553e16b3566cf2b51c1f68570c967 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 17 Mar 2016 21:22:17 -0500 Subject: [PATCH 085/208] rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index bf0315c..324cf54 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 1%{?prerelease:.%{prerelease}}%{?dist} +Release: 2%{?prerelease:.%{prerelease}}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -192,6 +192,9 @@ popd %changelog +* Fri Mar 18 2016 Rex Dieter - 5.6.0-2 +- rebuild + * Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 - 5.6.0 final release From 81f6951d726b54f1ec8f49dd6ca2031094588e1d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 20 Mar 2016 18:08:00 -0500 Subject: [PATCH 086/208] rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 324cf54..4db5a74 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 2%{?prerelease:.%{prerelease}}%{?dist} +Release: 3%{?prerelease:.%{prerelease}}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -192,6 +192,9 @@ popd %changelog +* Sun Mar 20 2016 Rex Dieter - 5.6.0-3 +- rebuild + * Fri Mar 18 2016 Rex Dieter - 5.6.0-2 - rebuild From f1607736fc3bad76a36fc71db69fe497dede0c6c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 6 Apr 2016 23:23:13 +0100 Subject: [PATCH 087/208] Update ruby deps to ensure all bits are present --- qt5-qtwebkit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4db5a74..4d04d98 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 3%{?prerelease:.%{prerelease}}%{?dist} +Release: 4%{?prerelease:.%{prerelease}}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -75,7 +75,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) BuildRequires: perl perl(version) BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) -BuildRequires: ruby +BuildRequires: ruby rubypick rubygem BuildRequires: zlib-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -192,6 +192,9 @@ popd %changelog +* Wed Apr 6 2016 Peter Robinson 5.6.0-4 +- Update ruby deps to ensure all bits are present + * Sun Mar 20 2016 Rex Dieter - 5.6.0-3 - rebuild From b5d48d6d4ec533200b0d4c16b1d8c2144d460752 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 6 Apr 2016 23:40:36 +0100 Subject: [PATCH 088/208] fix spelling of rubygems --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4d04d98..54c957b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -75,7 +75,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xcomposite) pkgconfig(xrender) BuildRequires: perl perl(version) BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) -BuildRequires: ruby rubypick rubygem +BuildRequires: ruby rubypick rubygems BuildRequires: zlib-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} From 0125dfd6e07ed0fb135ff90f17d7f6d4c16ac776 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2016 20:15:28 +0200 Subject: [PATCH 089/208] rebuild for ICU 57.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 54c957b..f1c27e0 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 4%{?prerelease:.%{prerelease}}%{?dist} +Release: 5%{?prerelease:.%{prerelease}}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -192,6 +192,9 @@ popd %changelog +* Fri Apr 15 2016 David Tardon - 5.6.0-5 +- rebuild for ICU 57.1 + * Wed Apr 6 2016 Peter Robinson 5.6.0-4 - Update ruby deps to ensure all bits are present From 48070a4527b22e637ae0b474a5097d33ab4c8b8a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 17 Apr 2016 11:20:37 -0500 Subject: [PATCH 090/208] BR: qt5-qtbase-private-devel qt5-qtdeclarative-private-devel --- qt5-qtwebkit.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f1c27e0..92a3ac8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 5%{?prerelease:.%{prerelease}}%{?dist} +Release: 6%{?prerelease:.%{prerelease}}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -78,7 +78,9 @@ BuildRequires: perl(Digest::MD5) perl(Text::ParseWords) perl(Getopt::Long) BuildRequires: ruby rubypick rubygems BuildRequires: zlib-devel +BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-qtdeclarative-private-devel %{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} ##upstream patches @@ -192,6 +194,9 @@ popd %changelog +* Sun Apr 17 2016 Rex Dieter - 5.6.0-6 +- BR: qt5-qtbase-private-devel qt5-qtdeclarative-private-devel + * Fri Apr 15 2016 David Tardon - 5.6.0-5 - rebuild for ICU 57.1 From ef99406925177e22cfa47b57939391698298663d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 20 Apr 2016 10:22:09 -0500 Subject: [PATCH 091/208] rebuild (icu) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 92a3ac8..710adf6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -19,7 +19,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 6%{?prerelease:.%{prerelease}}%{?dist} +Release: 7%{?prerelease:.%{prerelease}}%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -194,6 +194,9 @@ popd %changelog +* Wed Apr 20 2016 Rex Dieter - 5.6.0-7} +- rebuild (icu) + * Sun Apr 17 2016 Rex Dieter - 5.6.0-6 - BR: qt5-qtbase-private-devel qt5-qtdeclarative-private-devel From d7a7675b8be200abd0b2277f799d751932de3449 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 18 May 2016 11:24:28 -0500 Subject: [PATCH 092/208] use pristine upstream (community) sources --- qt5-qtwebkit.spec | 12 +++++++----- sources | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 710adf6..5c1cd52 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,18 +14,17 @@ %endif %endif -#define prerelease - Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 7%{?prerelease:.%{prerelease}}%{?dist} +Release: 8%{?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 -Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +Source0: http://download.qt.io/community_releases/5.6/%{version}/qtwebkit-opensource-src-%{version}.tar.xz +#Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -194,7 +193,10 @@ popd %changelog -* Wed Apr 20 2016 Rex Dieter - 5.6.0-7} +* Wed May 18 2016 Rex Dieter - 5.6.0-8 +- use pristine upstream (community) sources + +* Wed Apr 20 2016 Rex Dieter - 5.6.0-7 - rebuild (icu) * Sun Apr 17 2016 Rex Dieter - 5.6.0-6 diff --git a/sources b/sources index fea13df..9a6d6be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eba1382587add1c9b1293a532e7dd161 qtwebkit-opensource-src-5.6.0.tar.xz +b68565d18db63ee4db998bb8e37608a5 qtwebkit-opensource-src-5.6.0.tar.xz From 0ee9f8219429c7f0605a3d3d424d3a4496ab414a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Jun 2016 13:31:53 -0500 Subject: [PATCH 093/208] rebuild (qtbase) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 5c1cd52..003d17f 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -17,7 +17,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.0 -Release: 8%{?dist} +Release: 9%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -193,6 +193,9 @@ popd %changelog +* Thu Jun 09 2016 Rex Dieter - 5.6.0-9 +- rebuild (qtbase) + * Wed May 18 2016 Rex Dieter - 5.6.0-8 - use pristine upstream (community) sources From afc38ffb7a8ea5906a74efdc6f7df5a5acf87385 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Jun 2016 11:28:05 -0500 Subject: [PATCH 094/208] 5.6.1 branch snapshot, plus a couple post-5.6.1 5.6 branch fixes --- .gitignore | 1 + 0005-Added-missing-break-statement.patch | 26 ++++++++++ ...-zoomed-border-image-with-repeat-mod.patch | 49 +++++++++++++++++++ qt5-qtwebkit.spec | 33 +++++++++++-- sources | 2 +- 5 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 0005-Added-missing-break-statement.patch create mode 100644 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch diff --git a/.gitignore b/.gitignore index d32b50a..2a3da9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /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 diff --git a/0005-Added-missing-break-statement.patch b/0005-Added-missing-break-statement.patch new file mode 100644 index 0000000..558f2dd --- /dev/null +++ b/0005-Added-missing-break-statement.patch @@ -0,0 +1,26 @@ +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/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch b/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch new file mode 100644 index 0000000..a15df3f --- /dev/null +++ b/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch @@ -0,0 +1,49 @@ +From da5f9d788f96340a44083ed4e28cdf6ea0a393f0 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Tue, 24 May 2016 15:25:43 +0300 +Subject: [PATCH 9/9] Fixed drawing of zoomed border-image with repeat mode. + +Image::drawPattern has special optimized path for scaled transform which +creates pre-scaled brush and removes scale from original transform. +However this change makes following translation to (tr.x(), tr.y()) +incorrect because it is expected to be done in scaled coordinate system. + +Change-Id: I570cf82a4e7f61f6abe3fa4cb9b39aea0e51f2e5 +Task-number: QTBUG-53532 +Reviewed-by: Allan Sandfeld Jensen +--- + Source/WebCore/platform/graphics/qt/ImageQt.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Source/WebCore/platform/graphics/qt/ImageQt.cpp b/Source/WebCore/platform/graphics/qt/ImageQt.cpp +index 9e4408b..f30284b 100644 +--- a/Source/WebCore/platform/graphics/qt/ImageQt.cpp ++++ b/Source/WebCore/platform/graphics/qt/ImageQt.cpp +@@ -156,6 +156,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const + if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) + pixmap = pixmap.copy(tr); + ++ QPoint trTopLeft = tr.topLeft(); ++ + CompositeOperator previousOperator = ctxt->compositeOperation(); + + ctxt->setCompositeOperation(!pixmap.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op); +@@ -180,13 +182,14 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const + painter.drawPixmap(QRect(0, 0, scaledPixmap.width(), scaledPixmap.height()), pixmap); + } + pixmap = scaledPixmap; ++ trTopLeft = transform.map(trTopLeft); + transform = QTransform::fromTranslate(transform.dx(), transform.dy()); + } + } + + /* Translate the coordinates as phase is not in world matrix coordinate space but the tile rect origin is. */ + transform *= QTransform().translate(phase.x(), phase.y()); +- transform.translate(tr.x(), tr.y()); ++ transform.translate(trTopLeft.x(), trTopLeft.y()); + + QBrush b(pixmap); + b.setTransform(transform); +-- +2.7.4 + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 003d17f..3507bba 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -14,18 +14,31 @@ %endif %endif +%global commit0 b889f460280ad98c89ede179bd3b9ce9cb02002b +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit -Version: 5.6.0 -Release: 9%{?dist} +Version: 5.6.1 +Release: 1.%{shortcommit0}git%{?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 -#Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz +%endif +## downstream patches # Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch @@ -41,6 +54,10 @@ 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} @@ -110,6 +127,9 @@ 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 @@ -122,7 +142,6 @@ mkdir Source/ThirdParty/orig mv Source/ThirdParty/{gtest/,qunit/} \ Source/ThirdParty/orig/ -# check for prerelease macro instead? --rex if [ ! -d include ]; then syncqt.pl -version %{version} Source/sync.profile fi @@ -139,13 +158,14 @@ pushd %{_target_platform} # workaround, disable parallel compilation as it fails to compile in brew #make %{?_smp_mflags} -make -j2 +make -j3 %if 0%{?docs} make %{?_smp_mflags} docs %endif popd + %install make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} @@ -193,6 +213,9 @@ popd %changelog +* Thu Jun 09 2016 Rex Dieter - 5.6.1-1.b889f46git +- 5.6.1 branch snapshot, plus a couple post-5.6.1 5.6 branch fixes + * Thu Jun 09 2016 Rex Dieter - 5.6.0-9 - rebuild (qtbase) diff --git a/sources b/sources index 9a6d6be..cb3acc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b68565d18db63ee4db998bb8e37608a5 qtwebkit-opensource-src-5.6.0.tar.xz +1a7f3953c457c57a942bdd6a92d198fb qtwebkit-opensource-src-5.6.1-b889f46.tar.xz From 1191b4513cecdfb1aeedbf67c2e8537021fa40fa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Jun 2016 08:43:40 -0500 Subject: [PATCH 095/208] rebuild (glibc) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3507bba..969226b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.1 -Release: 1.%{shortcommit0}git%{?dist} +Release: 2.%{shortcommit0}git%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -213,6 +213,9 @@ popd %changelog +* Tue Jun 14 2016 Rex Dieter - 5.6.1-2.b889f46git +- rebuild (glibc) + * Thu Jun 09 2016 Rex Dieter - 5.6.1-1.b889f46git - 5.6.1 branch snapshot, plus a couple post-5.6.1 5.6 branch fixes From 6657efd0959536dc13c6bc6986deeed8e18817f0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Jun 2016 06:49:55 -0500 Subject: [PATCH 096/208] drop pkgconfig-style deps --- qt5-qtwebkit.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 969226b..eb11496 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -20,7 +20,7 @@ Summary: Qt5 - QtWebKit components Name: qt5-qtwebkit Version: 5.6.1 -Release: 2.%{shortcommit0}git%{?dist} +Release: 3.%{shortcommit0}git%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -60,11 +60,11 @@ Patch109: 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch BuildRequires: cmake BuildRequires: qt5-qtbase-devel >= %{version} -BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: qt5-qtdeclarative-devel >= %{version} %if ! 0%{?bootstrap} -BuildRequires: pkgconfig(Qt5Sensors) -BuildRequires: pkgconfig(Qt5Location) -BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: qt5-qtsensors-devel +BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtwebchannel-devel %endif BuildRequires: bison BuildRequires: flex @@ -213,6 +213,9 @@ popd %changelog +* Wed Jun 15 2016 Rex Dieter - 5.6.1-3.b889f46git +- drop pkgconfig-style deps + * Tue Jun 14 2016 Rex Dieter - 5.6.1-2.b889f46git - rebuild (glibc) From e988f7ce533a06958f9962ab55e54102af6e4ada Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Jun 2016 06:56:23 -0500 Subject: [PATCH 097/208] rubypick is fedora-only (apparently) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index eb11496..7c4e068 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -91,7 +91,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 rubypick rubygems +BuildRequires: ruby rubygems +%if 0%{?fedora} +BuildRequires: rubypick +%endif BuildRequires: zlib-devel BuildRequires: qt5-qtbase-private-devel 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 098/208] - 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 099/208] - 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 100/208] 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 101/208] 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 102/208] 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 103/208] 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 104/208] 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 105/208] - 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 106/208] 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 107/208] 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 108/208] - 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 109/208] - 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 110/208] 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 111/208] 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 112/208] 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 113/208] 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 From 2b014757ced039b74947e8a2fa547793b8d43ae2 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Wed, 21 Jun 2017 17:41:23 +0200 Subject: [PATCH 114/208] use new qtwebkit branch from annulen --- .gitignore | 1 + 0001-Add-ARM-64-support.patch | 13 - ...-zoomed-border-image-with-repeat-mod.patch | 49 ---- qt5-qtwebkit.spec | 257 ++++++++++-------- qtwebkit-opensource-src-5.0.1-debuginfo.patch | 80 ------ ...bkit-opensource-src-5.2.0-pluginpath.patch | 19 -- ...kit-opensource-src-5.2.0-save_memory.patch | 12 - qtwebkit-opensource-src-5.2.1-no_rpath.patch | 12 - sources | 2 +- 9 files changed, 140 insertions(+), 305 deletions(-) delete mode 100644 0001-Add-ARM-64-support.patch delete mode 100644 0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch delete mode 100644 qtwebkit-opensource-src-5.0.1-debuginfo.patch delete mode 100644 qtwebkit-opensource-src-5.2.0-pluginpath.patch delete mode 100644 qtwebkit-opensource-src-5.2.0-save_memory.patch delete mode 100644 qtwebkit-opensource-src-5.2.1-no_rpath.patch diff --git a/.gitignore b/.gitignore index 8e53980..365136b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /qtwebkit-opensource-src-5.9.0.tar.xz +/qtwebkit-5.212.0-alpha2.tar.xz diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch deleted file mode 100644 index 73f5c97..0000000 --- a/0001-Add-ARM-64-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 4594ec8..639f28f 100644 ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -342,7 +342,7 @@ - #endif - #endif - --#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) -+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(AARCH64) - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - diff --git a/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch b/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch deleted file mode 100644 index a15df3f..0000000 --- a/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch +++ /dev/null @@ -1,49 +0,0 @@ -From da5f9d788f96340a44083ed4e28cdf6ea0a393f0 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Tue, 24 May 2016 15:25:43 +0300 -Subject: [PATCH 9/9] Fixed drawing of zoomed border-image with repeat mode. - -Image::drawPattern has special optimized path for scaled transform which -creates pre-scaled brush and removes scale from original transform. -However this change makes following translation to (tr.x(), tr.y()) -incorrect because it is expected to be done in scaled coordinate system. - -Change-Id: I570cf82a4e7f61f6abe3fa4cb9b39aea0e51f2e5 -Task-number: QTBUG-53532 -Reviewed-by: Allan Sandfeld Jensen ---- - Source/WebCore/platform/graphics/qt/ImageQt.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Source/WebCore/platform/graphics/qt/ImageQt.cpp b/Source/WebCore/platform/graphics/qt/ImageQt.cpp -index 9e4408b..f30284b 100644 ---- a/Source/WebCore/platform/graphics/qt/ImageQt.cpp -+++ b/Source/WebCore/platform/graphics/qt/ImageQt.cpp -@@ -156,6 +156,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const - if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) - pixmap = pixmap.copy(tr); - -+ QPoint trTopLeft = tr.topLeft(); -+ - CompositeOperator previousOperator = ctxt->compositeOperation(); - - ctxt->setCompositeOperation(!pixmap.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op); -@@ -180,13 +182,14 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const - painter.drawPixmap(QRect(0, 0, scaledPixmap.width(), scaledPixmap.height()), pixmap); - } - pixmap = scaledPixmap; -+ trTopLeft = transform.map(trTopLeft); - transform = QTransform::fromTranslate(transform.dx(), transform.dy()); - } - } - - /* Translate the coordinates as phase is not in world matrix coordinate space but the tile rect origin is. */ - transform *= QTransform().translate(phase.x(), phase.y()); -- transform.translate(tr.x(), tr.y()); -+ transform.translate(trTopLeft.x(), trTopLeft.y()); - - QBrush b(pixmap); - b.setTransform(transform); --- -2.7.4 - diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2fc4b90..3739c10 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -3,89 +3,84 @@ %global _hardened_build 1 -Summary: Qt5 - QtWebKit components -Name: qt5-qtwebkit -Version: 5.9.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.9/%{version}-final/%{qt_module}-opensource-src-%{version}.tar.xz - -## downstream patches -# Search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too -Patch1: qtwebkit-opensource-src-5.2.0-pluginpath.patch - -# smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit -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 - -# Add AArch64 support -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: qt5-qtdeclarative-devel >= %{version} +%global prerel alpha2 +%global prerel_tag -%{prerel} + +## NOTE: Lots of files in various subdirectories have the same name (such as +## "LICENSE") so this short macro allows us to distinguish them by using their +## directory names (from the source tree) as prefixes for the files. +%global add_to_license_files() \ + mkdir -p _license_files ; \ + cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') + +Name: qt5-%{qt_module} +Version: 5.212.0 +Release: 0.2.%{?prerel}%{?dist} +Summary: Qt5 - QtWebKit components + +License: LGPLv2 and BSD +URL: https://github.com/annulen/webkit +Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz + +BuildRequires: bison +BuildRequires: cmake +BuildRequires: flex +BuildRequires: fontconfig-devel +BuildRequires: glib2-devel +BuildRequires: gperf +BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-plugins-base-devel +BuildRequires: hyphen-devel +BuildRequires: libicu-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libwebp-devel +BuildRequires: libXcomposite-devel +BuildRequires: libXrender-devel +BuildRequires: libxslt-devel +BuildRequires: mesa-libGL-devel +BuildRequires: perl-generators +BuildRequires: python2 +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel %if ! 0%{?bootstrap} -BuildRequires: pkgconfig(Qt5Sensors) -BuildRequires: pkgconfig(Qt5Location) -BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtsensors-devel +BuildRequires: qt5-qtwebchannel-devel %endif -BuildRequires: bison -BuildRequires: flex -BuildRequires: gperf -BuildRequires: libicu-devel -BuildRequires: libjpeg-devel -BuildRequires: pkgconfig(gio-2.0) pkgconfig(glib-2.0) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(gl) -# gstreamer media support -%if 0%{?fedora} > 20 || 0%{?rhel} > 7 -BuildRequires: pkgconfig(gstreamer-1.0) pkgconfig(gstreamer-app-1.0) -%else -BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) -%endif -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libudev) -%if 0%{?fedora} || 0%{?rhel} > 6 -BuildRequires: pkgconfig(libwebp) -%endif -BuildRequires: pkgconfig(libxslt) -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 rubygems -%if 0%{?fedora} -BuildRequires: rubypick -%endif -BuildRequires: zlib-devel +BuildRequires: ruby-devel +BuildRequires: rubygems +BuildRequires: rubypick +BuildRequires: sqlite-devel +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}} +# filter qml provides +%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ + +# We're supposed to specify versions here, but these crap Google libs don't do +# normal releases. Accordingly, they're not suitable to be system libs. +Provides: bundled(angle) +Provides: bundled(brotli) +Provides: bundled(woff2) + + %description %{summary} -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: qt5-qtbase-devel%{?_isa} -Requires: qt5-qtdeclarative-devel%{?_isa} -%description devel -%{summary}. +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +Requires: qt5-qtdeclarative-devel%{?_isa} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %if 0%{?docs} %package doc @@ -93,89 +88,107 @@ Summary: API documentation for %{name} BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch + %description doc %{summary}. %endif %prep -%setup -q -n %{qt_module}-opensource-src-%{version} - -%patch1 -p1 -b .pluginpath -%patch3 -p1 -b .debuginfo -%patch4 -p1 -b .save_memory -%patch7 -p1 -b .aarch64 -%patch8 -p1 -b .no_rpath - -echo "nuke bundled code..." -# nuke bundled code -mkdir Source/ThirdParty/orig -mv Source/ThirdParty/{gtest/,qunit/} \ - Source/ThirdParty/orig/ - -if [ ! -d include ]; then -syncqt.pl -version %{version} Source/sync.profile -fi +%autosetup -p1 -n %{qt_module}-%{version}%{?prerel_tag} %build -mkdir %{_target_platform} -pushd %{_target_platform} - -%{qmake_qt5} .. \ -%ifnarch %{arm} %{ix86} x86_64 - DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 +# The following changes of optflags ietc. are adapted from webkitgtk4 package, which +# is mostly similar to this one... +# +# Increase the DIE limit so our debuginfo packages could be size optimized. +# Decreases the size for x86_64 from ~5G to ~1.1G. +# https://bugzilla.redhat.com/show_bug.cgi?id=1456261 +%global _dwz_max_die_limit 250000000 + +# Decrease debuginfo even on ix86 because of: +# https://bugs.webkit.org/show_bug.cgi?id=140176 +%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} +# Decrease debuginfo verbosity to reduce memory consumption even more +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -# workaround, disable parallel compilation as it fails to compile in brew -#make %{?_smp_mflags} -make -j3 +%ifarch ppc +# Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled +%global optflags %{optflags} -Wl,-relax +%endif +%{cmake} -DPORT=Qt \ + -DENABLE_TOOLS=OFF \ + -DINCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \ + -DLIBEXEC_INSTALL_DIR:PATH=%{_qt5_libexecdir} \ + -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/mkspecs/modules \ + -DQML_INSTALL_DIR:PATH=%{_qt5_qmldir} \ +%ifarch s390 s390x ppc %{power64} + -DENABLE_JIT=OFF \ +%endif +%ifarch s390 s390x ppc %{power64} + -DUSE_SYSTEM_MALLOC=ON \ +%endif %if 0%{?docs} -make %{?_smp_mflags} docs + -DGENERATE_DOCUMENTATION=ON \ %endif -popd + . - -%install -make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} +%make_build %if 0%{?docs} -make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} +%make_build docs %endif -## .prl/.la file love -# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs -pushd %{buildroot}%{_qt5_libdir} -for prl_file in libQt5*.prl ; do - sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} - if [ -f "$(basename ${prl_file} .prl).so" ]; then - rm -fv "$(basename ${prl_file} .prl).la" - sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} - fi -done -popd + +%install +%make_install + +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +# Finally, copy over and rename various files for %%license inclusion +%add_to_license_files Source/JavaScriptCore/COPYING.LIB +%add_to_license_files Source/JavaScriptCore/icu/LICENSE +%add_to_license_files Source/ThirdParty/ANGLE/LICENSE +%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/compiler/LICENSE +%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/murmurhash/LICENSE +%add_to_license_files Source/WebCore/icu/LICENSE +%add_to_license_files Source/WebCore/LICENSE-APPLE +%add_to_license_files Source/WebCore/LICENSE-LGPL-2 +%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1 +%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE +%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE +%add_to_license_files Source/WTF/icu/LICENSE +%add_to_license_files Source/WTF/wtf/dtoa/COPYING +%add_to_license_files Source/WTF/wtf/dtoa/LICENSE + %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig + %files -%license Source/WebCore/LICENSE* -%doc ChangeLog* VERSION +%license LICENSE.LGPLv21 _license_files/* %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* +%{_qt5_libexecdir}/QtWebDatabaseProcess +%{_qt5_libexecdir}/QtWebNetworkProcess %{_qt5_libexecdir}/QtWebPluginProcess %{_qt5_libexecdir}/QtWebProcess %{_qt5_archdatadir}/qml/QtWebKit/ + %files devel %{_qt5_headerdir}/Qt*/ %{_qt5_libdir}/libQt5*.so -%{_qt5_libdir}/libQt5*.prl %{_qt5_libdir}/cmake/Qt5*/ %{_qt5_libdir}/pkgconfig/Qt5*.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri + %if 0%{?docs} %files doc %{_qt5_docdir}/qtwebkit.qch @@ -184,6 +197,12 @@ popd %changelog +* Wed Jun 21 2017 Christian Dersch - 5.212.0-0.2.alpha2 +- few spec adjustments + +* Sun Jun 18 2017 Christian Dersch - 5.212.0-0.1.alpha2 +- switch to maintained annulen branch of qtwebkit + * Sat Jun 10 2017 Rex Dieter - 5.9.0-1 - 5.9.0 (final) diff --git a/qtwebkit-opensource-src-5.0.1-debuginfo.patch b/qtwebkit-opensource-src-5.0.1-debuginfo.patch deleted file mode 100644 index b9224a9..0000000 --- a/qtwebkit-opensource-src-5.0.1-debuginfo.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri ---- qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri.debuginfo 2013-01-29 13:03:49.000000000 -0600 -+++ qtwebkit-opensource-src-5.0.1/Source/JavaScriptCore/JavaScriptCore.pri 2013-02-23 13:54:22.578460045 -0600 -@@ -7,6 +7,12 @@ - - SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/JavaScriptCore - -+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { -+# message("JavaScriptCore workaround for QtWebkit: do not build with -g, but with -g1") -+# QMAKE_CXXFLAGS_RELEASE -= -g -+# QMAKE_CXXFLAGS_RELEASE += -g1 -+#} -+ - JAVASCRIPTCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/JavaScriptCore/$${GENERATED_SOURCES_DESTDIR} - - INCLUDEPATH += \ -diff -up qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri ---- qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri.debuginfo 2013-01-29 13:03:41.000000000 -0600 -+++ qtwebkit-opensource-src-5.0.1/Source/WebCore/WebCore.pri 2013-02-23 13:57:16.984279672 -0600 -@@ -7,6 +7,12 @@ - - SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore - -+equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { -+ message("WebCore workaround for QtWebkit: do not build with -g, but with -g1") -+ QMAKE_CXXFLAGS_RELEASE -= -g -+ QMAKE_CXXFLAGS_RELEASE += -g1 -+} -+ - QT *= network sql core-private gui-private - - WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_SOURCES_DESTDIR} -diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri ---- qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri.debuginfo 2013-01-29 13:03:39.000000000 -0600 -+++ qtwebkit-opensource-src-5.0.1/Source/WebKit2/WebKit2.pri 2013-02-23 13:54:22.579460033 -0600 -@@ -9,6 +9,12 @@ SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ - - WEBKIT2_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebKit2/$${GENERATED_SOURCES_DESTDIR} - -+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { -+# message("WebKit2 workaround for QtWebkit: do not build with -g, but with -g1") -+# QMAKE_CXXFLAGS_RELEASE -= -g -+# QMAKE_CXXFLAGS_RELEASE += -g1 -+#} -+ - INCLUDEPATH += \ - $$SOURCE_DIR \ - $$SOURCE_DIR/Platform \ -diff -up qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri ---- qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri.debuginfo 2013-01-29 13:03:54.000000000 -0600 -+++ qtwebkit-opensource-src-5.0.1/Source/WebKit/WebKit1.pri 2013-02-23 13:54:22.579460033 -0600 -@@ -7,6 +7,12 @@ - - SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebKit - -+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { -+# message("WebKit workaround for QtWebkit: do not build with -g, but with -g1") -+# QMAKE_CXXFLAGS_RELEASE -= -g -+# QMAKE_CXXFLAGS_RELEASE += -g1 -+#} -+ - INCLUDEPATH += \ - $$SOURCE_DIR/qt/Api \ - $$SOURCE_DIR/qt/WebCoreSupport \ -diff -up qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri ---- qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri.debuginfo 2013-01-29 13:03:38.000000000 -0600 -+++ qtwebkit-opensource-src-5.0.1/Source/WTF/WTF.pri 2013-02-23 13:56:23.584947256 -0600 -@@ -8,6 +8,12 @@ - # All external modules should include WTF headers by prefixing with "wtf" (#include ). - INCLUDEPATH += $$PWD - -+#equals(QT_ARCH, s390)|equals(QT_ARCH, arm)|equals(QT_ARCH, mips)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64) { -+# message("WTF workaround for QtWebkit: do not build with -g, but with -g1") -+# QMAKE_CXXFLAGS_RELEASE -= -g -+# QMAKE_CXXFLAGS_RELEASE += -g1 -+#} -+ - mac { - # Mac OS does ship libicu but not the associated header files. - # Therefore WebKit provides adequate header files. diff --git a/qtwebkit-opensource-src-5.2.0-pluginpath.patch b/qtwebkit-opensource-src-5.2.0-pluginpath.patch deleted file mode 100644 index 26f4f3e..0000000 --- a/qtwebkit-opensource-src-5.2.0-pluginpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 ---- qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp.pluginpath 2013-11-26 19:01:47.000000000 -0600 -+++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/plugins/PluginDatabase.cpp 2013-12-02 11:14:43.306114402 -0600 -@@ -407,6 +407,7 @@ Vector PluginDatabase::defaultPl - paths.append("/usr/lib/firefox/plugins"); - paths.append("/usr/lib64/browser-plugins"); - paths.append("/usr/lib/browser-plugins"); -+ paths.append("/usr/lib/mozilla/plugins-wrapped"); - paths.append("/usr/lib/mozilla/plugins"); - paths.append("/usr/local/netscape/plugins"); - paths.append("/opt/mozilla/plugins"); -@@ -416,6 +417,7 @@ Vector PluginDatabase::defaultPl - paths.append("/usr/lib/netscape/plugins"); - paths.append("/usr/lib/netscape/plugins-libc5"); - paths.append("/usr/lib/netscape/plugins-libc6"); -+ paths.append("/usr/lib64/mozilla/plugins-wrapped"); - paths.append("/usr/lib64/netscape/plugins"); - paths.append("/usr/lib64/mozilla/plugins"); - paths.append("/usr/lib/nsbrowser/plugins"); diff --git a/qtwebkit-opensource-src-5.2.0-save_memory.patch b/qtwebkit-opensource-src-5.2.0-save_memory.patch deleted file mode 100644 index 24e1060..0000000 --- a/qtwebkit-opensource-src-5.2.0-save_memory.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-rc1/Source/WebCore/WebCore.pri.save_memory 2013-12-02 11:15:56.417351604 -0600 -+++ qtwebkit-opensource-src-5.2.0-rc1/Source/WebCore/WebCore.pri 2013-12-02 11:15:56.421351563 -0600 -@@ -306,6 +306,8 @@ mac { - } - unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections - unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections -+unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--no-keep-memory -+#unix:!mac:*-g++*:!equals(QT_ARCH, powerpc):!equals(QT_ARCH, s390):!equals(QT_ARCH, mips):!equals(QT_ARCH, arm):QMAKE_LFLAGS += -Wl,--reduce-memory-overheads - linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - - enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 diff --git a/qtwebkit-opensource-src-5.2.1-no_rpath.patch b/qtwebkit-opensource-src-5.2.1-no_rpath.patch deleted file mode 100644 index 0871fa7..0000000 --- a/qtwebkit-opensource-src-5.2.1-no_rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf ---- qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf.no_rpath 2014-02-01 14:37:41.000000000 -0600 -+++ qtwebkit-opensource-src-5.2.1/Tools/qmake/mkspecs/features/rpath.prf 2014-05-02 18:47:26.789051711 -0500 -@@ -6,7 +6,7 @@ - - equals(ROOT_BUILD_DIR, $$dirname(DESTDIR)): RPATHDIR_RELATIVE_TO_DESTDIR = ../lib - --linux-*:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) { -+linux-rpath_me_harder_no_no_no:!isEmpty(RPATHDIR_RELATIVE_TO_DESTDIR) { - # Do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var. - QMAKE_RPATHDIR = \$\$ORIGIN/$${RPATHDIR_RELATIVE_TO_DESTDIR} $${QMAKE_RPATHDIR} diff --git a/sources b/sources index 720974c..6784315 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-opensource-src-5.9.0.tar.xz) = 3a889cda4604db66ce95957ca415d68591d8e8cf1f87e4fced2c180e0ff8ed1298260b6048b79cb8f72ad2e1b47be2d58b361cd9d31256f6deee7c1600d046ea +SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758 From e41bae635ff54e7a5aaab7829f14c51f78764d3e Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Wed, 21 Jun 2017 21:52:30 +0200 Subject: [PATCH 115/208] ensure that we do a release build --- qt5-qtwebkit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3739c10..0a063e6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.2.%{?prerel}%{?dist} +Release: 0.3.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -120,6 +120,7 @@ BuildArch: noarch %endif %{cmake} -DPORT=Qt \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TOOLS=OFF \ -DINCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \ -DLIBEXEC_INSTALL_DIR:PATH=%{_qt5_libexecdir} \ @@ -197,6 +198,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Wed Jun 21 2017 Christian Dersch - 5.212.0-0.3.alpha2 +- ensure that we do a release build + * Wed Jun 21 2017 Christian Dersch - 5.212.0-0.2.alpha2 - few spec adjustments From 261772cd424aecb635f9f02109ac1d250c13441d Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Thu, 22 Jun 2017 10:12:39 +0200 Subject: [PATCH 116/208] BR: pkg-config --- qt5-qtwebkit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0a063e6..2606af3 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.3.%{?prerel}%{?dist} +Release: 0.4.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -40,6 +40,7 @@ BuildRequires: libXrender-devel BuildRequires: libxslt-devel BuildRequires: mesa-libGL-devel BuildRequires: perl-generators +BuildRequires: pkg-config BuildRequires: python2 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel @@ -198,6 +199,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Thu Jun 22 2017 Christian Dersch - 5.212.0-0.4.alpha2 +- BR: pkg-config + * Wed Jun 21 2017 Christian Dersch - 5.212.0-0.3.alpha2 - ensure that we do a release build From c66bc115d9cc594e802cfa04643085d4ce7c8ed4 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Thu, 22 Jun 2017 11:30:44 +0200 Subject: [PATCH 117/208] pkgconfig fixes --- qt5-qtwebkit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2606af3..f921123 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -40,7 +40,7 @@ BuildRequires: libXrender-devel BuildRequires: libxslt-devel BuildRequires: mesa-libGL-devel BuildRequires: perl-generators -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python2 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel @@ -60,6 +60,10 @@ BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-private-devel %{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} +# Why does this not work automatically? +Provides: pkgconfig(Qt5WebKit) = %{version}-%{release} +Provides: pkgconfig(Qt5WebKitWidgets) = %{version}-%{release} + # filter qml provides %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ From c73bd4a5878780beed7d38ccafd34a3c27b819dc Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Thu, 22 Jun 2017 12:54:34 +0200 Subject: [PATCH 118/208] small fix --- qt5-qtwebkit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f921123..d8a9f40 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -60,9 +60,6 @@ BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtdeclarative-private-devel %{?_qt5:Requires: qt5-qtdeclarative%{?_isa} = %{_qt5_version}} -# Why does this not work automatically? -Provides: pkgconfig(Qt5WebKit) = %{version}-%{release} -Provides: pkgconfig(Qt5WebKitWidgets) = %{version}-%{release} # filter qml provides %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$ @@ -82,6 +79,9 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel%{?_isa} Requires: qt5-qtdeclarative-devel%{?_isa} +# Why does this not work automatically? +Provides: pkgconfig(Qt5WebKit) = %{version}-%{release} +Provides: pkgconfig(Qt5WebKitWidgets) = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for From f09cab8b8e724308d0848c909e34019bd9c975d1 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mon, 10 Jul 2017 18:21:21 +0200 Subject: [PATCH 119/208] replaced ugly pkgconfig hack by proper fix, some spec fixes --- qt5-qtwebkit.spec | 76 ++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d8a9f40..9d3ac1b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.4.%{?prerel}%{?dist} +Release: 0.5.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -25,35 +25,37 @@ Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/% BuildRequires: bison BuildRequires: cmake BuildRequires: flex -BuildRequires: fontconfig-devel -BuildRequires: glib2-devel +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: gperf -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: hyphen-devel -BuildRequires: libicu-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libwebp-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXrender-devel -BuildRequires: libxslt-devel -BuildRequires: mesa-libGL-devel +BuildRequires: pkgconfig(icu-i18n) pkgconfig(icu-uc) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libwebp) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(gl) BuildRequires: perl-generators -BuildRequires: pkgconfig BuildRequires: python2 BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtdeclarative-devel +BuildRequires: pkgconfig(Qt5Quick) %if ! 0%{?bootstrap} -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtsensors-devel -BuildRequires: qt5-qtwebchannel-devel +BuildRequires: pkgconfig(Qt5Location) +BuildRequires: pkgconfig(Qt5Sensors) +BuildRequires: pkgconfig(Qt5WebChannel) %endif -BuildRequires: ruby-devel +BuildRequires: pkgconfig(ruby) BuildRequires: rubygems +%if 0%{?fedora} BuildRequires: rubypick -BuildRequires: sqlite-devel -BuildRequires: zlib-devel +%endif +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(zlib) BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -79,9 +81,6 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt5-qtbase-devel%{?_isa} Requires: qt5-qtdeclarative-devel%{?_isa} -# Why does this not work automatically? -Provides: pkgconfig(Qt5WebKit) = %{version}-%{release} -Provides: pkgconfig(Qt5WebKitWidgets) = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -124,13 +123,17 @@ BuildArch: noarch %global optflags %{optflags} -Wl,-relax %endif -%{cmake} -DPORT=Qt \ +CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; +CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; +%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} +# We cannot use default cmake macro here as it overwrites some settings queried +# by qtwebkit cmake from qmake +cmake -DPORT=Qt \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TOOLS=OFF \ - -DINCLUDE_INSTALL_DIR:PATH=%{_qt5_headerdir} \ - -DLIBEXEC_INSTALL_DIR:PATH=%{_qt5_libexecdir} \ - -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/mkspecs/modules \ - -DQML_INSTALL_DIR:PATH=%{_qt5_qmldir} \ + -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ %ifarch s390 s390x ppc %{power64} -DENABLE_JIT=OFF \ %endif @@ -138,7 +141,7 @@ BuildArch: noarch -DUSE_SYSTEM_MALLOC=ON \ %endif %if 0%{?docs} - -DGENERATE_DOCUMENTATION=ON \ + -DGENERATE_DOCUMENTATION=ON \ %endif . @@ -154,6 +157,15 @@ BuildArch: noarch find %{buildroot} -name '*.la' -exec rm -f {} ';' +# fix pkgconfig files +sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +sed -i "s,Cflags: -I/usr/lib/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_includedir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +sed -i "s,Libs: -L/usr/lib/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc + +sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +sed -i "s,Cflags: -I/usr/lib/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_includedir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +sed -i "s,Libs: -L/usr/lib/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc + # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB %add_to_license_files Source/JavaScriptCore/icu/LICENSE @@ -203,6 +215,10 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Mon Jul 10 2017 Christian Dersch - 5.212.0-0.5.alpha2 +- replaced ugly pkgconfig provides workaround with proper pkgconfig fixes +- general spec fixes + * Thu Jun 22 2017 Christian Dersch - 5.212.0-0.4.alpha2 - BR: pkg-config From 7f3d918c60a4851454e66b617f434e696ecee885 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mon, 10 Jul 2017 19:52:36 +0200 Subject: [PATCH 120/208] fix pkgconfig fix... --- qt5-qtwebkit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9d3ac1b..3aa7f1a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -159,12 +159,12 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' # fix pkgconfig files sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc -sed -i "s,Cflags: -I/usr/lib/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_includedir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc -sed -i "s,Libs: -L/usr/lib/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_includedir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc -sed -i "s,Cflags: -I/usr/lib/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_includedir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc -sed -i "s,Libs: -L/usr/lib/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_includedir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB From 3eb839a24e26d3f634c923fa324bfd587a15df7f Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mon, 10 Jul 2017 23:52:44 +0200 Subject: [PATCH 121/208] fix header path --- qt5-qtwebkit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 3aa7f1a..f188b7d 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -159,11 +159,11 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' # fix pkgconfig files sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc -sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_includedir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc -sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_includedir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc # Finally, copy over and rename various files for %%license inclusion From 920cc936f9e84bbe63b12e49d4c916ec847aa82f Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Mon, 10 Jul 2017 23:55:07 +0200 Subject: [PATCH 122/208] epel does not know pkgconfig(libjpeg), use libjpeg-devel for BR --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f188b7d..ffaba4b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -33,7 +33,7 @@ BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: hyphen-devel BuildRequires: pkgconfig(icu-i18n) pkgconfig(icu-uc) -BuildRequires: pkgconfig(libjpeg) +BuildRequires: libjpeg-devel BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(xcomposite) From cb036420738b31b33edc54bd8ea53862ed0987a2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 19 Jul 2017 13:20:38 -0500 Subject: [PATCH 123/208] rebuild (qt-5.9.1) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ffaba4b..00a96d9 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.5.%{?prerel}%{?dist} +Release: 0.6.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -215,6 +215,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Wed Jul 19 2017 Rex Dieter - 5.212.0-0.6.alpha2 +- rebuild (qt-5.9.1) + * Mon Jul 10 2017 Christian Dersch - 5.212.0-0.5.alpha2 - replaced ugly pkgconfig provides workaround with proper pkgconfig fixes - general spec fixes From 8d56ec4a373db1e64843aa251ec6b8450723f23b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 20 Jul 2017 10:32:44 -0500 Subject: [PATCH 124/208] rebuild against newer gcc/ppc64le (#1470692) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 00a96d9..2e7433c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.6.%{?prerel}%{?dist} +Release: 0.7.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -215,6 +215,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Thu Jul 20 2017 Rex Dieter - 5.212.0-0.7.alpha2 +- rebuild against newer gcc/ppc64le (#1470692) + * Wed Jul 19 2017 Rex Dieter - 5.212.0-0.6.alpha2 - rebuild (qt-5.9.1) From ec69ace7a355edd263298fea23c1bf21cc4f5ad9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 12:46:26 +0000 Subject: [PATCH 125/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_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 2e7433c..ba8fb54 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.7.%{?prerel}%{?dist} +Release: 0.8.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -215,6 +215,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 5.212.0-0.8.alpha2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 20 2017 Rex Dieter - 5.212.0-0.7.alpha2 - rebuild against newer gcc/ppc64le (#1470692) From 7c82956cc95a4472e6b01a3965d03828b75f805f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:22:30 +0000 Subject: [PATCH 126/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ba8fb54..eafda20 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.8.%{?prerel}%{?dist} +Release: 0.9.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -215,6 +215,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 5.212.0-0.9.alpha2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 5.212.0-0.8.alpha2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From cb912d33cc5ba0320a30bf0a72f89dcc842eee69 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 9 Oct 2017 13:56:37 -0500 Subject: [PATCH 127/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index eafda20..520983c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.9.%{?prerel}%{?dist} +Release: 0.10.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -215,6 +215,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Mon Oct 09 2017 Rex Dieter - 5.212.0-0.10.alpha2 +- rebuild (qt5) + * Thu Aug 03 2017 Fedora Release Engineering - 5.212.0-0.9.alpha2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 778313d6107e930a1a83011772aa65561cb247ef Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 24 Oct 2017 12:38:22 +0200 Subject: [PATCH 128/208] Added patch to fix issue with pagewidth (#1502332) --- qt5-qtwebkit-fix-pagewidth.patch | 12 ++++++++++++ qt5-qtwebkit.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 qt5-qtwebkit-fix-pagewidth.patch diff --git a/qt5-qtwebkit-fix-pagewidth.patch b/qt5-qtwebkit-fix-pagewidth.patch new file mode 100644 index 0000000..0837b91 --- /dev/null +++ b/qt5-qtwebkit-fix-pagewidth.patch @@ -0,0 +1,12 @@ +diff -Naur qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp +--- qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:25:58.941518553 +0200 ++++ qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:27:44.223917497 +0200 +@@ -961,6 +961,8 @@ + FrameView* view = frame->view(); + ASSERT(view); + view->resize(size); ++ if (view->needsLayout()) ++ view->layout(); + view->adjustViewSize(); + } + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 520983c..010570c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,13 +15,19 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.10.%{?prerel}%{?dist} +Release: 0.11.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD URL: https://github.com/annulen/webkit Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz +# Upstream patch to fix pagewidth issue with trojita +# https://github.com/annulen/webkit/issues/511 +# https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab +# https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55 +Patch0: qt5-qtwebkit-fix-pagewidth.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -215,6 +221,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Mon Oct 23 2017 Christian Dersch - 5.212.0-0.11.alpha2 +- Added patch to fix issue with pagewidth (#1502332) + * Mon Oct 09 2017 Rex Dieter - 5.212.0-0.10.alpha2 - rebuild (qt5) From d27dbfe73a00d093c06baa62c13909ec7482b3f2 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 24 Oct 2017 21:58:51 +0200 Subject: [PATCH 129/208] renamed patch qt5-qtwebkit-fix-pagewidth.patch to include version --- ...dth.patch => qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch | 0 qt5-qtwebkit.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename qt5-qtwebkit-fix-pagewidth.patch => qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch (100%) diff --git a/qt5-qtwebkit-fix-pagewidth.patch b/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch similarity index 100% rename from qt5-qtwebkit-fix-pagewidth.patch rename to qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 010570c..8089d42 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -26,7 +26,7 @@ Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/% # https://github.com/annulen/webkit/issues/511 # https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab # https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55 -Patch0: qt5-qtwebkit-fix-pagewidth.patch +Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch BuildRequires: bison BuildRequires: cmake From a5ddfef237731e28bf255b0e375726e61a673b43 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 24 Oct 2017 23:43:18 +0200 Subject: [PATCH 130/208] Added patch to fix null pointer dereference (#1470778) --- qt5-qtwebkit.spec | 8 +++++++- ...12.0-alpha2-fix-null-pointer-dereference.patch | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8089d42..e932844 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.11.%{?prerel}%{?dist} +Release: 0.12.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -28,6 +28,9 @@ Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/% # https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55 Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch +# Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573 +Patch1: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -221,6 +224,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Tue Oct 24 2017 Christian Dersch - 5.212.0-0.12.alpha2 +- Added patch to fix null pointer dereference (#1470778) + * Mon Oct 23 2017 Christian Dersch - 5.212.0-0.11.alpha2 - Added patch to fix issue with pagewidth (#1502332) diff --git a/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch new file mode 100644 index 0000000..4cf7ae4 --- /dev/null +++ b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch @@ -0,0 +1,15 @@ +diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +--- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-06-09 16:11:36.000000000 +0200 ++++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-10-24 21:44:40.504943501 +0200 +@@ -390,7 +390,10 @@ + + QString QWebPageAdapter::selectedHtml() const + { +- return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML(); ++ RefPtr range = page->focusController().focusedOrMainFrame().editor().selectedRange(); ++ if (!range) ++ return QString(); ++ return range->toHTML(); + } + + bool QWebPageAdapter::isContentEditable() const From 866463e9eee262e163288901dd3f55ec372327c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 26 Oct 2017 11:19:06 +0200 Subject: [PATCH 131/208] Drop explicit dependency on rubypick. Better then depend on rubypick would be dependency on %{_bindir}/ruby. But rubypick is pulled in via transitive dependencies anyway, so drop the dependnecy altogether. --- qt5-qtwebkit.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e932844..a6944c3 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.12.%{?prerel}%{?dist} +Release: 0.13.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -60,9 +60,6 @@ BuildRequires: pkgconfig(Qt5WebChannel) %endif BuildRequires: pkgconfig(ruby) BuildRequires: rubygems -%if 0%{?fedora} -BuildRequires: rubypick -%endif BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) @@ -224,6 +221,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Thu Oct 26 2017 Vít Ondruch - 5.212.0-0.13.alpha2 +- Drop explicit dependency on rubypick. + * Tue Oct 24 2017 Christian Dersch - 5.212.0-0.12.alpha2 - Added patch to fix null pointer dereference (#1470778) From 1c99e8c497705f403addc9028234255b4348bfce Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 26 Nov 2017 08:10:17 -0600 Subject: [PATCH 132/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a6944c3..11a5787 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.13.%{?prerel}%{?dist} +Release: 0.14.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -221,6 +221,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Sun Nov 26 2017 Rex Dieter - 5.212.0-0.14.alpha2 +- rebuild (qt5) + * Thu Oct 26 2017 Vít Ondruch - 5.212.0-0.13.alpha2 - Drop explicit dependency on rubypick. From 320889cc2a0f5866bfb6fc80c68824ccd3ad5db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 26 Nov 2017 17:14:36 +0100 Subject: [PATCH 133/208] Add patch2 to fix CMake warnings Add patch3 to fix build (missing src file caused by typo) Add missing BuildRequires --- qt5-qtwebkit.spec | 15 +++++++++- qtwebkit-5.212.0_cmake_cmp0071.patch | 32 ++++++++++++++++++++++ qtwebkit-5.212.0_fix_missing_sources.patch | 20 ++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 qtwebkit-5.212.0_cmake_cmp0071.patch create mode 100644 qtwebkit-5.212.0_fix_missing_sources.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 11a5787..cc7df41 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.14.%{?prerel}%{?dist} +Release: 0.15.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -31,6 +31,12 @@ Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch # Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573 Patch1: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch +# Patch for new CMake policy CMP0071 to explicitly use old behaviour. +Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch + +# Patch to fix for missing source file. +Patch3: qtwebkit-5.212.0_fix_missing_sources.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -49,6 +55,8 @@ BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(gstreamer-gl-1.0) +BuildRequires: pkgconfig(gstreamer-mpegts-1.0) BuildRequires: perl-generators BuildRequires: python2 BuildRequires: qt5-qtbase-devel @@ -221,6 +229,11 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Sun Nov 26 2017 Björn Esser - 5.212.0-0.15.alpha2 +- Add patch2 to fix CMake warnings +- Add patch3 to fix build (missing src file caused by typo) +- Add missing BuildRequires + * Sun Nov 26 2017 Rex Dieter - 5.212.0-0.14.alpha2 - rebuild (qt5) diff --git a/qtwebkit-5.212.0_cmake_cmp0071.patch b/qtwebkit-5.212.0_cmake_cmp0071.patch new file mode 100644 index 0000000..b42af57 --- /dev/null +++ b/qtwebkit-5.212.0_cmake_cmp0071.patch @@ -0,0 +1,32 @@ +Index: qtwebkit-5.212.0-alpha2/CMakeLists.txt +=================================================================== +--- qtwebkit-5.212.0-alpha2.orig/CMakeLists.txt ++++ qtwebkit-5.212.0-alpha2/CMakeLists.txt +@@ -6,6 +6,11 @@ if (POLICY CMP0058) + cmake_policy(SET CMP0058 NEW) + endif () + ++# Explicitly process generated files with AUTOMOC. ++if (POLICY CMP0071) ++ cmake_policy(SET CMP0071 NEW) ++endif () ++ + set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake") + + if (NOT DEFINED ENABLE_WEBKIT) +Index: qtwebkit-5.212.0-alpha2/Source/WebKit/CMakeLists.txt +=================================================================== +--- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/CMakeLists.txt ++++ qtwebkit-5.212.0-alpha2/Source/WebKit/CMakeLists.txt +@@ -1,6 +1,11 @@ + cmake_minimum_required(VERSION 2.8.12) + include(WebKitCommon) + ++# Explicitly process generated files with AUTOMOC. ++if (POLICY CMP0071) ++ cmake_policy(SET CMP0071 NEW) ++endif () ++ + set(WebKit_SOURCES + Storage/StorageAreaImpl.cpp + Storage/StorageAreaSync.cpp diff --git a/qtwebkit-5.212.0_fix_missing_sources.patch b/qtwebkit-5.212.0_fix_missing_sources.patch new file mode 100644 index 0000000..ca372a2 --- /dev/null +++ b/qtwebkit-5.212.0_fix_missing_sources.patch @@ -0,0 +1,20 @@ +Index: qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake +=================================================================== +--- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/PlatformQt.cmake ++++ qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake +@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG) + set_source_files_properties( + qt/Api/qwebdatabase.cpp + qt/Api/qwebelement.cpp ++ qt/Api/qwebfullscreenrequest.cpp + qt/Api/qwebhistory.cpp + qt/Api/qwebhistoryinterface.cpp + qt/Api/qwebpluginfactory.cpp +@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG) + + qt/WidgetApi/qgraphicswebview.cpp + qt/WidgetApi/qwebframe.cpp +- qt/WidgetApi/qwebfullscreenrequest.cpp + qt/WidgetApi/qwebinspector.cpp + qt/WidgetApi/qwebpage.cpp + qt/WidgetApi/qwebview.cpp From d4e6e5b074bdc55687103530a5d8de4ca41197a7 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 30 Nov 2017 20:46:11 +0000 Subject: [PATCH 134/208] Rebuild for ICU 60.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index cc7df41..298c225 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.15.%{?prerel}%{?dist} +Release: 0.16.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -229,6 +229,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Thu Nov 30 2017 Pete Walter - 5.212.0-0.16.alpha2 +- Rebuild for ICU 60.1 + * Sun Nov 26 2017 Björn Esser - 5.212.0-0.15.alpha2 - Add patch2 to fix CMake warnings - Add patch3 to fix build (missing src file caused by typo) From 06f9f2fe776a2d7efd6481d616fc767c24d94dde Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 20 Dec 2017 12:58:51 +0100 Subject: [PATCH 135/208] rebuild (qt5) --- qt5-qtwebkit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 298c225..1fd8069 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.16.%{?prerel}%{?dist} +Release: 0.17.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -48,7 +48,7 @@ BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: hyphen-devel BuildRequires: pkgconfig(icu-i18n) pkgconfig(icu-uc) -BuildRequires: libjpeg-devel +BuildRequires: libjpeg-devel BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(xcomposite) @@ -229,6 +229,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Wed Dec 20 2017 Jan Grulich - 5.212.0-0.17.alpha2 +- rebuild (qt5) + * Thu Nov 30 2017 Pete Walter - 5.212.0-0.16.alpha2 - Rebuild for ICU 60.1 From f5bb3fcc3db5979cdc1b65baf0d225b7c3517436 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 12:27:52 +0000 Subject: [PATCH 136/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1fd8069..4b86390 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.17.%{?prerel}%{?dist} +Release: 0.18.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -229,6 +229,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 5.212.0-0.18.alpha2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Dec 20 2017 Jan Grulich - 5.212.0-0.17.alpha2 - rebuild (qt5) From c454173a002b4f375ae9f8cf244a66ce06439855 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 14 Feb 2018 09:41:07 +0100 Subject: [PATCH 137/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4b86390..2ae2f96 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.18.%{?prerel}%{?dist} +Release: 0.19.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -229,6 +229,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Wed Feb 14 2018 Jan Grulich - 5.212.0-0.19.alpha2 +- rebuild (qt5) + * Fri Feb 09 2018 Fedora Release Engineering - 5.212.0-0.18.alpha2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 6ea4b16624756cac0315627708fad5586898d961 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 23 Feb 2018 14:23:56 -0600 Subject: [PATCH 138/208] Bad ES6 Proxy object for QT platform breaks scudcloud (#1513091) --- 0031-Disable-ES6-Proxy-object.patch | 24 ++++++++++++++++++++++++ qt5-qtwebkit.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0031-Disable-ES6-Proxy-object.patch diff --git a/0031-Disable-ES6-Proxy-object.patch b/0031-Disable-ES6-Proxy-object.patch new file mode 100644 index 0000000..bd2d57e --- /dev/null +++ b/0031-Disable-ES6-Proxy-object.patch @@ -0,0 +1,24 @@ +From 5648446933f52fe479d0a9006f6393a81a790116 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 25 May 2017 00:49:22 +0300 +Subject: [PATCH 031/143] Disable ES6 Proxy object + +Change-Id: Ifd6404e254b242afa8dd563c03f9588b4b05ab93 +--- + Source/JavaScriptCore/runtime/JSGlobalObject.cpp | 3 + + 91 files changed, 17 insertions(+), 1379 deletions(-) +diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp +index 9e613a21215..7d57590b4c5 100644 +--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp ++++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp +@@ -458,7 +458,10 @@ m_ ## lowerName ## Prototype->putDirectWithoutTransition(vm, vm.propertyNames->c + putDirectWithoutTransition(vm, vm.propertyNames->TypeError, m_typeErrorConstructor.get(), DontEnum); + putDirectWithoutTransition(vm, vm.propertyNames->URIError, m_URIErrorConstructor.get(), DontEnum); + ++#if !PLATFORM(QT) ++ // Disable ES6 Proxy because our implementation is not compliant with what real world code expects + putDirectWithoutTransition(vm, vm.propertyNames->Proxy, ProxyConstructor::create(vm, ProxyConstructor::createStructure(vm, this, m_functionPrototype.get())), DontEnum); ++#endif + + + #define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \ diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2ae2f96..d566b89 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.19.%{?prerel}%{?dist} +Release: 0.20.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -37,6 +37,9 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch # Patch to fix for missing source file. Patch3: qtwebkit-5.212.0_fix_missing_sources.patch +# disable ES6 Proxy +Patch31: 0031-Disable-ES6-Proxy-object.patch + BuildRequires: bison BuildRequires: cmake BuildRequires: flex @@ -229,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Fri Feb 23 2018 Rex Dieter - 5.212.0-0.20.alpha2 +- Bad ES6 Proxy object for QT platform breaks scudcloud (#1513091) + * Wed Feb 14 2018 Jan Grulich - 5.212.0-0.19.alpha2 - rebuild (qt5) From 7bfc6f06d6231560534b52918e79b5b24bf969b9 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Mon, 30 Apr 2018 20:39:43 +0100 Subject: [PATCH 139/208] Rebuild for ICU 61.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d566b89..a1fb043 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.20.%{?prerel}%{?dist} +Release: 0.21.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Mon Apr 30 2018 Pete Walter - 5.212.0-0.21.alpha2 +- Rebuild for ICU 61.1 + * Fri Feb 23 2018 Rex Dieter - 5.212.0-0.20.alpha2 - Bad ES6 Proxy object for QT platform breaks scudcloud (#1513091) From a24b8fb7b36e89fe5bbf748dff06d52377823a20 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 27 May 2018 14:08:59 -0500 Subject: [PATCH 140/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a1fb043..126139c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.21.%{?prerel}%{?dist} +Release: 0.22.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Sun May 27 2018 Rex Dieter - 5.212.0-0.22..alpha2 +- rebuild (qt5) + * Mon Apr 30 2018 Pete Walter - 5.212.0-0.21.alpha2 - Rebuild for ICU 61.1 From b66267a4c80e45a866e20bfe18bffe6d14635513 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 28 May 2018 07:59:02 -0500 Subject: [PATCH 141/208] workaround gcc8 FTBFS with -fpermissive (#1582954) --- qt5-qtwebkit.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 126139c..0436f36 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -141,7 +141,7 @@ BuildArch: noarch %endif CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; -CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; +CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ; %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} # We cannot use default cmake macro here as it overwrites some settings queried # by qtwebkit cmake from qmake @@ -232,8 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog -* Sun May 27 2018 Rex Dieter - 5.212.0-0.22..alpha2 +* Sun May 27 2018 Rex Dieter - 5.212.0-0.22.alpha2 - rebuild (qt5) +- workaround gcc8 FTBFS with -fpermissive (#1582954) * Mon Apr 30 2018 Pete Walter - 5.212.0-0.21.alpha2 - Rebuild for ICU 61.1 From d7a8119db0bd722cad55b406804ac247fab68e1b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 20 Jun 2018 23:39:45 -0500 Subject: [PATCH 142/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0436f36..8a23a40 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.22.%{?prerel}%{?dist} +Release: 0.23.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Wed Jun 20 2018 Rex Dieter - 5.212.0-0.23.alpha2 +- rebuild (qt5) + * Sun May 27 2018 Rex Dieter - 5.212.0-0.22.alpha2 - rebuild (qt5) - workaround gcc8 FTBFS with -fpermissive (#1582954) From 79c3dd196fc4c330f44de1fac599e5e66fada073 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 10 Jul 2018 21:59:38 +0100 Subject: [PATCH 143/208] Rebuild for ICU 62 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8a23a40..47f7719 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.23.%{?prerel}%{?dist} +Release: 0.24.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Tue Jul 10 2018 Pete Walter - 5.212.0-0.24.alpha2 +- Rebuild for ICU 62 + * Wed Jun 20 2018 Rex Dieter - 5.212.0-0.23.alpha2 - rebuild (qt5) From 56d03a60143c1d2b5036122f6bb9639142cc3983 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:11:19 +0000 Subject: [PATCH 144/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 47f7719..e07e7a2 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.24.%{?prerel}%{?dist} +Release: 0.25.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 5.212.0-0.25.alpha2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 10 2018 Pete Walter - 5.212.0-0.24.alpha2 - Rebuild for ICU 62 From 94f8c4ca5404340e4fbf850ebc9c6017e2ab3c3d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 24 Jul 2018 10:54:50 -0500 Subject: [PATCH 145/208] backport some pkgconfig-related upstream fixes use %ldconfig_scriptlets --- ...e-dir-in-the-generated-pkg-config-fi.patch | 33 +++ 0016-cmake-Import-ECMEnableSanitizers.patch | 204 ++++++++++++++++++ ...neratePkgConfigFile-to-latest-versio.patch | 156 ++++++++++++++ qt5-qtwebkit.spec | 28 ++- 4 files changed, 414 insertions(+), 7 deletions(-) create mode 100644 0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch create mode 100644 0016-cmake-Import-ECMEnableSanitizers.patch create mode 100644 0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch diff --git a/0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch b/0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch new file mode 100644 index 0000000..48056e6 --- /dev/null +++ b/0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch @@ -0,0 +1,33 @@ +From fbd1de045999d1e5b5dcae7ac6c1e674ac0044fe Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev +Date: Sat, 24 Feb 2018 15:09:53 +0300 +Subject: [PATCH 12/14] [cmake] Fix include dir in the generated pkg-config + files + +--- + Source/WebKit/PlatformQt.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake +index 6fe440be800..28976b611cd 100644 +--- a/Source/WebKit/PlatformQt.cmake ++++ b/Source/WebKit/PlatformQt.cmake +@@ -503,6 +503,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) + ecm_generate_pkgconfig_file( + BASE_NAME Qt5WebKit + DESCRIPTION "Qt WebKit module" ++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" + DEPS "${WEBKIT_PKGCONGIG_DEPS}" + FILENAME_VAR WebKit_PKGCONFIG_FILENAME + ) +@@ -728,6 +729,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) + ecm_generate_pkgconfig_file( + BASE_NAME Qt5WebKitWidgets + DESCRIPTION "Qt WebKitWidgets module" ++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" + DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" + FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME + ) +-- +2.17.1 + diff --git a/0016-cmake-Import-ECMEnableSanitizers.patch b/0016-cmake-Import-ECMEnableSanitizers.patch new file mode 100644 index 0000000..da4d426 --- /dev/null +++ b/0016-cmake-Import-ECMEnableSanitizers.patch @@ -0,0 +1,204 @@ +From 4ef333ab0b60ca86e9a44cae0b77d1f752892a94 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Tue, 27 Jun 2017 16:34:00 +0300 +Subject: [PATCH 016/143] [cmake] Import ECMEnableSanitizers + +Change-Id: I1417511f0734e8d03bf8d55c5766b57388ed5504 +--- + Source/cmake/ECMEnableSanitizers.cmake | 173 +++++++++++++++++++++++++ + Source/cmake/OptionsQt.cmake | 1 + + 2 files changed, 174 insertions(+) + create mode 100644 Source/cmake/ECMEnableSanitizers.cmake + +diff --git a/Source/cmake/ECMEnableSanitizers.cmake b/Source/cmake/ECMEnableSanitizers.cmake +new file mode 100644 +index 00000000000..06cc0b66d86 +--- /dev/null ++++ b/Source/cmake/ECMEnableSanitizers.cmake +@@ -0,0 +1,173 @@ ++#.rst: ++# ECMEnableSanitizers ++# ------------------- ++# ++# Enable compiler sanitizer flags. ++# ++# The following sanitizers are supported: ++# ++# - Address Sanitizer ++# - Memory Sanitizer ++# - Thread Sanitizer ++# - Leak Sanitizer ++# - Undefined Behaviour Sanitizer ++# ++# All of them are implemented in Clang, depending on your version, and ++# there is an work in progress in GCC, where some of them are currently ++# implemented. ++# ++# This module will check your current compiler version to see if it ++# supports the sanitizers that you want to enable ++# ++# Usage ++# ===== ++# ++# Simply add:: ++# ++# include(ECMEnableSanitizers) ++# ++# to your ``CMakeLists.txt``. Note that this module is included in ++# KDECompilerSettings, so projects using that module do not need to also ++# include this one. ++# ++# The sanitizers are not enabled by default. Instead, you must set ++# ``ECM_ENABLE_SANITIZERS`` (either in your ``CMakeLists.txt`` or on the ++# command line) to a semicolon-separated list of sanitizers you wish to enable. ++# The options are: ++# ++# - address ++# - memory ++# - thread ++# - leak ++# - undefined ++# ++# The sanitizers "address", "memory" and "thread" are mutually exclusive. You ++# cannot enable two of them in the same build. ++# ++# "leak" requires the "address" sanitizer. ++# ++# .. note:: ++# ++# To reduce the overhead induced by the instrumentation of the sanitizers, it ++# is advised to enable compiler optimizations (``-O1`` or higher). ++# ++# Example ++# ======= ++# ++# This is an example of usage:: ++# ++# mkdir build ++# cd build ++# cmake -DECM_ENABLE_SANITIZERS='address;leak;undefined' .. ++# ++# .. note:: ++# ++# Most of the sanitizers will require Clang. To enable it, use:: ++# ++# -DCMAKE_CXX_COMPILER=clang++ ++# ++# Since 1.3.0. ++ ++#============================================================================= ++# Copyright 2014 Mathieu Tarral ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# 1. Redistributions of source code must retain the copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. The name of the author may not be used to endorse or promote products ++# derived from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++# MACRO check_compiler_version ++#----------------------------- ++macro (check_compiler_version gcc_required_version clang_required_version) ++ if ( ++ ( ++ CMAKE_CXX_COMPILER_ID MATCHES "GNU" ++ AND ++ CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_required_version} ++ ) ++ OR ++ ( ++ CMAKE_CXX_COMPILER_ID MATCHES "Clang" ++ AND ++ CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${clang_required_version} ++ ) ++ ) ++ # error ! ++ message(FATAL_ERROR "You ask to enable the sanitizer ${CUR_SANITIZER}, ++ but your compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION} ++ does not support it ! ++ You should use at least GCC ${gcc_required_version} or Clang ${clang_required_version} ++ (99.99 means not implemented yet)") ++ endif () ++endmacro () ++ ++# MACRO check_compiler_support ++#------------------------------ ++macro (enable_sanitizer_flags sanitize_option) ++ if (${sanitize_option} MATCHES "address") ++ check_compiler_version("4.8" "3.1") ++ set(XSAN_COMPILE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls") ++ set(XSAN_LINKER_FLAGS "asan") ++ elseif (${sanitize_option} MATCHES "thread") ++ check_compiler_version("4.8" "3.1") ++ set(XSAN_COMPILE_FLAGS "-fsanitize=thread") ++ set(XSAN_LINKER_FLAGS "tsan") ++ elseif (${sanitize_option} MATCHES "memory") ++ check_compiler_version("99.99" "3.1") ++ set(XSAN_COMPILE_FLAGS "-fsanitize=memory") ++ elseif (${sanitize_option} MATCHES "leak") ++ check_compiler_version("4.9" "3.4") ++ set(XSAN_COMPILE_FLAGS "-fsanitize=leak") ++ set(XSAN_LINKER_FLAGS "lsan") ++ elseif (${sanitize_option} MATCHES "undefined") ++ check_compiler_version("4.9" "3.1") ++ set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls") ++ else () ++ message(FATAL_ERROR "Compiler sanitizer option \"${sanitize_option}\" not supported.") ++ endif () ++endmacro () ++ ++if (ECM_ENABLE_SANITIZERS) ++ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ # for each element of the ECM_ENABLE_SANITIZERS list ++ foreach ( CUR_SANITIZER ${ECM_ENABLE_SANITIZERS} ) ++ # lowercase filter ++ string(TOLOWER ${CUR_SANITIZER} CUR_SANITIZER) ++ # check option and enable appropriate flags ++ enable_sanitizer_flags ( ${CUR_SANITIZER} ) ++ # TODO: GCC will not link pthread library if enabled ASan ++ if(CMAKE_C_COMPILER_ID MATCHES "Clang") ++ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XSAN_COMPILE_FLAGS}" ) ++ endif() ++ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${XSAN_COMPILE_FLAGS}" ) ++ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") ++ link_libraries(${XSAN_LINKER_FLAGS}) ++ endif() ++ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++ string(REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") ++ string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}") ++ endif () ++ endforeach() ++ else() ++ message(STATUS "Tried to enable sanitizers (-DECM_ENABLE_SANITIZERS=${ECM_ENABLE_SANITIZERS}), \ ++but compiler (${CMAKE_CXX_COMPILER_ID}) does not have sanitizer support") ++ endif() ++endif() +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +index 463a091c787..0835e47aa72 100644 +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -1,4 +1,5 @@ + include(FeatureSummary) ++include(ECMEnableSanitizers) + include(ECMPackageConfigHelpers) + + set(ECM_MODULE_DIR ${CMAKE_MODULE_PATH}) +-- +2.17.1 + diff --git a/0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch b/0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch new file mode 100644 index 0000000..9b5c02d --- /dev/null +++ b/0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch @@ -0,0 +1,156 @@ +From 0325d51c4a2a05fb11b93f0c99d1d08976aac47d Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Thu, 28 Dec 2017 02:22:58 +0300 +Subject: [PATCH 111/143] [ECM] Update ECMGeneratePkgConfigFile to latest + version, fill in DESCRIPTION + +Change-Id: Ib9252a02badeb2be4d8da74c9ab38195ded92afd +--- + Source/WebKit/PlatformQt.cmake | 2 + + Source/cmake/ECMGeneratePkgConfigFile.cmake | 60 ++++++++++++++++----- + 2 files changed, 50 insertions(+), 12 deletions(-) + +diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake +index cf5f3670040..909efc00dba 100644 +--- a/Source/WebKit/PlatformQt.cmake ++++ b/Source/WebKit/PlatformQt.cmake +@@ -502,6 +502,7 @@ endif () + if (NOT MACOS_BUILD_FRAMEWORKS) + ecm_generate_pkgconfig_file( + BASE_NAME Qt5WebKit ++ DESCRIPTION "Qt WebKit module" + DEPS "${WEBKIT_PKGCONGIG_DEPS}" + FILENAME_VAR WebKit_PKGCONFIG_FILENAME + ) +@@ -726,6 +727,7 @@ install( + if (NOT MACOS_BUILD_FRAMEWORKS) + ecm_generate_pkgconfig_file( + BASE_NAME Qt5WebKitWidgets ++ DESCRIPTION "Qt WebKitWidgets module" + DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" + FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME + ) +diff --git a/Source/cmake/ECMGeneratePkgConfigFile.cmake b/Source/cmake/ECMGeneratePkgConfigFile.cmake +index b4e68663038..09d7e2b476d 100644 +--- a/Source/cmake/ECMGeneratePkgConfigFile.cmake ++++ b/Source/cmake/ECMGeneratePkgConfigFile.cmake +@@ -16,6 +16,7 @@ + # [INCLUDE_INSTALL_DIR ] + # [LIB_INSTALL_DIR ] + # [DEFINES -D...] ++# [DESCRIPTION ] + # [INSTALL]) + # + # ``BASE_NAME`` is the name of the module. It's the name projects will use to +@@ -42,6 +43,10 @@ + # ``DEFINES`` is a list of preprocessor defines that it is recommended users of + # the library pass to the compiler when using it. + # ++# ``DESCRIPTION`` describes what this library is. If it's not specified, CMake ++# will first try to get the description from the metainfo.yaml file or will ++# create one based on ``LIB_NAME``. ++# + # ``INSTALL`` will cause the module to be installed to the ``pkgconfig`` + # subdirectory of ``LIB_INSTALL_DIR``, unless the ``ECM_PKGCONFIG_INSTALL_DIR`` + # cache variable is set to something different. Note that the first call to +@@ -66,24 +71,39 @@ + # ) + # + # Since 1.3.0. ++# ``DESCRIPTION`` available since 5.1.41 ++# + + #============================================================================= + # Copyright 2014 Aleix Pol Gonzalez + # Copyright 2014 David Faure + # +-# Distributed under the OSI-approved BSD License (the "License"); +-# see accompanying file COPYING-CMAKE-SCRIPTS for details. +-# +-# This software is distributed WITHOUT ANY WARRANTY; without even the +-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +-# See the License for more information. +-#============================================================================= +-# (To distribute this file outside of extra-cmake-modules, substitute the full +-# License text for the above reference.) ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# 1. Redistributions of source code must retain the copyright ++# notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. The name of the author may not be used to endorse or promote products ++# derived from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + function(ECM_GENERATE_PKGCONFIG_FILE) + set(options INSTALL) +- set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR) ++ set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DESCRIPTION) + set(multiValueArgs DEPS DEFINES) + + cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) +@@ -119,6 +139,17 @@ function(ECM_GENERATE_PKGCONFIG_FILE) + set(EGPF_LIB_INSTALL_DIR "lib") + endif() + endif() ++ if(NOT EGPF_DESCRIPTION) ++ if(EXISTS ${CMAKE_SOURCE_DIR}/metainfo.yaml) ++ file(STRINGS "${CMAKE_SOURCE_DIR}/metainfo.yaml" _EGPF_METAINFO_DESCRIPTION_STRING REGEX "^description:.*$") ++ if(_EGPF_METAINFO_DESCRIPTION_STRING) ++ string(REGEX REPLACE "^description:[ ]*(.*)" "\\1" EGPF_DESCRIPTION ${_EGPF_METAINFO_DESCRIPTION_STRING}) ++ endif() ++ endif() ++ if("${EGPF_DESCRIPTION}" STREQUAL "") ++ set(EGPF_DESCRIPTION "${EGPF_LIB_NAME} library.") ++ endif() ++ endif() + + set(PKGCONFIG_TARGET_BASENAME ${EGPF_BASE_NAME}) + set(PKGCONFIG_TARGET_LIBNAME ${EGPF_LIB_NAME}) +@@ -135,6 +166,7 @@ function(ECM_GENERATE_PKGCONFIG_FILE) + else() + set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}") + endif() ++ set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}") + set(PKGCONFIG_TARGET_DEFINES "") + if(EGPF_DEFINES) + set(PKGCONFIG_TARGET_DEFINES "${EGPF_DEFINE}") +@@ -148,6 +180,7 @@ function(ECM_GENERATE_PKGCONFIG_FILE) + file(WRITE ${PKGCONFIG_FILENAME} + " + Name: ${PKGCONFIG_TARGET_LIBNAME} ++Description: ${PKGCONFIG_TARGET_DESCRIPTION} + Version: ${PROJECT_VERSION} + Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} + Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES} +@@ -156,8 +189,11 @@ Requires: ${PKGCONFIG_TARGET_DEPS} + ) + + if(EGPF_INSTALL) +- set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") ++ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") ++ set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") ++ else() ++ set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") ++ endif() + install(FILES ${PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR}) + endif() + endfunction() +- +-- +2.17.1 + diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e07e7a2..1dfb030 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -15,7 +15,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.25.%{?prerel}%{?dist} +Release: 0.26.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -37,8 +37,14 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch # Patch to fix for missing source file. Patch3: qtwebkit-5.212.0_fix_missing_sources.patch +## upstream patches (qtwebkit-5.212 branch) +Patch16: 0016-cmake-Import-ECMEnableSanitizers.patch # disable ES6 Proxy Patch31: 0031-Disable-ES6-Proxy-object.patch +Patch111: 0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch + +## upstream patches (qtwebkit-stable branch) +Patch212: 0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch BuildRequires: bison BuildRequires: cmake @@ -175,12 +181,13 @@ cmake -DPORT=Qt \ find %{buildroot} -name '*.la' -exec rm -f {} ';' # fix pkgconfig files -sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc -sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +#sed -i '/Name/a Description: Qt5 WebKit module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +#sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKit,Cflags: -I%{_qt5_headerdir}/QtWebKit,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc +# strictly speaking, this isn't *wrong*, but can made more readable, so let's do that sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKit,Libs: -L%{_qt5_libdir} -lQt5WebKit ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKit.pc -sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc -sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +#sed -i '/Name/a Description: Qt5 WebKitWidgets module' %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc +#sed -i "s,Cflags: -I%{_qt5_libdir}/qt5/../../include/qt5/Qt5WebKitWidgets,Cflags: -I%{_qt5_headerdir}/QtWebKitWidgets,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdir} -lQt5WebKitWidgets ,g" %{buildroot}%{_libdir}/pkgconfig/Qt5WebKitWidgets.pc # Finally, copy over and rename various files for %%license inclusion @@ -200,10 +207,13 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %add_to_license_files Source/WTF/wtf/dtoa/LICENSE -%post -p /sbin/ldconfig +%check +# verify Qt5WebKit cflags non-use of -I/.../Qt5WebKit +export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig +test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license LICENSE.LGPLv21 _license_files/* @@ -232,6 +242,10 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi %changelog +* Tue Jul 24 2018 Rex Dieter - 5.212.0-0.26.alpha2 +- backport some pkgconfig-related upstream fixes +- use %%ldconfig_scriptlets + * Sat Jul 14 2018 Fedora Release Engineering - 5.212.0-0.25.alpha2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1dfa492be43adb5ef76f3cf3cdf365fd62b31666 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Wed, 25 Jul 2018 23:04:36 +0200 Subject: [PATCH 146/208] Disable annobin for now, workaround for RHBZ #1608549 --- qt5-qtwebkit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1dfb030..99d90be 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,3 +1,4 @@ +%undefine _annotated_build %global qt_module qtwebkit @@ -15,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.26.%{?prerel}%{?dist} +Release: 0.27.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -242,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Jul 25 2018 Christian Dersch - 5.212.0-0.27.alpha2 +- Disable annobin for now, workaround for RHBZ #1608549 + * Tue Jul 24 2018 Rex Dieter - 5.212.0-0.26.alpha2 - backport some pkgconfig-related upstream fixes - use %%ldconfig_scriptlets From 573af481eadeae724e363c3bccf2368197f6eb98 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 Aug 2018 22:56:18 -0500 Subject: [PATCH 147/208] revert to real package names for core qt5 deps ... which allows kde-sig to use semi-automated chain-builds --- qt5-qtwebkit.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 99d90be..7cbaa94 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.27.%{?prerel}%{?dist} +Release: 0.28.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -70,11 +70,11 @@ BuildRequires: pkgconfig(gstreamer-mpegts-1.0) BuildRequires: perl-generators BuildRequires: python2 BuildRequires: qt5-qtbase-devel -BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: qt5-qtdeclarative-devel %if ! 0%{?bootstrap} -BuildRequires: pkgconfig(Qt5Location) -BuildRequires: pkgconfig(Qt5Sensors) -BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: qt5-qtlocation-devel +BuildRequires: qt5-qtsensors-devel +BuildRequires: qt5-qtwebchannel-devel %endif BuildRequires: pkgconfig(ruby) BuildRequires: rubygems @@ -243,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Aug 21 2018 Rex Dieter - 5.212.0-0.28.alpha2 +- revert to real package names for core qt5 deps + * Wed Jul 25 2018 Christian Dersch - 5.212.0-0.27.alpha2 - Disable annobin for now, workaround for RHBZ #1608549 From 260c951c5a6b72d8e82fe4347276031b052eae70 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 21 Sep 2018 11:47:36 +0200 Subject: [PATCH 148/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7cbaa94..20fd08c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.28.%{?prerel}%{?dist} +Release: 0.29.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -243,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Sep 21 2018 Jan Grulich - 5.212.0-0.29.alpha2 +- rebuild (qt5) + * Tue Aug 21 2018 Rex Dieter - 5.212.0-0.28.alpha2 - revert to real package names for core qt5 deps From b5f618bb380bbd8862046dd671362fdebba304f4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 24 Nov 2018 21:46:50 -0600 Subject: [PATCH 149/208] QtWebkit bundles malformed PNG files (#1639422) --- qt5-qtwebkit.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 20fd08c..9fcc693 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.29.%{?prerel}%{?dist} +Release: 0.30.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -80,6 +80,9 @@ BuildRequires: pkgconfig(ruby) BuildRequires: rubygems BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) +# workaround bad embedded png files, https://bugzilla.redhat.com/1639422 +BuildRequires: findutils +BuildRequires: pngcrush BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -125,6 +128,9 @@ BuildArch: noarch %prep %autosetup -p1 -n %{qt_module}-%{version}%{?prerel_tag} +# find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile" +find -name \*.png | xargs -n3 pngcrush -ow -fix + %build # The following changes of optflags ietc. are adapted from webkitgtk4 package, which @@ -243,6 +249,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sat Nov 24 2018 Rex Dieter - 5.212.0-0.30.alpha +- QtWebkit bundles malformed PNG files (#1639422) + * Fri Sep 21 2018 Jan Grulich - 5.212.0-0.29.alpha2 - rebuild (qt5) From 041784405bd9b9d0ffdd87c0bbfcfa6cd78dfccf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Dec 2018 08:30:34 -0600 Subject: [PATCH 150/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9fcc693..b147201 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.30.%{?prerel}%{?dist} +Release: 0.31.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -249,6 +249,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Dec 11 2018 Rex Dieter - 5.212.0-0.31.alpha +- rebuild (qt5) + * Sat Nov 24 2018 Rex Dieter - 5.212.0-0.30.alpha - QtWebkit bundles malformed PNG files (#1639422) From 884856c6b4cfafab0e1c78e4d793844a05eb77cb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Dec 2018 10:55:09 -0600 Subject: [PATCH 151/208] add check for FTBFS condition only happened once so far on ppc64le, but let's be sure --- qt5-qtwebkit.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b147201..93bc867 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -131,6 +131,10 @@ BuildArch: noarch # find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile" find -name \*.png | xargs -n3 pngcrush -ow -fix +# ppc64le failed once with +# make[2]: *** No rule to make target 'Source/WebCore/Resources/textAreaResizeCorner.png', needed by 'Source/WebKit/qrc_WebCore.cpp'. Stop. +test -f Source/WebCore/Resources/textAreaResizeCorner.png + %build # The following changes of optflags ietc. are adapted from webkitgtk4 package, which From abf8d52e3dd7a665c8181cd7c6cfe056c3c189ee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Dec 2018 13:27:55 -0600 Subject: [PATCH 152/208] fix pngcrush invocation --- qt5-qtwebkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 93bc867..f70eec5 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -129,7 +129,7 @@ BuildArch: noarch %autosetup -p1 -n %{qt_module}-%{version}%{?prerel_tag} # find/fix pngs with "libpng warning: iCCP: known incorrect sRGB profile" -find -name \*.png | xargs -n3 pngcrush -ow -fix +find -name \*.png | xargs -n1 pngcrush -ow -fix # ppc64le failed once with # make[2]: *** No rule to make target 'Source/WebCore/Resources/textAreaResizeCorner.png', needed by 'Source/WebKit/qrc_WebCore.cpp'. Stop. From bee554688732411f91f51640ee92ccb5448a9283 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 23 Jan 2019 22:16:30 +0000 Subject: [PATCH 153/208] Rebuild for ICU 63 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f70eec5..778f6cf 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.31.%{?prerel}%{?dist} +Release: 0.32.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -253,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Jan 23 2019 Pete Walter - 5.212.0-0.32.alpha2 +- Rebuild for ICU 63 + * Tue Dec 11 2018 Rex Dieter - 5.212.0-0.31.alpha - rebuild (qt5) From 12d06fbac8994a834f25b0b1a747253d942e3c79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 10:46:55 +0000 Subject: [PATCH 154/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 778f6cf..500261d 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.32.%{?prerel}%{?dist} +Release: 0.33.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -253,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 5.212.0-0.33.alpha2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 23 2019 Pete Walter - 5.212.0-0.32.alpha2 - Rebuild for ICU 63 From 9f54555dc8bee99411d2d62173fbf26835a033c1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Feb 2019 14:09:34 -0600 Subject: [PATCH 155/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 500261d..2fa20bd 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.33.%{?prerel}%{?dist} +Release: 0.34.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -253,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Feb 15 2019 Rex Dieter - 5.212.0-0.34.alpha2 +- rebuild (qt5) + * Sat Feb 02 2019 Fedora Release Engineering - 5.212.0-0.33.alpha2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 33f0d0327c82c21f1bea19aa79dfb01ce6f89f9b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 4 Jun 2019 11:50:39 +0200 Subject: [PATCH 156/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2fa20bd..de5b46c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.34.%{?prerel}%{?dist} +Release: 0.35.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -253,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Jun 04 2019 Jan Grulich - 5.212.0-0.35.alpha2 +- rebuild (qt5) + * Fri Feb 15 2019 Rex Dieter - 5.212.0-0.34.alpha2 - rebuild (qt5) From a234086b5e0e65423d39134a9c02a7967ab1a79d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 14 Jun 2019 15:08:39 +0200 Subject: [PATCH 157/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index de5b46c..7ff7824 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.35.%{?prerel}%{?dist} +Release: 0.36.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -253,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Jun 11 2019 Jan Grulich - 5.212.0-0.36.alpha2 +- rebuild (qt5) + * Tue Jun 04 2019 Jan Grulich - 5.212.0-0.35.alpha2 - rebuild (qt5) From a71dddbdb6bb04a39892292d77f3281bd752e579 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 2 Jul 2019 15:23:21 -0500 Subject: [PATCH 158/208] 5.212.0 alpha 3 --- .gitignore | 1 + ...e-dir-in-the-generated-pkg-config-fi.patch | 33 --- 0016-cmake-Import-ECMEnableSanitizers.patch | 204 ------------------ 0031-Disable-ES6-Proxy-object.patch | 24 --- ...neratePkgConfigFile-to-latest-versio.patch | 156 -------------- ...twebkit-5.212.0-alpha2-fix-pagewidth.patch | 12 -- qt5-qtwebkit.spec | 36 +--- ...-alpha2-fix-null-pointer-dereference.patch | 15 -- qtwebkit-5.212.0_fix_missing_sources.patch | 20 -- sources | 2 +- 10 files changed, 11 insertions(+), 492 deletions(-) delete mode 100644 0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch delete mode 100644 0016-cmake-Import-ECMEnableSanitizers.patch delete mode 100644 0031-Disable-ES6-Proxy-object.patch delete mode 100644 0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch delete mode 100644 qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch delete mode 100644 qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch delete mode 100644 qtwebkit-5.212.0_fix_missing_sources.patch diff --git a/.gitignore b/.gitignore index 365136b..715b7dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /qtwebkit-opensource-src-5.9.0.tar.xz /qtwebkit-5.212.0-alpha2.tar.xz +/qtwebkit-5.212.0-alpha3.tar.xz diff --git a/0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch b/0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch deleted file mode 100644 index 48056e6..0000000 --- a/0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fbd1de045999d1e5b5dcae7ac6c1e674ac0044fe Mon Sep 17 00:00:00 2001 -From: Dmitry Shachnev -Date: Sat, 24 Feb 2018 15:09:53 +0300 -Subject: [PATCH 12/14] [cmake] Fix include dir in the generated pkg-config - files - ---- - Source/WebKit/PlatformQt.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index 6fe440be800..28976b611cd 100644 ---- a/Source/WebKit/PlatformQt.cmake -+++ b/Source/WebKit/PlatformQt.cmake -@@ -503,6 +503,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) - ecm_generate_pkgconfig_file( - BASE_NAME Qt5WebKit - DESCRIPTION "Qt WebKit module" -+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" - DEPS "${WEBKIT_PKGCONGIG_DEPS}" - FILENAME_VAR WebKit_PKGCONFIG_FILENAME - ) -@@ -728,6 +729,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) - ecm_generate_pkgconfig_file( - BASE_NAME Qt5WebKitWidgets - DESCRIPTION "Qt WebKitWidgets module" -+ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" - DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" - FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME - ) --- -2.17.1 - diff --git a/0016-cmake-Import-ECMEnableSanitizers.patch b/0016-cmake-Import-ECMEnableSanitizers.patch deleted file mode 100644 index da4d426..0000000 --- a/0016-cmake-Import-ECMEnableSanitizers.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 4ef333ab0b60ca86e9a44cae0b77d1f752892a94 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Tue, 27 Jun 2017 16:34:00 +0300 -Subject: [PATCH 016/143] [cmake] Import ECMEnableSanitizers - -Change-Id: I1417511f0734e8d03bf8d55c5766b57388ed5504 ---- - Source/cmake/ECMEnableSanitizers.cmake | 173 +++++++++++++++++++++++++ - Source/cmake/OptionsQt.cmake | 1 + - 2 files changed, 174 insertions(+) - create mode 100644 Source/cmake/ECMEnableSanitizers.cmake - -diff --git a/Source/cmake/ECMEnableSanitizers.cmake b/Source/cmake/ECMEnableSanitizers.cmake -new file mode 100644 -index 00000000000..06cc0b66d86 ---- /dev/null -+++ b/Source/cmake/ECMEnableSanitizers.cmake -@@ -0,0 +1,173 @@ -+#.rst: -+# ECMEnableSanitizers -+# ------------------- -+# -+# Enable compiler sanitizer flags. -+# -+# The following sanitizers are supported: -+# -+# - Address Sanitizer -+# - Memory Sanitizer -+# - Thread Sanitizer -+# - Leak Sanitizer -+# - Undefined Behaviour Sanitizer -+# -+# All of them are implemented in Clang, depending on your version, and -+# there is an work in progress in GCC, where some of them are currently -+# implemented. -+# -+# This module will check your current compiler version to see if it -+# supports the sanitizers that you want to enable -+# -+# Usage -+# ===== -+# -+# Simply add:: -+# -+# include(ECMEnableSanitizers) -+# -+# to your ``CMakeLists.txt``. Note that this module is included in -+# KDECompilerSettings, so projects using that module do not need to also -+# include this one. -+# -+# The sanitizers are not enabled by default. Instead, you must set -+# ``ECM_ENABLE_SANITIZERS`` (either in your ``CMakeLists.txt`` or on the -+# command line) to a semicolon-separated list of sanitizers you wish to enable. -+# The options are: -+# -+# - address -+# - memory -+# - thread -+# - leak -+# - undefined -+# -+# The sanitizers "address", "memory" and "thread" are mutually exclusive. You -+# cannot enable two of them in the same build. -+# -+# "leak" requires the "address" sanitizer. -+# -+# .. note:: -+# -+# To reduce the overhead induced by the instrumentation of the sanitizers, it -+# is advised to enable compiler optimizations (``-O1`` or higher). -+# -+# Example -+# ======= -+# -+# This is an example of usage:: -+# -+# mkdir build -+# cd build -+# cmake -DECM_ENABLE_SANITIZERS='address;leak;undefined' .. -+# -+# .. note:: -+# -+# Most of the sanitizers will require Clang. To enable it, use:: -+# -+# -DCMAKE_CXX_COMPILER=clang++ -+# -+# Since 1.3.0. -+ -+#============================================================================= -+# Copyright 2014 Mathieu Tarral -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+# MACRO check_compiler_version -+#----------------------------- -+macro (check_compiler_version gcc_required_version clang_required_version) -+ if ( -+ ( -+ CMAKE_CXX_COMPILER_ID MATCHES "GNU" -+ AND -+ CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${gcc_required_version} -+ ) -+ OR -+ ( -+ CMAKE_CXX_COMPILER_ID MATCHES "Clang" -+ AND -+ CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${clang_required_version} -+ ) -+ ) -+ # error ! -+ message(FATAL_ERROR "You ask to enable the sanitizer ${CUR_SANITIZER}, -+ but your compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION} -+ does not support it ! -+ You should use at least GCC ${gcc_required_version} or Clang ${clang_required_version} -+ (99.99 means not implemented yet)") -+ endif () -+endmacro () -+ -+# MACRO check_compiler_support -+#------------------------------ -+macro (enable_sanitizer_flags sanitize_option) -+ if (${sanitize_option} MATCHES "address") -+ check_compiler_version("4.8" "3.1") -+ set(XSAN_COMPILE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls") -+ set(XSAN_LINKER_FLAGS "asan") -+ elseif (${sanitize_option} MATCHES "thread") -+ check_compiler_version("4.8" "3.1") -+ set(XSAN_COMPILE_FLAGS "-fsanitize=thread") -+ set(XSAN_LINKER_FLAGS "tsan") -+ elseif (${sanitize_option} MATCHES "memory") -+ check_compiler_version("99.99" "3.1") -+ set(XSAN_COMPILE_FLAGS "-fsanitize=memory") -+ elseif (${sanitize_option} MATCHES "leak") -+ check_compiler_version("4.9" "3.4") -+ set(XSAN_COMPILE_FLAGS "-fsanitize=leak") -+ set(XSAN_LINKER_FLAGS "lsan") -+ elseif (${sanitize_option} MATCHES "undefined") -+ check_compiler_version("4.9" "3.1") -+ set(XSAN_COMPILE_FLAGS "-fsanitize=undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls") -+ else () -+ message(FATAL_ERROR "Compiler sanitizer option \"${sanitize_option}\" not supported.") -+ endif () -+endmacro () -+ -+if (ECM_ENABLE_SANITIZERS) -+ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -+ # for each element of the ECM_ENABLE_SANITIZERS list -+ foreach ( CUR_SANITIZER ${ECM_ENABLE_SANITIZERS} ) -+ # lowercase filter -+ string(TOLOWER ${CUR_SANITIZER} CUR_SANITIZER) -+ # check option and enable appropriate flags -+ enable_sanitizer_flags ( ${CUR_SANITIZER} ) -+ # TODO: GCC will not link pthread library if enabled ASan -+ if(CMAKE_C_COMPILER_ID MATCHES "Clang") -+ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XSAN_COMPILE_FLAGS}" ) -+ endif() -+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${XSAN_COMPILE_FLAGS}" ) -+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") -+ link_libraries(${XSAN_LINKER_FLAGS}) -+ endif() -+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -+ string(REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") -+ string(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}") -+ endif () -+ endforeach() -+ else() -+ message(STATUS "Tried to enable sanitizers (-DECM_ENABLE_SANITIZERS=${ECM_ENABLE_SANITIZERS}), \ -+but compiler (${CMAKE_CXX_COMPILER_ID}) does not have sanitizer support") -+ endif() -+endif() -diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake -index 463a091c787..0835e47aa72 100644 ---- a/Source/cmake/OptionsQt.cmake -+++ b/Source/cmake/OptionsQt.cmake -@@ -1,4 +1,5 @@ - include(FeatureSummary) -+include(ECMEnableSanitizers) - include(ECMPackageConfigHelpers) - - set(ECM_MODULE_DIR ${CMAKE_MODULE_PATH}) --- -2.17.1 - diff --git a/0031-Disable-ES6-Proxy-object.patch b/0031-Disable-ES6-Proxy-object.patch deleted file mode 100644 index bd2d57e..0000000 --- a/0031-Disable-ES6-Proxy-object.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5648446933f52fe479d0a9006f6393a81a790116 Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Thu, 25 May 2017 00:49:22 +0300 -Subject: [PATCH 031/143] Disable ES6 Proxy object - -Change-Id: Ifd6404e254b242afa8dd563c03f9588b4b05ab93 ---- - Source/JavaScriptCore/runtime/JSGlobalObject.cpp | 3 + - 91 files changed, 17 insertions(+), 1379 deletions(-) -diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp -index 9e613a21215..7d57590b4c5 100644 ---- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp -+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp -@@ -458,7 +458,10 @@ m_ ## lowerName ## Prototype->putDirectWithoutTransition(vm, vm.propertyNames->c - putDirectWithoutTransition(vm, vm.propertyNames->TypeError, m_typeErrorConstructor.get(), DontEnum); - putDirectWithoutTransition(vm, vm.propertyNames->URIError, m_URIErrorConstructor.get(), DontEnum); - -+#if !PLATFORM(QT) -+ // Disable ES6 Proxy because our implementation is not compliant with what real world code expects - putDirectWithoutTransition(vm, vm.propertyNames->Proxy, ProxyConstructor::create(vm, ProxyConstructor::createStructure(vm, this, m_functionPrototype.get())), DontEnum); -+#endif - - - #define PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \ diff --git a/0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch b/0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch deleted file mode 100644 index 9b5c02d..0000000 --- a/0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 0325d51c4a2a05fb11b93f0c99d1d08976aac47d Mon Sep 17 00:00:00 2001 -From: Konstantin Tokarev -Date: Thu, 28 Dec 2017 02:22:58 +0300 -Subject: [PATCH 111/143] [ECM] Update ECMGeneratePkgConfigFile to latest - version, fill in DESCRIPTION - -Change-Id: Ib9252a02badeb2be4d8da74c9ab38195ded92afd ---- - Source/WebKit/PlatformQt.cmake | 2 + - Source/cmake/ECMGeneratePkgConfigFile.cmake | 60 ++++++++++++++++----- - 2 files changed, 50 insertions(+), 12 deletions(-) - -diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake -index cf5f3670040..909efc00dba 100644 ---- a/Source/WebKit/PlatformQt.cmake -+++ b/Source/WebKit/PlatformQt.cmake -@@ -502,6 +502,7 @@ endif () - if (NOT MACOS_BUILD_FRAMEWORKS) - ecm_generate_pkgconfig_file( - BASE_NAME Qt5WebKit -+ DESCRIPTION "Qt WebKit module" - DEPS "${WEBKIT_PKGCONGIG_DEPS}" - FILENAME_VAR WebKit_PKGCONFIG_FILENAME - ) -@@ -726,6 +727,7 @@ install( - if (NOT MACOS_BUILD_FRAMEWORKS) - ecm_generate_pkgconfig_file( - BASE_NAME Qt5WebKitWidgets -+ DESCRIPTION "Qt WebKitWidgets module" - DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" - FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME - ) -diff --git a/Source/cmake/ECMGeneratePkgConfigFile.cmake b/Source/cmake/ECMGeneratePkgConfigFile.cmake -index b4e68663038..09d7e2b476d 100644 ---- a/Source/cmake/ECMGeneratePkgConfigFile.cmake -+++ b/Source/cmake/ECMGeneratePkgConfigFile.cmake -@@ -16,6 +16,7 @@ - # [INCLUDE_INSTALL_DIR ] - # [LIB_INSTALL_DIR ] - # [DEFINES -D...] -+# [DESCRIPTION ] - # [INSTALL]) - # - # ``BASE_NAME`` is the name of the module. It's the name projects will use to -@@ -42,6 +43,10 @@ - # ``DEFINES`` is a list of preprocessor defines that it is recommended users of - # the library pass to the compiler when using it. - # -+# ``DESCRIPTION`` describes what this library is. If it's not specified, CMake -+# will first try to get the description from the metainfo.yaml file or will -+# create one based on ``LIB_NAME``. -+# - # ``INSTALL`` will cause the module to be installed to the ``pkgconfig`` - # subdirectory of ``LIB_INSTALL_DIR``, unless the ``ECM_PKGCONFIG_INSTALL_DIR`` - # cache variable is set to something different. Note that the first call to -@@ -66,24 +71,39 @@ - # ) - # - # Since 1.3.0. -+# ``DESCRIPTION`` available since 5.1.41 -+# - - #============================================================================= - # Copyright 2014 Aleix Pol Gonzalez - # Copyright 2014 David Faure - # --# Distributed under the OSI-approved BSD License (the "License"); --# see accompanying file COPYING-CMAKE-SCRIPTS for details. --# --# This software is distributed WITHOUT ANY WARRANTY; without even the --# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. --# See the License for more information. --#============================================================================= --# (To distribute this file outside of extra-cmake-modules, substitute the full --# License text for the above reference.) -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+# notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+# notice, this list of conditions and the following disclaimer in the -+# documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+# derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - function(ECM_GENERATE_PKGCONFIG_FILE) - set(options INSTALL) -- set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR) -+ set(oneValueArgs BASE_NAME LIB_NAME FILENAME_VAR INCLUDE_INSTALL_DIR LIB_INSTALL_DIR DESCRIPTION) - set(multiValueArgs DEPS DEFINES) - - cmake_parse_arguments(EGPF "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) -@@ -119,6 +139,17 @@ function(ECM_GENERATE_PKGCONFIG_FILE) - set(EGPF_LIB_INSTALL_DIR "lib") - endif() - endif() -+ if(NOT EGPF_DESCRIPTION) -+ if(EXISTS ${CMAKE_SOURCE_DIR}/metainfo.yaml) -+ file(STRINGS "${CMAKE_SOURCE_DIR}/metainfo.yaml" _EGPF_METAINFO_DESCRIPTION_STRING REGEX "^description:.*$") -+ if(_EGPF_METAINFO_DESCRIPTION_STRING) -+ string(REGEX REPLACE "^description:[ ]*(.*)" "\\1" EGPF_DESCRIPTION ${_EGPF_METAINFO_DESCRIPTION_STRING}) -+ endif() -+ endif() -+ if("${EGPF_DESCRIPTION}" STREQUAL "") -+ set(EGPF_DESCRIPTION "${EGPF_LIB_NAME} library.") -+ endif() -+ endif() - - set(PKGCONFIG_TARGET_BASENAME ${EGPF_BASE_NAME}) - set(PKGCONFIG_TARGET_LIBNAME ${EGPF_LIB_NAME}) -@@ -135,6 +166,7 @@ function(ECM_GENERATE_PKGCONFIG_FILE) - else() - set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}") - endif() -+ set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}") - set(PKGCONFIG_TARGET_DEFINES "") - if(EGPF_DEFINES) - set(PKGCONFIG_TARGET_DEFINES "${EGPF_DEFINE}") -@@ -148,6 +180,7 @@ function(ECM_GENERATE_PKGCONFIG_FILE) - file(WRITE ${PKGCONFIG_FILENAME} - " - Name: ${PKGCONFIG_TARGET_LIBNAME} -+Description: ${PKGCONFIG_TARGET_DESCRIPTION} - Version: ${PROJECT_VERSION} - Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} - Cflags: ${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES} -@@ -156,8 +189,11 @@ Requires: ${PKGCONFIG_TARGET_DEPS} - ) - - if(EGPF_INSTALL) -- set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") -+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") -+ else() -+ set(ECM_PKGCONFIG_INSTALL_DIR "${EGPF_LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") -+ endif() - install(FILES ${PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR}) - endif() - endfunction() -- --- -2.17.1 - diff --git a/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch b/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch deleted file mode 100644 index 0837b91..0000000 --- a/qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp ---- qtwebkit/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:25:58.941518553 +0200 -+++ qtwebkit.new/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp 2017-10-23 17:27:44.223917497 +0200 -@@ -961,6 +961,8 @@ - FrameView* view = frame->view(); - ASSERT(view); - view->resize(size); -+ if (view->needsLayout()) -+ view->layout(); - view->adjustViewSize(); - } - diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 7ff7824..4ea239a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,7 +4,7 @@ %global _hardened_build 1 -%global prerel alpha2 +%global prerel alpha3 %global prerel_tag -%{prerel} ## NOTE: Lots of files in various subdirectories have the same name (such as @@ -16,41 +16,21 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.36.%{?prerel}%{?dist} +Release: 0.37.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD -URL: https://github.com/annulen/webkit -Source0: %{url}/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz - -# Upstream patch to fix pagewidth issue with trojita -# https://github.com/annulen/webkit/issues/511 -# https://github.com/annulen/webkit/commit/6faf11215e1af27d35e921ae669aa0251a01a1ab -# https://github.com/annulen/webkit/commit/76420459a13d9440b41864c93cb4ebb404bdab55 -Patch0: qt5-qtwebkit-5.212.0-alpha2-fix-pagewidth.patch - -# Patch from Kevin Kofler to fix https://github.com/annulen/webkit/issues/573 -Patch1: qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch +URL: https://github.com/qtwebkit/qtwebkit +Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch -# Patch to fix for missing source file. -Patch3: qtwebkit-5.212.0_fix_missing_sources.patch - -## upstream patches (qtwebkit-5.212 branch) -Patch16: 0016-cmake-Import-ECMEnableSanitizers.patch -# disable ES6 Proxy -Patch31: 0031-Disable-ES6-Proxy-object.patch -Patch111: 0111-ECM-Update-ECMGeneratePkgConfigFile-to-latest-versio.patch - -## upstream patches (qtwebkit-stable branch) -Patch212: 0012-cmake-Fix-include-dir-in-the-generated-pkg-config-fi.patch - BuildRequires: bison BuildRequires: cmake BuildRequires: flex BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: gperf @@ -230,13 +210,12 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %license LICENSE.LGPLv21 _license_files/* %{_qt5_libdir}/libQt5WebKit.so.5* %{_qt5_libdir}/libQt5WebKitWidgets.so.5* -%{_qt5_libexecdir}/QtWebDatabaseProcess %{_qt5_libexecdir}/QtWebNetworkProcess %{_qt5_libexecdir}/QtWebPluginProcess %{_qt5_libexecdir}/QtWebProcess +%{_qt5_libexecdir}/QtWebStorageProcess %{_qt5_archdatadir}/qml/QtWebKit/ - %files devel %{_qt5_headerdir}/Qt*/ %{_qt5_libdir}/libQt5*.so @@ -253,6 +232,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Jul 02 2019 Rex Dieter - 5.212.0-0.37.alpha3 +- 5.212.0 alpha 3 + * Tue Jun 11 2019 Jan Grulich - 5.212.0-0.36.alpha2 - rebuild (qt5) diff --git a/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch b/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch deleted file mode 100644 index 4cf7ae4..0000000 --- a/qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp ---- qtwebkit-5.212.0-alpha2/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-06-09 16:11:36.000000000 +0200 -+++ qtwebkit-5.212.0-alpha2-fix-null-pointer-dereference/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2017-10-24 21:44:40.504943501 +0200 -@@ -390,7 +390,10 @@ - - QString QWebPageAdapter::selectedHtml() const - { -- return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML(); -+ RefPtr range = page->focusController().focusedOrMainFrame().editor().selectedRange(); -+ if (!range) -+ return QString(); -+ return range->toHTML(); - } - - bool QWebPageAdapter::isContentEditable() const diff --git a/qtwebkit-5.212.0_fix_missing_sources.patch b/qtwebkit-5.212.0_fix_missing_sources.patch deleted file mode 100644 index ca372a2..0000000 --- a/qtwebkit-5.212.0_fix_missing_sources.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake -=================================================================== ---- qtwebkit-5.212.0-alpha2.orig/Source/WebKit/PlatformQt.cmake -+++ qtwebkit-5.212.0-alpha2/Source/WebKit/PlatformQt.cmake -@@ -786,6 +786,7 @@ if (COMPILER_IS_GCC_OR_CLANG) - set_source_files_properties( - qt/Api/qwebdatabase.cpp - qt/Api/qwebelement.cpp -+ qt/Api/qwebfullscreenrequest.cpp - qt/Api/qwebhistory.cpp - qt/Api/qwebhistoryinterface.cpp - qt/Api/qwebpluginfactory.cpp -@@ -795,7 +796,6 @@ if (COMPILER_IS_GCC_OR_CLANG) - - qt/WidgetApi/qgraphicswebview.cpp - qt/WidgetApi/qwebframe.cpp -- qt/WidgetApi/qwebfullscreenrequest.cpp - qt/WidgetApi/qwebinspector.cpp - qt/WidgetApi/qwebpage.cpp - qt/WidgetApi/qwebview.cpp diff --git a/sources b/sources index 6784315..908dcb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758 +SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f From 63353305fc8e2ef1640529277375ff4af49a6c70 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 16 Jul 2019 12:17:45 -0500 Subject: [PATCH 159/208] rebuild --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 4ea239a..25ca9ea 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.37.%{?prerel}%{?dist} +Release: 0.38.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Jul 16 2019 Rex Dieter - 5.212.0-0.38.alpha3 +- rebuild + * Tue Jul 02 2019 Rex Dieter - 5.212.0-0.37.alpha3 - 5.212.0 alpha 3 From 18535d742159be5814497404af73befd0a3e8d0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 17:53:00 +0000 Subject: [PATCH 160/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 25ca9ea..58b46eb 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.38.%{?prerel}%{?dist} +Release: 0.39.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 5.212.0-0.39.alpha3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jul 16 2019 Rex Dieter - 5.212.0-0.38.alpha3 - rebuild From da8a7590694da151b9e9b0d65cc716fed4569204 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 24 Sep 2019 21:05:44 +0200 Subject: [PATCH 161/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 58b46eb..c109898 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.39.%{?prerel}%{?dist} +Release: 0.40.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Sep 24 2019 Jan Grulich - 5.212.0-0.40.alpha3 +- rebuild (qt5) + * Fri Jul 26 2019 Fedora Release Engineering - 5.212.0-0.39.alpha3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 83158077aa9b74abcbd6b1e5d6d26ad89f178b9c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 9 Dec 2019 20:26:15 +0100 Subject: [PATCH 162/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c109898..9dc09fa 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.40.%{?prerel}%{?dist} +Release: 0.41.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -232,6 +232,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Mon Dec 09 2019 Jan Grulich - 5.212.0-0.41.alpha3 +- rebuild (qt5) + * Tue Sep 24 2019 Jan Grulich - 5.212.0-0.40.alpha3 - rebuild (qt5) From 309d4a0b4d898c236c6e9e7f426d002c8924599b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 10 Dec 2019 07:38:36 +0100 Subject: [PATCH 163/208] Fix build --- qt5-qtwebkit.spec | 1 + qtwebkit-missing-semicolons.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 qtwebkit-missing-semicolons.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9dc09fa..c53e4d4 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -25,6 +25,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch +Patch3: qtwebkit-missing-semicolons.patch BuildRequires: bison BuildRequires: cmake diff --git a/qtwebkit-missing-semicolons.patch b/qtwebkit-missing-semicolons.patch new file mode 100644 index 0000000..735ff53 --- /dev/null +++ b/qtwebkit-missing-semicolons.patch @@ -0,0 +1,28 @@ +diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp +index 1bca2d0..19355f1 100644 +--- a/Source/WebCore/dom/Document.cpp ++++ b/Source/WebCore/dom/Document.cpp +@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) + unsigned i = 0; + + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNameStart(c)) + return false; + + while (i < length) { +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (!isValidNamePart(c)) + return false; + } +@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(qualifiedName, i, length, c) ++ U16_NEXT(qualifiedName, i, length, c); + if (c == ':') { + if (sawColon) { + ec = NAMESPACE_ERR; From 0d179f3863c3cb7e71da28b9bd1ec9108d4523de Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 24 Jan 2020 15:13:48 -0800 Subject: [PATCH 164/208] woff2-devel is not in RHEL8. Do not use the system version for RHEL8. --- qt5-qtwebkit.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c53e4d4..679155d 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -31,7 +31,9 @@ BuildRequires: bison BuildRequires: cmake BuildRequires: flex BuildRequires: pkgconfig(fontconfig) +%if 0%{?rhel} != 8 BuildRequires: pkgconfig(libwoff2dec) +%endif BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: gperf From 42c51517d53b9975852d068cbce7695679f31ca1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 17:00:22 +0000 Subject: [PATCH 165/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 679155d..5c459a0 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.41.%{?prerel}%{?dist} +Release: 0.42.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -235,6 +235,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 5.212.0-0.42.alpha3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 09 2019 Jan Grulich - 5.212.0-0.41.alpha3 - rebuild (qt5) From fc947f145e7cdbd124f079f3ab2031c841aaf092 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 5 Apr 2020 05:57:17 -0500 Subject: [PATCH 166/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 5c459a0..d4ae70b 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.42.%{?prerel}%{?dist} +Release: 0.43.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -235,6 +235,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sun Apr 05 2020 Rex Dieter - 5.212.0-0.43.alpha3 +- rebuild (qt5) + * Thu Jan 30 2020 Fedora Release Engineering - 5.212.0-0.42.alpha3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From b59d810cc2310ed04978c15f3caf52d43d655ce3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 5 Apr 2020 18:38:19 -0500 Subject: [PATCH 167/208] BR: perl(File::Copy) --- qt5-qtwebkit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index d4ae70b..def7eb8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -51,6 +51,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gstreamer-gl-1.0) BuildRequires: pkgconfig(gstreamer-mpegts-1.0) BuildRequires: perl-generators +BuildRequires: perl(File::Copy) BuildRequires: python2 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel From 9648047c7c3902d647094f90d358e29be1b60967 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 24 Apr 2020 11:01:16 -0500 Subject: [PATCH 168/208] 5.212.0-alpha4 use python3 (#1807535) --- .gitignore | 1 + qt5-qtwebkit.spec | 20 +++++++++++--------- qtwebkit-missing-semicolons.patch | 28 ---------------------------- sources | 2 +- 4 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 qtwebkit-missing-semicolons.patch diff --git a/.gitignore b/.gitignore index 715b7dd..e3ac2be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtwebkit-opensource-src-5.9.0.tar.xz /qtwebkit-5.212.0-alpha2.tar.xz /qtwebkit-5.212.0-alpha3.tar.xz +/qtwebkit-5.212.0-alpha4.tar.xz diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index def7eb8..fbf2187 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -4,7 +4,7 @@ %global _hardened_build 1 -%global prerel alpha3 +%global prerel alpha4 %global prerel_tag -%{prerel} ## NOTE: Lots of files in various subdirectories have the same name (such as @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.43.%{?prerel}%{?dist} +Release: 0.44.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -25,7 +25,6 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch -Patch3: qtwebkit-missing-semicolons.patch BuildRequires: bison BuildRequires: cmake @@ -52,7 +51,7 @@ BuildRequires: pkgconfig(gstreamer-gl-1.0) BuildRequires: pkgconfig(gstreamer-mpegts-1.0) BuildRequires: perl-generators BuildRequires: perl(File::Copy) -BuildRequires: python2 +BuildRequires: python3 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel %if ! 0%{?bootstrap} @@ -146,7 +145,8 @@ CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ; %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} # We cannot use default cmake macro here as it overwrites some settings queried # by qtwebkit cmake from qmake -cmake -DPORT=Qt \ +cmake . \ + -DPORT=Qt \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TOOLS=OFF \ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \ @@ -158,10 +158,8 @@ cmake -DPORT=Qt \ %ifarch s390 s390x ppc %{power64} -DUSE_SYSTEM_MALLOC=ON \ %endif -%if 0%{?docs} - -DGENERATE_DOCUMENTATION=ON \ -%endif - . + %{?docs:-DGENERATE_DOCUMENTATION=ON} \ + -DPYTHON_EXECUTABLE:PATH="%{__python3}" %make_build @@ -236,6 +234,10 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Apr 24 2020 Rex Dieter - 5.212.0-0.44.alpha4 +- 5.212.0-alpha4 +- use python3 (#1807535) + * Sun Apr 05 2020 Rex Dieter - 5.212.0-0.43.alpha3 - rebuild (qt5) diff --git a/qtwebkit-missing-semicolons.patch b/qtwebkit-missing-semicolons.patch deleted file mode 100644 index 735ff53..0000000 --- a/qtwebkit-missing-semicolons.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp -index 1bca2d0..19355f1 100644 ---- a/Source/WebCore/dom/Document.cpp -+++ b/Source/WebCore/dom/Document.cpp -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length) - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualifiedName, String& prefix, S - - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; diff --git a/sources b/sources index 908dcb9..90f08bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f +SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 From d07555709fff9c37959e69e61946e99ba19f65f9 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 16 May 2020 18:17:59 +0100 Subject: [PATCH 169/208] Rebuild for ICU 67 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index fbf2187..9ba518c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.44.%{?prerel}%{?dist} +Release: 0.45.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -234,6 +234,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sat May 16 2020 Pete Walter - 5.212.0-0.45.alpha4 +- Rebuild for ICU 67 + * Fri Apr 24 2020 Rex Dieter - 5.212.0-0.44.alpha4 - 5.212.0-alpha4 - use python3 (#1807535) From 3c3d98a9cb1fcebf1264c3418bcbc739823aad44 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 17 May 2020 08:04:33 +0100 Subject: [PATCH 170/208] Rebuild for ICU 67 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9ba518c..262b33f 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.45.%{?prerel}%{?dist} +Release: 0.46.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -234,6 +234,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sun May 17 2020 Pete Walter - 5.212.0-0.46.alpha4 +- Rebuild for ICU 67 + * Sat May 16 2020 Pete Walter - 5.212.0-0.45.alpha4 - Rebuild for ICU 67 From bbe192f8686b2d71c4fca96d11976ba2e270c8b2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Jun 2020 14:57:52 -0500 Subject: [PATCH 171/208] rebuild (python39) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 262b33f..a5a4c2a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.46.%{?prerel}%{?dist} +Release: 0.47.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -234,6 +234,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Jun 03 2020 Rex Dieter - 5.212.0-0.47.alpha4 +- rebuild (python39) + * Sun May 17 2020 Pete Walter - 5.212.0-0.46.alpha4 - Rebuild for ICU 67 From a6d9ba2d9849810fff121039c984783cbe954644 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 1 Jul 2020 12:43:13 -0600 Subject: [PATCH 172/208] Disable LTO --- qt5-qtwebkit.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a5a4c2a..c577f25 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.47.%{?prerel}%{?dist} +Release: 0.48.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -120,6 +120,12 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png %build +# QT is known not to work properly with LTO at this point. Some of the issues +# are being worked on upstream and disabling LTO should be re-evaluated as +# we update this change. Until such time... +# Disable LTO +%define _lto_cflags %{nil} + # The following changes of optflags ietc. are adapted from webkitgtk4 package, which # is mostly similar to this one... # @@ -234,6 +240,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Jul 01 2020 Jeff Law - 5.212.0-0.48.alpha4 +- Disable LTO + * Wed Jun 03 2020 Rex Dieter - 5.212.0-0.47.alpha4 - rebuild (python39) From cee1536926584941cd7e779f9d46de6555e98556 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 05:15:05 +0000 Subject: [PATCH 173/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c577f25..bf04509 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.48.%{?prerel}%{?dist} +Release: 0.49.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -240,6 +240,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.212.0-0.49.alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 01 2020 Jeff Law - 5.212.0-0.48.alpha4 - Disable LTO From dce294e9bcab8db0e811a88f1e95d1f8963254f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 07:36:54 +0000 Subject: [PATCH 174/208] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index bf04509..1a6dfb9 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.49.%{?prerel}%{?dist} +Release: 0.50.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -240,6 +240,10 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 5.212.0-0.50.alpha4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 5.212.0-0.49.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5694081ba3b6448c5bf7aa7647c97237247e5617 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 27 Aug 2020 14:36:59 +0200 Subject: [PATCH 175/208] Fixed #1863719, FTBFS --- qt5-qtwebkit.spec | 12 ++++++++---- qtwebkit-5.212.0-json.patch | 12 ++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 qtwebkit-5.212.0-json.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1a6dfb9..ef077a6 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.50.%{?prerel}%{?dist} +Release: 0.51.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -25,6 +25,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch +Patch3: qtwebkit-5.212.0-json.patch BuildRequires: bison BuildRequires: cmake @@ -151,7 +152,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ; %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} # We cannot use default cmake macro here as it overwrites some settings queried # by qtwebkit cmake from qmake -cmake . \ +%cmake \ -DPORT=Qt \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_TOOLS=OFF \ @@ -167,7 +168,7 @@ cmake . \ %{?docs:-DGENERATE_DOCUMENTATION=ON} \ -DPYTHON_EXECUTABLE:PATH="%{__python3}" -%make_build +%cmake_build %if 0%{?docs} %make_build docs @@ -175,7 +176,7 @@ cmake . \ %install -%make_install +%cmake_install find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -240,6 +241,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu Aug 27 2020 Than Ngo - 5.212.0-0.51.alpha4 +- Fixed #1863719, FTBFS + * Sat Aug 01 2020 Fedora Release Engineering - 5.212.0-0.50.alpha4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/qtwebkit-5.212.0-json.patch b/qtwebkit-5.212.0-json.patch new file mode 100644 index 0000000..b09c210 --- /dev/null +++ b/qtwebkit-5.212.0-json.patch @@ -0,0 +1,12 @@ +diff -up qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files.me qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files +--- qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files.me 2020-08-27 13:50:06.506653244 +0200 ++++ qtwebkit-5.212.0-alpha4/Source/JavaScriptCore/generate-bytecode-files 2020-08-27 14:00:52.802018893 +0200 +@@ -163,7 +163,7 @@ if __name__ == "__main__": + initBytecodesFile = openOrExit(initASMFileName, "w") + + try: +- bytecodeSections = json.load(bytecodeFile, encoding = "utf-8") ++ bytecodeSections = json.load(bytecodeFile) + except: + print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info())) + From e0c3cbdcfcda74223fc4afcccccadbf3619cfd03 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 11 Sep 2020 10:44:25 +0200 Subject: [PATCH 176/208] rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ef077a6..64f4fb2 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.51.%{?prerel}%{?dist} +Release: 0.52.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -241,6 +241,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Sep 11 2020 Jan Grulich - 5.212.0-0.52.alpha4 +- rebuild (qt5) + * Thu Aug 27 2020 Than Ngo - 5.212.0-0.51.alpha4 - Fixed #1863719, FTBFS From 80dcc623a713863cfd36e3660f34e8f8e9990426 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 11 Sep 2020 12:06:09 +0200 Subject: [PATCH 177/208] Fix build --- qt5-qtwebkit.spec | 1 + qtwebkit-bison37.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 qtwebkit-bison37.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 64f4fb2..9f53405 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -26,6 +26,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu # Patch for new CMake policy CMP0071 to explicitly use old behaviour. Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: qtwebkit-5.212.0-json.patch +Patch4: qtwebkit-bison37.patch BuildRequires: bison BuildRequires: cmake diff --git a/qtwebkit-bison37.patch b/qtwebkit-bison37.patch new file mode 100644 index 0000000..488dfda --- /dev/null +++ b/qtwebkit-bison37.patch @@ -0,0 +1,39 @@ +Description: let Bison generate the header directly + Starting with Bison 3.7, the generated C++ file #include's the header + by default, instead of duplicating it. So we should not delete it. + . + Remove the code to add #ifdef guards to the header, since Bison adds + them itself since version 2.6.3. +Author: Dmitry Shachnev +Forwarded: not-yet +Last-Update: 2020-08-04 + +--- a/Source/WebCore/css/makegrammar.pl ++++ b/Source/WebCore/css/makegrammar.pl +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while () { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- From ff0bd0e3c8e55d22969282fd6edbac31ab3e425d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 20 Nov 2020 13:29:20 +0100 Subject: [PATCH 178/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9f53405..0935f4c 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.52.%{?prerel}%{?dist} +Release: 0.53.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -242,6 +242,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Nov 20 13:29:15 CET 2020 Jan Grulich - 5.212.0-0.53.alpha4 +- Rebuild (qt5) + * Fri Sep 11 2020 Jan Grulich - 5.212.0-0.52.alpha4 - rebuild (qt5) From eede7f865295817c1e9175da7b9bec011f637ee4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 24 Nov 2020 07:56:10 +0100 Subject: [PATCH 179/208] Rebuild for qtbase with -no-reduce-relocations option --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 0935f4c..b5fec4f 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.53.%{?prerel}%{?dist} +Release: 0.54.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -242,6 +242,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Nov 24 07:56:08 CET 2020 Jan Grulich - 5.212.0-0.54.alpha4 +- Rebuild for qtbase with -no-reduce-relocations option + * Fri Nov 20 13:29:15 CET 2020 Jan Grulich - 5.212.0-0.53.alpha4 - Rebuild (qt5) From b35ef8c4d60e09d54a4cfd2170f0c3289685fe04 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 20:21:53 +0000 Subject: [PATCH 180/208] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- qt5-qtwebkit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b5fec4f..aa21c12 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -28,6 +28,7 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: qtwebkit-5.212.0-json.patch Patch4: qtwebkit-bison37.patch +BuildRequires: make BuildRequires: bison BuildRequires: cmake BuildRequires: flex From 20c502e6e35dbc513010dccb2790606bf720057a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 14:47:01 +0000 Subject: [PATCH 181/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index aa21c12..b5def83 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.54.%{?prerel}%{?dist} +Release: 0.55.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -243,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.212.0-0.55.alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Nov 24 07:56:08 CET 2020 Jan Grulich - 5.212.0-0.54.alpha4 - Rebuild for qtbase with -no-reduce-relocations option From 9ac529c5906e604893641d254147115945969fde Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:39:40 +0100 Subject: [PATCH 182/208] Rebuilt for removed libstdc++ symbol (#1937698) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index b5def83..c4b6a83 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.55.%{?prerel}%{?dist} +Release: 0.56.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -243,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Mar 30 2021 Jonathan Wakely - 5.212.0-0.56.alpha4 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Wed Jan 27 2021 Fedora Release Engineering - 5.212.0-0.55.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d32bb407d0f6f8a99edc0915983f4d6f5464700e Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 10 May 2021 16:08:32 +0100 Subject: [PATCH 183/208] Rebuilt for removed libstdc++ symbols (#1937698) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c4b6a83..655aad9 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.56.%{?prerel}%{?dist} +Release: 0.57.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -243,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Mon May 10 2021 Jonathan Wakely - 5.212.0-0.57.alpha4 +- Rebuilt for removed libstdc++ symbols (#1937698) + * Tue Mar 30 2021 Jonathan Wakely - 5.212.0-0.56.alpha4 - Rebuilt for removed libstdc++ symbol (#1937698) From 4f7abd0dc3d8b642c5dcbe6cadf83200afb10381 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 20 May 2021 01:17:09 +0100 Subject: [PATCH 184/208] Rebuild for ICU 69 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 655aad9..2e35000 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.57.%{?prerel}%{?dist} +Release: 0.58.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -243,6 +243,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu May 20 2021 Pete Walter - 5.212.0-0.58.alpha4 +- Rebuild for ICU 69 + * Mon May 10 2021 Jonathan Wakely - 5.212.0-0.57.alpha4 - Rebuilt for removed libstdc++ symbols (#1937698) From a4ec66d7180e50fde309cff357c4360c4f6d9b3a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 31 May 2021 21:22:30 +0200 Subject: [PATCH 185/208] fix FTBFS against glib >= 2.68 --- qt5-qtwebkit-glib-2.68.patch | 1 + qt5-qtwebkit.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 qt5-qtwebkit-glib-2.68.patch diff --git a/qt5-qtwebkit-glib-2.68.patch b/qt5-qtwebkit-glib-2.68.patch new file mode 100644 index 0000000..d0ccc14 --- /dev/null +++ b/qt5-qtwebkit-glib-2.68.patch @@ -0,0 +1 @@ +./qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 2e35000..a63bb98 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.58.%{?prerel}%{?dist} +Release: 0.59.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -27,6 +27,7 @@ Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_modu Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: qtwebkit-5.212.0-json.patch Patch4: qtwebkit-bison37.patch +Patch5: qt5-qtwebkit-glib-2.68.patch BuildRequires: make BuildRequires: bison @@ -243,6 +244,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Mon May 31 2021 Than Ngo - 5.212.0-0.59.alpha4 +- fix FTBFS against glib >= 2.68 + * Thu May 20 2021 Pete Walter - 5.212.0-0.58.alpha4 - Rebuild for ICU 69 From 67bf7739bdd8cd5ee97e7415908bc6df34d6377d Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 31 May 2021 21:27:03 +0200 Subject: [PATCH 186/208] upload correct patch --- qt5-qtwebkit-glib-2.68.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit-glib-2.68.patch b/qt5-qtwebkit-glib-2.68.patch index d0ccc14..dc7ed5f 100644 --- a/qt5-qtwebkit-glib-2.68.patch +++ b/qt5-qtwebkit-glib-2.68.patch @@ -1 +1,13 @@ -./qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h +diff -up qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h.me qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h +--- qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h.me 2021-05-31 21:26:39.137033058 +0200 ++++ qtwebkit-5.212.0-alpha4/Source/WTF/wtf/glib/GRefPtr.h 2021-05-31 21:26:45.312412620 +0200 +@@ -29,9 +29,6 @@ + #include + #include + +-extern "C" void g_object_unref(gpointer); +-extern "C" gpointer g_object_ref_sink(gpointer); +- + namespace WTF { + + enum GRefPtrAdoptType { GRefPtrAdopt }; From c519c3594476c1316f95aa5a02b1aa6bda2ab3a3 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 31 May 2021 22:07:27 +0200 Subject: [PATCH 187/208] fix macro definitions TRUE,FALSE --- qt5-qtwebkit.spec | 2 + qtwebkit-icu68.patch | 124 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 qtwebkit-icu68.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index a63bb98..8470dbe 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -28,6 +28,7 @@ Patch2: qtwebkit-5.212.0_cmake_cmp0071.patch Patch3: qtwebkit-5.212.0-json.patch Patch4: qtwebkit-bison37.patch Patch5: qt5-qtwebkit-glib-2.68.patch +Patch6: qtwebkit-icu68.patch BuildRequires: make BuildRequires: bison @@ -246,6 +247,7 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog * Mon May 31 2021 Than Ngo - 5.212.0-0.59.alpha4 - fix FTBFS against glib >= 2.68 +- fix macro definitions TRUE,FALSE * Thu May 20 2021 Pete Walter - 5.212.0-0.58.alpha4 - Rebuild for ICU 69 diff --git a/qtwebkit-icu68.patch b/qtwebkit-icu68.patch new file mode 100644 index 0000000..fc68d1b --- /dev/null +++ b/qtwebkit-icu68.patch @@ -0,0 +1,124 @@ +diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProvider.h +--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProvider.h 2021-05-31 22:02:56.974163189 +0200 +@@ -80,12 +80,12 @@ + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp 2021-05-31 22:02:56.974163189 +0200 +@@ -100,23 +100,23 @@ + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (index >= length && uText->chunkNativeLimit == length) { + // Off the end of the buffer, but we can't get it. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return FALSE; ++ return false; + } + } else { + if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast(index - uText->chunkNativeStart); +- return TRUE; ++ return true; + } + if (!index && !uText->chunkNativeStart) { + // Already at the beginning; can't go any farther. + uText->chunkOffset = 0; +- return FALSE; ++ return false; + } + } + +@@ -144,7 +144,7 @@ + + uText->nativeIndexingLimit = uText->chunkLength; + +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) +@@ -336,7 +336,7 @@ + static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -356,7 +356,7 @@ + ASSERT(newContext == UTextProviderContext::PriorContext); + textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp 2021-05-31 22:02:56.974163189 +0200 +@@ -125,7 +125,7 @@ + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +diff -Nur qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/TextCodecICU.cpp +--- qtwebkit-5.212.0-alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4/Source/WebCore/platform/text/TextCodecICU.cpp 2021-05-31 22:02:56.974163189 +0200 +@@ -308,7 +308,7 @@ + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) From 63d29a456921cac771f81c38120344b460cd757a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 10:52:48 +0000 Subject: [PATCH 188/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 8470dbe..633c98f 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.59.%{?prerel}%{?dist} +Release: 0.60.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -245,6 +245,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.212.0-0.60.alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 31 2021 Than Ngo - 5.212.0-0.59.alpha4 - fix FTBFS against glib >= 2.68 - fix macro definitions TRUE,FALSE From 30cce27daac2f918cff47252c6dd6b527047b153 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 24 Dec 2021 07:20:31 -0800 Subject: [PATCH 189/208] Decrease debuginfo on every arch. Memory issues even on x86_64 --- qt5-qtwebkit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 633c98f..eeb3504 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -141,10 +141,10 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png # Decrease debuginfo even on ix86 because of: # https://bugs.webkit.org/show_bug.cgi?id=140176 -%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} +#%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif +#%endif %ifarch ppc # Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled From c65c611e3311d8458e013188ebfe89581d771f13 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 17:11:17 +0000 Subject: [PATCH 190/208] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 633c98f..ad0b6b8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -16,7 +16,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.60.%{?prerel}%{?dist} +Release: 0.61.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -245,6 +245,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 5.212.0-0.61.alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.212.0-0.60.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 94aa2286cfbecea04a40a7969fc6bd5059915730 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 9 Feb 2022 11:30:23 +0100 Subject: [PATCH 191/208] disable _package_note_flags because it breaks qt5-qtwebkit --- qt5-qtwebkit.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ad0b6b8..ba07f02 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -1,4 +1,6 @@ -%undefine _annotated_build +# The additional linker flags break binary qt5-qtwebkits packages. +# https://bugzilla.redhat.com/show_bug.cgi?id=2046931 +%undefine _package_note_flags %global qt_module qtwebkit @@ -16,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.61.%{?prerel}%{?dist} +Release: 0.62.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -130,6 +132,7 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png # we update this change. Until such time... # Disable LTO %define _lto_cflags %{nil} +%define _package_note_flags %{nil} # The following changes of optflags ietc. are adapted from webkitgtk4 package, which # is mostly similar to this one... @@ -245,6 +248,10 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Feb 09 2022 Than Ngo - 5.212.0-0.62.alpha4 +- disable _package_note_flags because it breaks qt5-qtwebkit + + * Fri Jan 21 2022 Fedora Release Engineering - 5.212.0-0.61.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6530dc4b54ba3173b502431b79cbec4dc26208fc Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 8 Mar 2022 15:12:25 +0100 Subject: [PATCH 192/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index ba07f02..f9e02d4 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.62.%{?prerel}%{?dist} +Release: 0.63.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Mar 08 2022 Jan Grulich - 5.212.0-0.63.alpha4 +- Rebuild (qt5) + * Wed Feb 09 2022 Than Ngo - 5.212.0-0.62.alpha4 - disable _package_note_flags because it breaks qt5-qtwebkit From 84461703db68e6a734668cab806a32dac2b98e72 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 29 Apr 2022 22:57:49 -0700 Subject: [PATCH 193/208] Disable debug packages. It breaks x86_64 on epel9-next. --- qt5-qtwebkit.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f9e02d4..2e0ec93 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -2,6 +2,11 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=2046931 %undefine _package_note_flags +# Fix some epel9-next wierdness +%global _debugsource_template %{nil} +%global debug_package %{nil} +%global debug_config %{nil} + %global qt_module qtwebkit %global _hardened_build 1 @@ -18,7 +23,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.63.%{?prerel}%{?dist} +Release: 0.63.%{?prerel}%{?dist}.1 Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +253,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Apr 29 2022 Troy Dawson - 5.212.0-0.63.alpha4.1 +- Disable debug packages. It breaks x86_64 on epel9-next. + * Tue Mar 08 2022 Jan Grulich - 5.212.0-0.63.alpha4 - Rebuild (qt5) From 1380c0174e17479047a263156810a83423d8d849 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 19 May 2022 08:05:41 +0200 Subject: [PATCH 194/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f9e02d4..50057f8 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.63.%{?prerel}%{?dist} +Release: 0.64.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Thu May 19 2022 Jan Grulich - 5.212.0-0.64.alpha4 +- Rebuild (qt5) + * Tue Mar 08 2022 Jan Grulich - 5.212.0-0.63.alpha4 - Rebuild (qt5) From 50ebdff9930faf4d9ea85ac6fd37cd40b4e8e71c Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 15 Jul 2022 08:13:37 +0200 Subject: [PATCH 195/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 50057f8..28a4ada 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.64.%{?prerel}%{?dist} +Release: 0.65.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jul 15 2022 Jan Grulich - 5.212.0-0.65.alpha4 +- Rebuild (qt5) + * Thu May 19 2022 Jan Grulich - 5.212.0-0.64.alpha4 - Rebuild (qt5) From 8cd61cff4172933ae867f1bef012acc5f40427d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 00:09:58 +0000 Subject: [PATCH 196/208] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 28a4ada..073a291 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.65.%{?prerel}%{?dist} +Release: 0.66.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 5.212.0-0.66.alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 15 2022 Jan Grulich - 5.212.0-0.65.alpha4 - Rebuild (qt5) From 0d8fd23134e1557fcce320947088f888dffaa7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 2 Aug 2022 13:23:56 +0200 Subject: [PATCH 197/208] Rebuilt for ICU 71.1 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 073a291..f281261 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.66.%{?prerel}%{?dist} +Release: 0.67.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Aug 02 2022 Frantisek Zatloukal - 5.212.0-0.67.alpha4 +- Rebuilt for ICU 71.1 + * Sat Jul 23 2022 Fedora Release Engineering - 5.212.0-0.66.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From cfca3b5df3447ba625225442fb9ee011f6b57fa8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 21 Sep 2022 10:30:21 +0200 Subject: [PATCH 198/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f281261..9ec8fdc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.67.%{?prerel}%{?dist} +Release: 0.68.%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -248,6 +248,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Sep 21 2022 Jan Grulich - 5.212.0-0.68.alpha4 +- Rebuild (qt5) + * Tue Aug 02 2022 Frantisek Zatloukal - 5.212.0-0.67.alpha4 - Rebuilt for ICU 71.1 From ba65ef8764a895050966df67c6735252aa7378fb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 18 Oct 2022 21:41:21 +0900 Subject: [PATCH 199/208] Patch for offlineasm to support ruby 3.2 wrt Object#=~ removal --- qt5-qtwebkit.spec | 8 ++++- webkit-offlineasm-warnings-ruby27.patch | 46 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 webkit-offlineasm-warnings-ruby27.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 9ec8fdc..12cbaff 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.68.%{?prerel}%{?dist} +Release: 0.69%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -31,6 +31,9 @@ Patch3: qtwebkit-5.212.0-json.patch Patch4: qtwebkit-bison37.patch Patch5: qt5-qtwebkit-glib-2.68.patch Patch6: qtwebkit-icu68.patch +# From https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef +# Ruby 3.2 removes Object#=~ completely +Patch7: webkit-offlineasm-warnings-ruby27.patch BuildRequires: make BuildRequires: bison @@ -248,6 +251,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Tue Oct 18 2022 Mamoru TASAKA - 5.212.0-0.69.alpha4 +- Patch for offlineasm to support ruby 3.2 wrt Object#=~ removal + * Wed Sep 21 2022 Jan Grulich - 5.212.0-0.68.alpha4 - Rebuild (qt5) diff --git a/webkit-offlineasm-warnings-ruby27.patch b/webkit-offlineasm-warnings-ruby27.patch new file mode 100644 index 0000000..d25c3b1 --- /dev/null +++ b/webkit-offlineasm-warnings-ruby27.patch @@ -0,0 +1,46 @@ +From c7d19a492d97f9282a546831beb918e03315f6ef Mon Sep 17 00:00:00 2001 +From: Adrian Perez de Castro +Date: Wed, 15 Jan 2020 22:15:38 +0000 +Subject: [PATCH] Offlineasm warnings with newer Ruby versions + https://bugs.webkit.org/show_bug.cgi?id=206233 + +Reviewed by Yusuke Suzuki. + +Avoid a warning about using Object#=~ on Annotation instances, which +has been deprecated in Ruby 2.7. + +* offlineasm/parser.rb: Swap checks to prevent applying the =~ operator +to Annotation instances, which do not define it. + + +Canonical link: https://commits.webkit.org/219400@main +git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254637 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/JavaScriptCore/ChangeLog | 13 +++++++++++++ + Source/JavaScriptCore/offlineasm/parser.rb | 6 +++--- + 2 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/Source/JavaScriptCore/offlineasm/parser.rb b/Source/JavaScriptCore/offlineasm/parser.rb +index 791c81a9868d..f14c873e2dbd 100644 +--- a/Source/JavaScriptCore/offlineasm/parser.rb ++++ b/Source/JavaScriptCore/offlineasm/parser.rb +@@ -628,9 +628,7 @@ def parseSequence(final, comment) + firstCodeOrigin = @tokens[@idx].codeOrigin + list = [] + loop { +- if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) +- break +- elsif @tokens[@idx].is_a? Annotation ++ if @tokens[@idx].is_a? Annotation + # This is the only place where we can encounter a global + # annotation, and hence need to be able to distinguish between + # them. +@@ -644,6 +642,8 @@ def parseSequence(final, comment) + list << Instruction.new(codeOrigin, annotationOpcode, [], @tokens[@idx].string) + @annotation = nil + @idx += 2 # Consume the newline as well. ++ elsif (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final) ++ break + elsif @tokens[@idx] == "\n" + # ignore + @idx += 1 From 1589ea638fc4b2ef1227cc6a50d12d233e433f27 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 31 Oct 2022 14:31:09 +0100 Subject: [PATCH 200/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 12cbaff..e402208 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.69%{?prerel}%{?dist} +Release: 0.70%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -251,6 +251,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Mon Oct 31 2022 Jan Grulich - 5.212.0-0.70alpha4 +- Rebuild (qt5) + * Tue Oct 18 2022 Mamoru TASAKA - 5.212.0-0.69.alpha4 - Patch for offlineasm to support ruby 3.2 wrt Object#=~ removal From b5876f8a36240ce57f9143cb4c29dda5c5304134 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 31 Dec 2022 03:16:28 +0000 Subject: [PATCH 201/208] Rebuild for ICU 72 --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index e402208..1c877f9 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.70%{?prerel}%{?dist} +Release: 0.71%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -251,6 +251,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Sat Dec 31 2022 Pete Walter - 5.212.0-0.71alpha4 +- Rebuild for ICU 72 + * Mon Oct 31 2022 Jan Grulich - 5.212.0-0.70alpha4 - Rebuild (qt5) From d04d68620f556a45a6f448b5281ddd36fb11f7b8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 6 Jan 2023 12:57:43 +0100 Subject: [PATCH 202/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 1c877f9..c480954 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.71%{?prerel}%{?dist} +Release: 0.72%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -251,6 +251,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jan 06 2023 Jan Grulich - 5.212.0-0.72alpha4 +- Rebuild (qt5) + * Sat Dec 31 2022 Pete Walter - 5.212.0-0.71alpha4 - Rebuild for ICU 72 From 245d6c2cfdbacb1c27da340c2ec4a5cb49a833a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 19:08:33 +0000 Subject: [PATCH 203/208] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index c480954..64fe1b3 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.72%{?prerel}%{?dist} +Release: 0.73%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPLv2 and BSD @@ -251,6 +251,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 5.212.0-0.73alpha4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jan 06 2023 Jan Grulich - 5.212.0-0.72alpha4 - Rebuild (qt5) From dbd1decd739e3220d1692f03060a85027b43cade Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 20 Feb 2023 13:50:53 +0100 Subject: [PATCH 204/208] migrated to SPDX license --- qt5-qtwebkit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 64fe1b3..431cedc 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,10 +18,10 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.73%{?prerel}%{?dist} +Release: 0.74%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components -License: LGPLv2 and BSD +License: LGPL-2.0-only AND BSD-3-Clause URL: https://github.com/qtwebkit/qtwebkit Source0: https://github.com/qtwebkit/qtwebkit/releases/download/%{qt_module}-%{version}%{?prerel_tag}/%{qt_module}-%{version}%{?prerel_tag}.tar.xz @@ -251,6 +251,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Mon Feb 20 2023 Than Ngo - 5.212.0-0.74alpha4 +- migrated to SPDX license + * Fri Jan 20 2023 Fedora Release Engineering - 5.212.0-0.73alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e41996e42c9ebbb77fe60a2027d4c4dc0e3c850d Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Mon, 20 Feb 2023 17:24:09 +0100 Subject: [PATCH 205/208] fixed FTBFS --- qt5-qtwebkit.spec | 2 ++ qtwebkit-cstdint.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 qtwebkit-cstdint.patch diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 431cedc..f89a476 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -34,6 +34,7 @@ Patch6: qtwebkit-icu68.patch # From https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef # Ruby 3.2 removes Object#=~ completely Patch7: webkit-offlineasm-warnings-ruby27.patch +Patch8: qtwebkit-cstdint.patch BuildRequires: make BuildRequires: bison @@ -253,6 +254,7 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog * Mon Feb 20 2023 Than Ngo - 5.212.0-0.74alpha4 - migrated to SPDX license +- fixed FTBFS * Fri Jan 20 2023 Fedora Release Engineering - 5.212.0-0.73alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/qtwebkit-cstdint.patch b/qtwebkit-cstdint.patch new file mode 100644 index 0000000..6ef5515 --- /dev/null +++ b/qtwebkit-cstdint.patch @@ -0,0 +1,11 @@ +diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h +--- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me 2023-02-20 15:40:04.045911245 +0100 ++++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h 2023-02-20 15:40:39.038549787 +0100 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + namespace gl + { From 9c68e9f150b28f1bba3a48a2ea8f89a177eca74d Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 12 Apr 2023 06:32:48 +0200 Subject: [PATCH 206/208] Rebuild (qt5) --- qt5-qtwebkit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index f89a476..7f64290 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -18,7 +18,7 @@ Name: qt5-%{qt_module} Version: 5.212.0 -Release: 0.74%{?prerel}%{?dist} +Release: 0.75%{?prerel}%{?dist} Summary: Qt5 - QtWebKit components License: LGPL-2.0-only AND BSD-3-Clause @@ -252,6 +252,9 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)" %changelog +* Wed Apr 12 2023 Jan Grulich - 5.212.0-0.75alpha4 +- Rebuild (qt5) + * Mon Feb 20 2023 Than Ngo - 5.212.0-0.74alpha4 - migrated to SPDX license - fixed FTBFS From eddabd487012309a49c89b880ace0a4c7817bcf7 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 20 Oct 2023 19:00:55 -0700 Subject: [PATCH 207/208] Sync with epel9-next --- qt5-qtwebkit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec index 6547ea1..dae112a 100644 --- a/qt5-qtwebkit.spec +++ b/qt5-qtwebkit.spec @@ -153,10 +153,10 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png # Decrease debuginfo even on ix86 because of: # https://bugs.webkit.org/show_bug.cgi?id=140176 -#%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} +%ifarch s390 s390x %{arm} %{ix86} ppc %{power64} %{mips} # Decrease debuginfo verbosity to reduce memory consumption even more %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -#%endif +%endif %ifarch ppc # Use linker flag -relax to get WebKit build under ppc(32) with JIT disabled From 2f77c51cd900dd0deb70540585441abbf11cfcb3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:14:25 +0300 Subject: [PATCH 208/208] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 90f08bb..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6