svn commit: r481440 - head/www/qt5-webkit/files
Tobias C. Berner
tcberner at FreeBSD.org
Sun Oct 7 11:27:05 UTC 2018
Author: tcberner
Date: Sun Oct 7 11:27:03 2018
New Revision: 481440
URL: https://svnweb.freebsd.org/changeset/ports/481440
Log:
www/qt5-webkit: fix patches
- follow up to r481434, make the patch apply on the official tree...
Pointy hat: tcberner
Deleted:
head/www/qt5-webkit/files/patch-git_14947c-fix_build_cmake_3.10
Modified:
head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
Modified: head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
==============================================================================
--- head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake Sun Oct 7 10:58:42 2018 (r481439)
+++ head/www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake Sun Oct 7 11:27:03 2018 (r481440)
@@ -6,25 +6,27 @@ Date: Sat Oct 7 17:38:32 2017 +0300
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
@@ -32,7 +34,7 @@ Date: Sat Oct 7 17:38:32 2017 +0300
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
More information about the svn-ports-all
mailing list