From 925f041ccc1e56a4a535335828057fa882b2b424 Mon Sep 17 00:00:00 2001 From: caspar Date: Wed, 8 Jun 2022 17:52:06 +0000 Subject: [PATCH] Remove Qt5WebKit/cmake patches now that Qt5WebKit port fixes build with cmake >= 3.23 by itself. OK rsadowski@ --- databases/kexi/patches/patch-CMakeLists_txt | 9 --------- devel/kf5/kdewebkit/patches/patch-CMakeLists_txt | 12 ------------ devel/kreport/patches/patch-CMakeLists_txt | 12 ------------ .../patches/patch-src_libs_core_CMakeLists_txt | 12 ------------ .../patches/patch-src_libs_ui_CMakeLists_txt | 10 ---------- geo/qgis/patches/patch-CMakeLists_txt | 9 --------- net/qsyncthingtray/patches/patch-CMakeLists_txt | 12 ------------ .../libalkimia/patches/patch-CMakeLists_txt | 12 ------------ .../umbrello/patches/patch-CMakeLists_txt | 16 ---------------- 9 files changed, 104 deletions(-) delete mode 100644 devel/kf5/kdewebkit/patches/patch-CMakeLists_txt delete mode 100644 devel/kreport/patches/patch-CMakeLists_txt delete mode 100644 devel/zeal/patches/patch-src_libs_core_CMakeLists_txt delete mode 100644 devel/zeal/patches/patch-src_libs_ui_CMakeLists_txt delete mode 100644 net/qsyncthingtray/patches/patch-CMakeLists_txt delete mode 100644 productivity/libalkimia/patches/patch-CMakeLists_txt delete mode 100644 x11/kde-applications/umbrello/patches/patch-CMakeLists_txt diff --git a/databases/kexi/patches/patch-CMakeLists_txt b/databases/kexi/patches/patch-CMakeLists_txt index 9f53509166d..e06101077b5 100644 --- a/databases/kexi/patches/patch-CMakeLists_txt +++ b/databases/kexi/patches/patch-CMakeLists_txt @@ -1,15 +1,6 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -106,7 +106,7 @@ set_package_properties(KF5Crash PROPERTIES TYPE OPTION - PURPOSE "Used to provide crash reporting on Linux") - - set(REQUIRED_QT_VERSION 5.4.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test) -+find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Widgets Xml Network PrintSupport Test Sensors) - find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS UiTools WebKit WebKitWidgets) - - # use sane compile flags @@ -198,8 +198,8 @@ endif() ## ## Test for marble diff --git a/devel/kf5/kdewebkit/patches/patch-CMakeLists_txt b/devel/kf5/kdewebkit/patches/patch-CMakeLists_txt deleted file mode 100644 index ab81423223d..00000000000 --- a/devel/kf5/kdewebkit/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -16,7 +16,7 @@ option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Desig - add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") - - set(REQUIRED_QT_VERSION 5.15.2) --find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Widgets WebKitWidgets Network) -+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Widgets WebKitWidgets WebChannel Network Positioning Sensors Quick) - include(KDEInstallDirs) - include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - include(KDECMakeSettings) diff --git a/devel/kreport/patches/patch-CMakeLists_txt b/devel/kreport/patches/patch-CMakeLists_txt deleted file mode 100644 index 486e46baec7..00000000000 --- a/devel/kreport/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -37,7 +37,7 @@ set(REQUIRED_KPROPERTY_VERSION 3.2.0) - - # Required components to build this framework - # TODO move Widgets/KF5WidgetsAddons-dependent part to a libKReportDesigner --find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Xml PrintSupport) -+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets Xml PrintSupport Sensors) - find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED CoreAddons WidgetsAddons GuiAddons Config) - find_package(KPropertyWidgets ${REQUIRED_KPROPERTY_VERSION} COMPONENTS KF) - set_package_properties(KPropertyWidgets PROPERTIES TYPE REQUIRED diff --git a/devel/zeal/patches/patch-src_libs_core_CMakeLists_txt b/devel/zeal/patches/patch-src_libs_core_CMakeLists_txt deleted file mode 100644 index 5362a436265..00000000000 --- a/devel/zeal/patches/patch-src_libs_core_CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/libs/core/CMakeLists.txt ---- src/libs/core/CMakeLists.txt.orig -+++ src/libs/core/CMakeLists.txt -@@ -9,7 +9,7 @@ add_library(Core - - target_link_libraries(Core Registry Ui) - --find_package(Qt5 COMPONENTS Network WebKit Widgets REQUIRED) -+find_package(Qt5 COMPONENTS Network WebKit Widgets Sensors Positioning Quick WebChannel REQUIRED) - target_link_libraries(Core Qt5::Network Qt5::WebKit Qt5::Widgets) - - find_package(LibArchive REQUIRED) diff --git a/devel/zeal/patches/patch-src_libs_ui_CMakeLists_txt b/devel/zeal/patches/patch-src_libs_ui_CMakeLists_txt deleted file mode 100644 index af3aecba2f6..00000000000 --- a/devel/zeal/patches/patch-src_libs_ui_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ -Index: src/libs/ui/CMakeLists.txt ---- src/libs/ui/CMakeLists.txt.orig -+++ src/libs/ui/CMakeLists.txt -@@ -31,5 +31,5 @@ add_library(Ui - - target_link_libraries(Ui QxtGlobalShortcut Registry) - --find_package(Qt5 COMPONENTS WebKitWidgets REQUIRED) -+find_package(Qt5 COMPONENTS WebKitWidgets Sensors Positioning Quick WebChannel REQUIRED) - target_link_libraries(Ui Qt5::WebKitWidgets) diff --git a/geo/qgis/patches/patch-CMakeLists_txt b/geo/qgis/patches/patch-CMakeLists_txt index 6ec64f200f7..c5a415c0b58 100644 --- a/geo/qgis/patches/patch-CMakeLists_txt +++ b/geo/qgis/patches/patch-CMakeLists_txt @@ -14,12 +14,3 @@ Index: CMakeLists.txt find_package(BISON REQUIRED) ############################################################# -@@ -449,7 +449,7 @@ if(WITH_CORE) - set (HAVE_QT5SERIALPORT TRUE) - endif() - -- find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test UiTools Sql REQUIRED) -+ find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test UiTools Sql Sensors Quick WebChannel REQUIRED) - if (WITH_QT6) - find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat REQUIRED) - else() diff --git a/net/qsyncthingtray/patches/patch-CMakeLists_txt b/net/qsyncthingtray/patches/patch-CMakeLists_txt deleted file mode 100644 index 0e48a4faff9..00000000000 --- a/net/qsyncthingtray/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -12,7 +12,7 @@ set(CMAKE_AUTOMOC ON) - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - --find_package(Qt5 5.6 COMPONENTS Widgets Network PrintSupport) -+find_package(Qt5 5.6 COMPONENTS Widgets Network PrintSupport Positioning Sensors Quick WebChannel) - if (NOT Qt5_FOUND) - message(FATAL_ERROR - "Some components of Qt5 not found (see above messages for details. " diff --git a/productivity/libalkimia/patches/patch-CMakeLists_txt b/productivity/libalkimia/patches/patch-CMakeLists_txt deleted file mode 100644 index c67a761e0ec..00000000000 --- a/productivity/libalkimia/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,12 +0,0 @@ -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -108,7 +108,7 @@ else() - find_package(Qt5 REQUIRED COMPONENTS - Core - Test -- ${QT_BROWSER_COMPONENT} -+ ${QT_BROWSER_COMPONENT} Positioning Sensors Quick WebChannel - Qml - ) - diff --git a/x11/kde-applications/umbrello/patches/patch-CMakeLists_txt b/x11/kde-applications/umbrello/patches/patch-CMakeLists_txt deleted file mode 100644 index 0fc864e8fb5..00000000000 --- a/x11/kde-applications/umbrello/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,16 +0,0 @@ -Fix CMake WebKitTargets - -Index: CMakeLists.txt ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -98,6 +98,10 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS - Core - Gui - PrintSupport -+ Sensors -+ Positioning -+ Quick -+ WebChannel - Svg - Test - Widgets