epel does not know pkgconfig(libjpeg), use libjpeg-devel for BR

fix header path
fix pkgconfig fix...
2017-07-11 00:01:02 +02:00 · 2017-07-11 00:00:57 +02:00 · 2017-07-10 20:44:41 +02:00 · 2017-07-10 19:41:05 +02:00 · 2016-11-16 23:58:47 -06:00
10 changed files with 197 additions and 361 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +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.6.2.tar.xz
--- a/0001-Add-ARM-64-support.patch
+++ b/0001-Add-ARM-64-support.patch
@ -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
-
--- a/0005-Added-missing-break-statement.patch
+++ b/0005-Added-missing-break-statement.patch
@ -1,26 +0,0 @@
-From 9d69c357ca97785eee385b14942a27ec2a680ede Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-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 <allan.jensen@qt.io>
---
- 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
-
--- a/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch
+++ b/0009-Fixed-drawing-of-zoomed-border-image-with-repeat-mod.patch
@ -1,49 +0,0 @@
-From da5f9d788f96340a44083ed4e28cdf6ea0a393f0 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-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 <allan.jensen@qt.io>
---
- 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
-
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@ -3,118 +3,88 @@

 %global _hardened_build 1

-#global bootstrap 1
+%global prerel alpha2
+%global prerel_tag -%{prerel}

-# 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
+## 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.5.%{?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:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  gperf
+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:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(xcomposite)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  perl-generators
+BuildRequires:  python2
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  pkgconfig(Qt5Quick)
 %if ! 0%{?bootstrap}
-%ifarch %{arm} %{ix86} x86_64
-%define docs 1
+BuildRequires:  pkgconfig(Qt5Location)
+BuildRequires:  pkgconfig(Qt5Sensors)
+BuildRequires:  pkgconfig(Qt5WebChannel)
 %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}
-
-# 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
-
-## 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
-
-## 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: qt5-qtdeclarative-devel >= %{version}
-%if ! 0%{?bootstrap}
-BuildRequires: qt5-qtsensors-devel
-BuildRequires: qt5-qtlocation-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: ruby rubygems
+BuildRequires:  pkgconfig(ruby)
+BuildRequires:  rubygems
 %if 0%{?fedora}
-BuildRequires: rubypick
+BuildRequires:  rubypick
 %endif
-BuildRequires: zlib-devel
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(zlib)

 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
+
+# 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
@ -122,92 +92,121 @@ 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}
-
-%patch105 -p1 -b .0005
-%patch109 -p1 -b .0009
-
-%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}
+# 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

-%{qmake_qt5} .. \
-%ifnarch %{arm} %{ix86} x86_64
-	DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0
+# 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
+
+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 \
+       -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
+%ifarch s390 s390x ppc %{power64}
+       -DUSE_SYSTEM_MALLOC=ON \
+%endif
+%if 0%{?docs}
+       -DGENERATE_DOCUMENTATION=ON \
+%endif
+       .
+
+%make_build

 %if 0%{?docs}
-make %{?_smp_mflags} docs
+%make_build docs
 %endif
-popd


 %install
-make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
+%make_install

-%if 0%{?docs}
-make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
-%endif
+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 "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 "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
+%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

-## .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
+
 %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
@ -216,8 +215,58 @@ popd


 %changelog
-* Wed Jun 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-3.b889f46git
- drop pkgconfig-style deps
+* Mon Jul 10 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.5.alpha2
+- replaced ugly pkgconfig provides workaround with proper pkgconfig fixes
+- general spec fixes
+
+* Thu Jun 22 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.4.alpha2
+- BR: pkg-config
+
+* Wed Jun 21 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.3.alpha2
+- ensure that we do a release build
+
+* Wed Jun 21 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.2.alpha2
+- few spec adjustments
+
+* Sun Jun 18 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.1.alpha2
+- switch to maintained annulen branch of qtwebkit
+
+* Sat Jun 10 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.0-1
+- 5.9.0 (final)
+
+* Sun May 28 2017 Helio Chissini de Castro <helio@kde.org> - 5.9.0-0.1.rc
+- Release candidate community
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 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 <helio@kde.org> - 5.9.0-0.beta.3
+- Community beta3
+
+* Thu Mar 30 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-1
+- 5.8.0
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Sandro Mani <manisandro@gmail.com> - 5.7.1-4
+- Rebuild (libwebp)
+
+* Mon Jan 02 2017 Rex Dieter <rdieter@math.unl.edu> - 5.7.1-3
+- filter qml provides, BR: qtdeclarative python expicitly
+
+* Sat Dec 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 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 <helio@kde.org> - 5.7.1-1
+- New upstream version
+
+* Mon Jul 04 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-2
+- Compiled with gcc
+
+* Wed Jun 15 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.0-1
+- Qt 5.7.0 release ( non git, official package )

 * Tue Jun 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.1-2.b889f46git
 - rebuild (glibc)
--- a/qtwebkit-opensource-src-5.0.1-debuginfo.patch
+++ b/qtwebkit-opensource-src-5.0.1-debuginfo.patch
@ -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 <wtf/some/thing.h>).
- 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.
--- a/qtwebkit-opensource-src-5.2.0-pluginpath.patch
+++ b/qtwebkit-opensource-src-5.2.0-pluginpath.patch
@ -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<String> 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<String> 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");
--- a/qtwebkit-opensource-src-5.2.0-save_memory.patch
+++ b/qtwebkit-opensource-src-5.2.0-save_memory.patch
@ -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
--- a/qtwebkit-opensource-src-5.2.1-no_rpath.patch
+++ b/qtwebkit-opensource-src-5.2.1-no_rpath.patch
@ -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}
--- a/2
+++ b/2
@ -1 +1 @@
-1a7f3953c457c57a942bdd6a92d198fb  qtwebkit-opensource-src-5.6.1-b889f46.tar.xz
+SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758
Author	SHA1	Message	Date
Christian Dersch	8c03326c99	epel does not know pkgconfig(libjpeg), use libjpeg-devel for BR	2017-07-11 00:01:02 +02:00
Christian Dersch	4ab399cd79	fix header path	2017-07-11 00:00:57 +02:00
Christian Dersch	32e95afca2	fix pkgconfig fix...	2017-07-10 20:44:41 +02:00
Christian Dersch	5489764be3	update to annulen branch (5.212.0-alpha2)	2017-07-10 19:41:05 +02:00
Rex Dieter	5132c134a0	5.6.2	2016-11-16 23:58:47 -06:00