Index: head/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10 =================================================================== --- head/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10 (revision 481439) +++ head/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10 (nonexistent) @@ -1,28 +0,0 @@ -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 - -diff --git Source/WebKit/PlatformQt.cmake Source/WebKit/PlatformQt.cmake -index 61433257a76..edfa57e97ac 100644 ---- Source/WebKit/PlatformQt.cmake -+++ Source/WebKit/PlatformQt.cmake -@@ -795,6 +795,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 -@@ -804,7 +805,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 Property changes on: head/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake =================================================================== --- head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake (revision 481439) +++ head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake (revision 481440) @@ -1,42 +1,44 @@ 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.orig 2018-10-07 11:03:32 UTC +++ Source/WebKit/PlatformQt.cmake -@@ -481,6 +481,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS) +@@ -481,6 +481,8 @@ if (NOT MACOS_BUILD_FRAMEWORKS) BASE_NAME Qt5WebKit DEPS "${WEBKIT_PKGCONGIG_DEPS}" FILENAME_VAR WebKit_PKGCONFIG_FILENAME + INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" - DESCRIPTION "Qt WebKit module" ++ DESCRIPTION "Qt WebKit module" ) 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) + install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) +@@ -671,6 +673,8 @@ if (NOT MACOS_BUILD_FRAMEWORKS) BASE_NAME Qt5WebKitWidgets DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS}" FILENAME_VAR WebKitWidgets_PKGCONFIG_FILENAME + INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" - DESCRIPTION "Qt WebKitWidgets module" ++ DESCRIPTION "Qt WebKitWidgets module" ) install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data) -@@ -788,6 +790,7 @@ if (COMPILER_IS_GCC_OR_CLANG) + endif () +@@ -786,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) +@@ -795,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