diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-05 05:04:30 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-05 20:12:56 +0000 |
| commit | b2997ede702a824a09454b6adc6a03dd196095b0 (patch) | |
| tree | 63f74ad3cba82746350bf6c356614942c7b6a05b /user/qt5-qtwebkit | |
| parent | e8b8cc7a82a7210586c86d0c478a7497500cfff2 (diff) | |
| download | packages-b2997ede702a824a09454b6adc6a03dd196095b0.tar.gz packages-b2997ede702a824a09454b6adc6a03dd196095b0.tar.bz2 packages-b2997ede702a824a09454b6adc6a03dd196095b0.tar.xz packages-b2997ede702a824a09454b6adc6a03dd196095b0.zip | |
user/qt5-qtwebkit: Fix CMake issues
Diffstat (limited to 'user/qt5-qtwebkit')
| -rw-r--r-- | user/qt5-qtwebkit/APKBUILD | 2 | ||||
| -rw-r--r-- | user/qt5-qtwebkit/cmake.patch | 60 |
2 files changed, 62 insertions, 0 deletions
diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD index 825921553..45f739573 100644 --- a/user/qt5-qtwebkit/APKBUILD +++ b/user/qt5-qtwebkit/APKBUILD @@ -23,6 +23,7 @@ subpackages="$pkgname-dev" #source="https://github.com/qtwebkit/qtwebkit/releases/download/$_realname-$_realver/$_realname-$_realver.tar.xz source="https://distfiles.adelielinux.org/source/$_realname-$_realver.tar.xz bug-931.patch + cmake.patch ppc-llint.patch " builddir="$srcdir"/$_realname-$_realver @@ -73,4 +74,5 @@ package() { sha512sums="ec009773953b9f3e2c0e47072cd678f7044b16219c85879a6031c109c7b2b84f426564bb673ccaafa0bcc3f7a656e3cb0d8e3be28d3bbfb401adcd1a6b8b9edd qt5-qtwebkit-5.212.0-git20191114.tar.xz 85adb979eb5d58ccab85d07d6a6db470b34bdb6fd8af2eef04ce268da41a596b4a19295c97dca1201daf4a51ca9e183bb27dd36b9b12b0e149224793d1c190a9 bug-931.patch +4ee26787bf01f3067fae51e1942b72d783629b13fe13ffcfba9329bbea823de7b751905f01c71c6c498164cb41a33765debce375a034dde83e3f784d6e549ada cmake.patch 0b358e4df16e8792c995a385386bfe9e197e23854f30129b504d3ba851cdfab3a2adef462a6ae3a775ec01d02cd67ef404259491339336c6ce896d7940597c95 ppc-llint.patch" diff --git a/user/qt5-qtwebkit/cmake.patch b/user/qt5-qtwebkit/cmake.patch new file mode 100644 index 000000000..a41be9ce4 --- /dev/null +++ b/user/qt5-qtwebkit/cmake.patch @@ -0,0 +1,60 @@ +--- qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake.old 2019-11-14 19:31:45.000000000 +0000 ++++ qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake 2020-01-04 20:53:20.522367347 +0000 +@@ -99,8 +99,8 @@ + set(Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \"\") + set(Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \"\") # FIXME: Support private headers + +-get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES) +-get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS) ++get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@FULL_MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES) ++get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@FULL_MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS) + + foreach (_module_dep \${_Qt5@MODULE_NAME@_MODULE_DEPENDENCIES}) + list(APPEND Qt5@MODULE_NAME@_INCLUDE_DIRS \${Qt5\${_module_dep}_INCLUDE_DIRS}) +@@ -117,6 +117,7 @@ + ") + + set(MODULE_NAME WebKit) ++set(FULL_MODULE_NAME WebKitLegacy) + string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY) + ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfig.cmake" +@@ -124,6 +125,7 @@ + ) + + set(MODULE_NAME WebKitWidgets) ++set(FULL_MODULE_NAME WebKitWidgets) + string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY) + ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitWidgetsConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfig.cmake" +@@ -154,18 +154,18 @@ + ) + + # QTFIXME +-#install(EXPORT WebKitTargets +-# FILE WebKitTargets.cmake +-# NAMESPACE Qt5:: +-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit" +-# COMPONENT Data +-#) +-#install(EXPORT Qt5WebKitWidgetsTargets +-# FILE Qt5WebKitWidgetsTargets.cmake +-# NAMESPACE Qt5:: +-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets" +-# COMPONENT Data +-#) ++install(EXPORT WebKitTargets ++ FILE WebKitTargets.cmake ++ NAMESPACE Qt5:: ++ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit" ++ COMPONENT Data ++) ++install(EXPORT Qt5WebKitWidgetsTargets ++ FILE Qt5WebKitWidgetsTargets.cmake ++ NAMESPACE Qt5:: ++ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets" ++ COMPONENT Data ++) + + # Documentation + |