|
|
|
|
@ -1,10 +1,9 @@
|
|
|
|
|
%undefine _annotated_build
|
|
|
|
|
|
|
|
|
|
%global qt_module qtwebkit
|
|
|
|
|
|
|
|
|
|
%global _hardened_build 1
|
|
|
|
|
|
|
|
|
|
%global prerel alpha3
|
|
|
|
|
%global prerel alpha2
|
|
|
|
|
%global prerel_tag -%{prerel}
|
|
|
|
|
|
|
|
|
|
## NOTE: Lots of files in various subdirectories have the same name (such as
|
|
|
|
|
@ -16,24 +15,26 @@
|
|
|
|
|
|
|
|
|
|
Name: qt5-%{qt_module}
|
|
|
|
|
Version: 5.212.0
|
|
|
|
|
Release: 0.43.%{?prerel}%{?dist}
|
|
|
|
|
Release: 0.7.%{?prerel}%{?dist}
|
|
|
|
|
Summary: Qt5 - QtWebKit components
|
|
|
|
|
|
|
|
|
|
License: LGPLv2 and BSD
|
|
|
|
|
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
|
|
|
|
|
URL: https://github.com/annulen/webkit
|
|
|
|
|
Source0: %{url}/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
|
|
|
|
|
Patch3: qtwebkit-missing-semicolons.patch
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
@ -41,32 +42,29 @@ 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)
|
|
|
|
|
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: perl(File::Copy)
|
|
|
|
|
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: pkgconfig(ruby)
|
|
|
|
|
BuildRequires: rubygems
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
BuildRequires: rubypick
|
|
|
|
|
%endif
|
|
|
|
|
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}}
|
|
|
|
|
@ -112,13 +110,6 @@ 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 -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.
|
|
|
|
|
test -f Source/WebCore/Resources/textAreaResizeCorner.png
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
# The following changes of optflags ietc. are adapted from webkitgtk4 package, which
|
|
|
|
|
@ -142,7 +133,7 @@ test -f Source/WebCore/Resources/textAreaResizeCorner.png
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
|
|
|
|
|
CXXFLAGS="${CXXFLAGS:-%optflags} -fpermissive" ; export CXXFLAGS ;
|
|
|
|
|
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
|
|
|
|
|
@ -176,13 +167,12 @@ 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
|
|
|
|
|
# strictly speaking, this isn't *wrong*, but can made more readable, so let's do that
|
|
|
|
|
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 '/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
|
|
|
|
|
@ -202,24 +192,22 @@ sed -i "s,Libs: -L%{_qt5_libdir}/qt5/../ -lQt5WebKitWidgets,Libs: -L%{_qt5_libdi
|
|
|
|
|
%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
# verify Qt5WebKit cflags non-use of -I/.../Qt5WebKit
|
|
|
|
|
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
|
|
|
|
|
test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
|
|
|
|
|
%post -p /sbin/ldconfig
|
|
|
|
|
|
|
|
|
|
%postun -p /sbin/ldconfig
|
|
|
|
|
|
|
|
|
|
%ldconfig_scriptlets
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%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
|
|
|
|
|
@ -236,124 +224,12 @@ test -z "$(pkg-config --cflags Qt5WebKit | grep Qt5WebKit)"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Sun Apr 05 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.43.alpha3
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.42.alpha3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.41.alpha3
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.40.alpha3
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.39.alpha3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 16 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.38.alpha3
|
|
|
|
|
- rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 02 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.37.alpha3
|
|
|
|
|
- 5.212.0 alpha 3
|
|
|
|
|
|
|
|
|
|
* Tue Jun 11 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.36.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.35.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.34.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.33.alpha2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.32.alpha2
|
|
|
|
|
- Rebuild for ICU 63
|
|
|
|
|
|
|
|
|
|
* Tue Dec 11 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.31.alpha
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Sat Nov 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.30.alpha
|
|
|
|
|
- QtWebkit bundles malformed PNG files (#1639422)
|
|
|
|
|
|
|
|
|
|
* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.29.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Tue Aug 21 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.28.alpha2
|
|
|
|
|
- revert to real package names for core qt5 deps
|
|
|
|
|
|
|
|
|
|
* Wed Jul 25 2018 Christian Dersch <lupinix@fedoraproject.org> - 5.212.0-0.27.alpha2
|
|
|
|
|
- Disable annobin for now, workaround for RHBZ #1608549
|
|
|
|
|
|
|
|
|
|
* Tue Jul 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.26.alpha2
|
|
|
|
|
- backport some pkgconfig-related upstream fixes
|
|
|
|
|
- use %%ldconfig_scriptlets
|
|
|
|
|
|
|
|
|
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.25.alpha2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.24.alpha2
|
|
|
|
|
- Rebuild for ICU 62
|
|
|
|
|
|
|
|
|
|
* Wed Jun 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.23.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.22.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
- workaround gcc8 FTBFS with -fpermissive (#1582954)
|
|
|
|
|
|
|
|
|
|
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.21.alpha2
|
|
|
|
|
- Rebuild for ICU 61.1
|
|
|
|
|
|
|
|
|
|
* Fri Feb 23 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.20.alpha2
|
|
|
|
|
- Bad ES6 Proxy object for QT platform breaks scudcloud (#1513091)
|
|
|
|
|
|
|
|
|
|
* Wed Feb 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.19.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.18.alpha2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Dec 20 2017 Jan Grulich <jgrulich@redhat.com> - 5.212.0-0.17.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 5.212.0-0.16.alpha2
|
|
|
|
|
- Rebuild for ICU 60.1
|
|
|
|
|
|
|
|
|
|
* Sun Nov 26 2017 Björn Esser <besser82@fedoraproject.org> - 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 <rdieter@fedoraproject.org> - 5.212.0-0.14.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Thu Oct 26 2017 Vít Ondruch <vondruch@redhat.com> - 5.212.0-0.13.alpha2
|
|
|
|
|
- Drop explicit dependency on rubypick.
|
|
|
|
|
|
|
|
|
|
* Tue Oct 24 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.12.alpha2
|
|
|
|
|
* Tue Oct 24 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.7.alpha2
|
|
|
|
|
- Added patch to fix null pointer dereference (#1470778)
|
|
|
|
|
|
|
|
|
|
* Mon Oct 23 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.11.alpha2
|
|
|
|
|
* Tue Oct 24 2017 Christian Dersch <lupinix@mailbox.org> - 5.212.0-0.6.alpha2
|
|
|
|
|
- Added patch to fix issue with pagewidth (#1502332)
|
|
|
|
|
|
|
|
|
|
* Mon Oct 09 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.10.alpha2
|
|
|
|
|
- rebuild (qt5)
|
|
|
|
|
|
|
|
|
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.9.alpha2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.212.0-0.8.alpha2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jul 20 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.7.alpha2
|
|
|
|
|
- rebuild against newer gcc/ppc64le (#1470692)
|
|
|
|
|
|
|
|
|
|
* Wed Jul 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.212.0-0.6.alpha2
|
|
|
|
|
- rebuild (qt-5.9.1)
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
Christian Dersch
Fedora Release Engineering