Index: head/www/qt5-webkit/Makefile =================================================================== --- head/www/qt5-webkit/Makefile (revision 481433) +++ head/www/qt5-webkit/Makefile (revision 481434) @@ -1,53 +1,53 @@ # $FreeBSD$ PORTNAME= webkit DISTVERSION= 5.212.0-alpha2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= www MASTER_SITES= https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/ PKGNAMEPREFIX= qt5- DISTNAME= qt${PORTNAME}-${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= QtWebKit with a more modern WebKit code base LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libgstapp-1.0.so:multimedia/gstreamer1-plugins \ libgstbase-1.0.so:multimedia/gstreamer1 \ libhyphen.so:textproc/hyphen \ libicui18n.so:devel/icu \ libpng.so:graphics/png \ libwebp.so:graphics/webp USES= bison cmake:outsource gperf jpeg pathfix perl5 pkgconfig \ python:2.7,build qt:5 sqlite:3 tar:xz USE_GNOME= glib20 libxml2 libxslt USE_GSTREAMER1= core USE_QT= core gui location network opengl printsupport \ qml quick sensors testlib webchannel widgets \ buildtools_build qmake_build USE_RUBY= yes USE_XORG= x11 xcomposite xrender # Fix pkgconfig install paths. PATHFIX_CMAKELISTSTXT= PlatformQt.cmake RUBY_NO_RUN_DEPENDS= yes CMAKE_ARGS= -DPORT:STRING="Qt" \ -DKDE_INSTALL_INCLUDEDIR:PATH="${QT_INCDIR_REL}" \ -DKDE_INSTALL_LIBDIR:PATH="${QT_LIBDIR_REL}" CMAKE_ON= ENABLE_OPENGL CMAKE_OFF= USE_QT_MULTIMEDIA USE_LD_GOLD # Add -DNDEBUG to CXXFLAGS which in turn gets sucked into # CMAKE_CXX_FLAGS_RELEASE where we actually want to have it. # [for the ASSERT in Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp ] CXXFLAGS+= -DNDEBUG PLIST_SUB= FULLVER="${PORTVERSION:R}" SUB_FILES= pkg-install SUB_LIST= QT_INCDIR="${QT_INCDIR}" .include Index: head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake =================================================================== --- head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake (revision 481433) +++ head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake (revision 481434) @@ -1,18 +1,42 @@ ---- Source/WebKit/PlatformQt.cmake.orig 2017-06-15 23:36:48 UTC +commit 14947c04b3c19b5eb04a683081742b14c1d32786 +Author: Konstantin Tokarev +Date: Sat Oct 7 17:38:32 2017 +0300 + + [cmake] Fix build with CMake 3.10: -frtti was enabled for wrong file path + + Change-Id: I65d4f491f21c17f6d99a14259988d2ddb0d67105 + +--- Source/WebKit/PlatformQt.cmake.orig 2018-10-07 07:18:38 UTC +++ Source/WebKit/PlatformQt.cmake @@ -481,6 +481,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) BASE_NAME Qt5WebKit DEPS "${WEBKIT_PKGCONGIG_DEPS}" FILENAME_VAR WebKit_PKGCONFIG_FILENAME -+ DESCRIPTION "Qt WebKit module" ++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" + DESCRIPTION "Qt WebKit module" ) - set(ECM_PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") - install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) -@@ -671,6 +672,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) + set(ECM_PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" CACHE PATH "The directory where pkgconfig will be installed to.") +@@ -672,6 +673,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) BASE_NAME Qt5WebKitWidgets DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME -+ DESCRIPTION "Qt WebKitWidgets module" ++ INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" + DESCRIPTION "Qt WebKitWidgets module" ) install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) - endif () +@@ -788,6 +790,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 +@@ -797,7 +800,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