- disable seccomp by default (broken in this version, non-existing header is referenced)

- added docs patch (cmake fixes for docs targets), enable doc by default

diff --git a/qt5-qtwebkit-docs.patch b/qt5-qtwebkit-docs.patch
new file mode 100644 (file)
index 0000000..19434ff
--- /dev/null
+++ b/qt5-qtwebkit-docs.patch
@@ -0,0 +1,34 @@
+--- ../BUILD/qtwebkit-5.212.0-alpha4/Source/PlatformQt.cmake.orig      2020-03-04 18:16:37.000000000 +0100
++++ ../BUILD/qtwebkit-5.212.0-alpha4/Source/PlatformQt.cmake   2020-12-23 20:33:52.256635105 +0100
+@@ -254,22 +254,22 @@
+     set(NEED_ALL "")
+ endif ()
+ 
+-set(EXPORT_VARS_COMMANDS
+-    COMMAND ${EXPORT_VAR} "QT_INSTALL_DOCS=${QT_INSTALL_DOCS}"
+-    COMMAND ${EXPORT_VAR} "QT_VER=${PROJECT_VERSION_STRING}"
+-    COMMAND ${EXPORT_VAR} "QT_VERSION=${PROJECT_VERSION_STRING}"
+-    COMMAND ${EXPORT_VAR} "QT_VERSION_TAG=${PROJECT_VERSION_TAG}"
++set(EXPORT_VARS
++    "QT_INSTALL_DOCS=${QT_INSTALL_DOCS}"
++    "QT_VER=${PROJECT_VERSION_STRING}"
++    "QT_VERSION=${PROJECT_VERSION_STRING}"
++    "QT_VERSION_TAG=${PROJECT_VERSION_TAG}"
++    "BUILDDIR=${CMAKE_BINARY_DIR}"
+ )
++get_target_property(QDOC Qt5::qdoc IMPORTED_LOCATION)
+ 
+ add_custom_target(prepare_docs ${NEED_ALL}
+-    ${EXPORT_VARS_COMMANDS}
+-    COMMAND Qt5::qdoc ${QDOC_CONFIG} -prepare -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} -no-link-errors
++    COMMAND ${CMAKE_COMMAND} -E env ${EXPORT_VARS} ${QDOC} ${QDOC_CONFIG} -prepare -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS} -no-link-errors
+     VERBATIM
+ )
+ 
+ add_custom_target(generate_docs ${NEED_ALL}
+-    ${EXPORT_VARS_COMMANDS}
+-    COMMAND Qt5::qdoc ${QDOC_CONFIG} -generate -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS}
++    COMMAND ${CMAKE_COMMAND} -E env ${EXPORT_VARS} ${QDOC} ${QDOC_CONFIG} -generate -outputdir "${DOC_OUTPUT_DIR}/qtwebkit" -installdir ${DOC_INSTALL_DIR} -indexdir ${QT_INSTALL_DOCS}
+     VERBATIM
+ )
+ add_dependencies(generate_docs prepare_docs)

diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index b437cfb17cf0685f569fed1779c09ed0b7dadd2a..ceb8a5793bd04dd61f4e03943d0d6087aeee9a9f 100644 (file)
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -4,10 +4,10 @@
 # Conditional build:
 %bcond_with    bootstrap       # disable features to able to build without installed qt5
 # -- build targets
-%bcond_with    doc             # Documentation
+%bcond_without doc             # documentation
 # -- features
 %bcond_with    qtmultimedia    # QtMultimedia support (instead of GStreamer)
-%bcond_without seccomp         # WebProcess seccomp filters
+%bcond_with    seccomp         # WebProcess seccomp filters (broken as of 5.212.0-alpha4)
 
 %if %{with bootstrap}
 %undefine      with_doc
@@ -41,6 +41,7 @@ Group:                X11/Libraries
 Source0:       https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-%{version}-%{snap}/qtwebkit-%{version}-%{snap}.tar.xz
 # Source0-md5: 5b61a72497f06e51db09d57edc3c35fb
 Patch0:                %{name}-css.patch
+Patch1:                %{name}-docs.patch
 # from FC
 Patch102:      qtwebkit-5.212.0_cmake_cmp0071.patch
 Patch108:      x32.patch
@@ -188,6 +189,7 @@ Dokumentacja do bibliotek Qt5 WebKit w formacie QCH.
 %prep
 %setup -q -n qtwebkit-%{version}-%{snap}
 %patch0 -p1
+%patch1 -p1
 %patch102 -p1
 %patch108 -p1
 
@@ -223,25 +225,11 @@ cmake \
 
 %{__make}
 
-%if %{with doc}
-%{__make} docs \
-       BUILDDIR=$(pwd) \
-       QT_INSTALL_DOCS=%{_docdir}/qt5-doc \
-       QT_VERSION=%{version} \
-       QT_VERSION_TAG="%(echo %{version} | tr -d .)" \
-       QT_VER="%(rpm -q qt5-build --qf '%{V}' | cut -d. -f1-2)"
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C build install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       BUILDDIR=$(pwd) \
-       QT_INSTALL_DOCS=%{_docdir}/qt5-doc \
-       QT_VERSION=%{version} \
-       QT_VERSION_TAG="%(echo %{version} | tr -d .)" \
-       QT_VER="%(rpm -q qt5-build --qf '%{V}' | cut -d. -f1-2)"
+       DESTDIR=$RPM_BUILD_ROOT
 
 # normalize paths
 %{__sed} -i -e '/^Libs:/ s,-L/[^ ]*,-L%{_libdir},' \