diff options
| author | tcberner <tcberner@FreeBSD.org> | 2018-10-07 15:53:36 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2018-10-07 15:53:36 +0800 |
| commit | a2b0283958af260bca2ab74140b73cbd5c503cdd (patch) | |
| tree | 3bbd3e0de66b81fd34fe5ca446b8cab42547e428 /www/qt5-webkit/files | |
| parent | 05c09c9f0a3bdfe4cd09abfde94acd32a9b8f1b1 (diff) | |
| download | freebsd-ports-gnome-a2b0283958af260bca2ab74140b73cbd5c503cdd.tar.gz freebsd-ports-gnome-a2b0283958af260bca2ab74140b73cbd5c503cdd.tar.zst freebsd-ports-gnome-a2b0283958af260bca2ab74140b73cbd5c503cdd.zip | |
www/qt5-webkit: fix installed pkg config files
PR: 231108
Obtained from: https://src.mouf.net/area51/view/branches/plasma5/PORTS/www/qt5-webkit-annulen-wk2/files/patch-Source_WebKit_PlatformQt.cmake?rev=13782
Diffstat (limited to 'www/qt5-webkit/files')
| -rw-r--r-- | www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake b/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake index 45c24851f226..eb0de7605a66 100644 --- a/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake +++ b/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake @@ -1,18 +1,42 @@ ---- Source/WebKit/PlatformQt.cmake.orig 2017-06-15 23:36:48 UTC +commit 14947c04b3c19b5eb04a683081742b14c1d32786 +Author: Konstantin Tokarev <annulen@yandex.ru> +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 |