diff --git a/qtwebkit-5.212-add-missing-include-functional.patch b/qtwebkit-5.212-add-missing-include-functional.patch new file mode 100644 index 0000000..d8b5ba6 --- /dev/null +++ b/qtwebkit-5.212-add-missing-include-functional.patch @@ -0,0 +1,22 @@ +From 4ce8ebc4094512b9916bfa5984065e95ac97c9d8 Mon Sep 17 00:00:00 2001 +From: Konstantin Tokarev +Date: Fri, 26 Jan 2018 20:50:07 +0300 +Subject: [PATCH] Add missing #include + +Change-Id: Ic5499c1854479064b735bff79b3501992a20a12f +--- + Source/WebCore/dom/SlotAssignment.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/WebCore/dom/SlotAssignment.h b/Source/WebCore/dom/SlotAssignment.h +index 0fcd4dfa6de8..9b9ebe429816 100644 +--- a/Source/WebCore/dom/SlotAssignment.h ++++ b/Source/WebCore/dom/SlotAssignment.h +@@ -28,6 +28,7 @@ + + #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) + ++#include + #include + #include + #include diff --git a/qtwebkit.spec b/qtwebkit.spec index fe02b64..91f955a 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -1,27 +1,28 @@ %define majver %(echo %version | cut -d. -f1-2) Name: qtwebkit -Version: 5.9.0 -Release: 1mamba +Version: 5.212 +Release: 2mamba Summary: A Qt based web browser engine Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://qt.io -Source: http://download.qt.io/community_releases/%{majver}/%{version}-final/qtwebkit-opensource-src-%{version}.tar.xz +Source: http://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/qtwebkit-everywhere-src-%{version}.tar.xz +#Source: http://download.qt.io/community_releases/%{majver}/%{version}-final/qtwebkit-opensource-src-%{version}.tar.xz Patch0: qtwebkit-5.9.0-icu-59.patch +Patch1: qtwebkit-5.212-add-missing-include-functional.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libGL-devel BuildRequires: libX11-devel BuildRequires: libXcomposite-devel -BuildRequires: libXext-devel BuildRequires: libXrender-devel BuildRequires: libgcc BuildRequires: libglib-devel BuildRequires: libgst-plugins-base-devel BuildRequires: libgstreamer-devel +BuildRequires: libhyphen-devel BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -33,6 +34,7 @@ BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END +BuildRequires: libqt5-devel >= 5.12 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -42,6 +44,7 @@ A Qt based web browser engine. Group: System/Libraries Summary: Qt based web browser engine libraries Provides: libQt5WebKitWidgets +Obsoletes: libQt5WebKitWidgets %description -n libQt5WebKit A Qt based web browser engine. @@ -60,18 +63,31 @@ This package contains libraries and header files for developing applications tha %debug_package %prep -%setup -q -n qtwebkit-opensource-src-%{version} +%setup -q -n qtwebkit-everywhere-src-%{version} #-D -T -%patch0 -p1 +#:<< _EOF +#%patch0 -p1 +%patch1 -p1 %build #:<< _EOF -qmake-qt5 -%make +#qmake-qt5 +%cmake -d build \ + -DPORT="Qt" \ + -DCMAKE_CXX_FLAGS="-fpermissive" \ + -DKDE_INSTALL_LIBEXECDIR=%{_libdir}/qt5/libexec \ + -DKDE_INSTALL_QMLDIR=%{_libdir}/qt5/qml \ + -DECM_MKSPECS_INSTALL_DIR=%{_libdir}/qt5/mkspecs/modules \ + -DKDE_INSTALL_INCLUDEDIR=%{_includedir}/qt5 \ +%ifarch arm + -DENABLE_JIT=OFF +%endif + +%make -j1 %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall INSTALL_ROOT=%{buildroot} +%makeinstall -C build INSTALL_ROOT=%{buildroot} %find_lang %{name} || touch %{name}.lang @@ -87,6 +103,8 @@ qmake-qt5 %{_libdir}/libQt5WebKitWidgets.so.* %{_libdir}/qt5/libexec/QtWebPluginProcess %{_libdir}/qt5/libexec/QtWebProcess +%{_libdir}/qt5/libexec/QtWebNetworkProcess +%{_libdir}/qt5/libexec/QtWebStorageProcess %dir %{_libdir}/qt5/qml/QtWebKit %{_libdir}/qt5/qml/QtWebKit/* @@ -98,16 +116,23 @@ qmake-qt5 %{_includedir}/qt5/QtWebKitWidgets/* %dir %{_libdir}/cmake/Qt5WebKit %{_libdir}/cmake/Qt5WebKit/Qt5WebKit*.cmake -%{_libdir}/libQt5WebKit*.la -%{_libdir}/libQt5WebKit*.prl %{_libdir}/libQt5WebKit*.so %{_libdir}/pkgconfig/Qt5WebKit.pc %{_libdir}/pkgconfig/Qt5WebKitWidgets.pc %{_libdir}/qt5/mkspecs/modules/qt_lib_webkit*.pri %dir %{_libdir}/cmake/Qt5WebKitWidgets %{_libdir}/cmake/Qt5WebKitWidgets/Qt5WebKit*.cmake +%dir %{_libdir}/cmake/Qt5WebKit +%{_libdir}/cmake/Qt5WebKit/WebKit*.cmake %changelog +* Thu Jan 03 2019 Silvan Calarco 5.212-2mamba +- rebuilt with libqt5 5.12 + +* Tue Sep 25 2018 Silvan Calarco 5.212-1mamba +- update to 5.212 +- also obsolete libQt5WebKitWidgets + * Thu Oct 26 2017 Silvan Calarco 5.9.0-1mamba - update to 5.9.0