summaryrefslogtreecommitdiff
path: root/kde-frameworks/kdelibs4support
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/kdelibs4support')
-rw-r--r--kde-frameworks/kdelibs4support/Manifest12
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin-1.patch183
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch23
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch (renamed from kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch)54
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch51
-rw-r--r--kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch51
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild7
-rw-r--r--kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild (renamed from kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild)16
8 files changed, 123 insertions, 274 deletions
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 7409827d4d0a..9c4c43b5cbaa 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,8 +1,8 @@
-AUX kdelibs4support-5.77.0-no-kdesignerplugin-1.patch 6784 BLAKE2B ca21bec7937efb52525439c0943468e698035c42673e7477f7845c6eceaba7255a46f9b6b01b8c8281b9d374a825c65ec1fe837d93890ba9a96aea973a6cada0 SHA512 d0a19539e0a479f3972917dfcd73a218a443c7c05d93be14b1828e77f83b0c9053572a1a8fd4f198902aa7910dfe40441221e391ec73468d01eda21ad8f15845
-AUX kdelibs4support-5.77.0-no-kdesignerplugin.patch 918 BLAKE2B fc84429d5ad857aa54664153a9221a6141389a169988f3fad018a8e5cab9b9d8ead4f9759388b7c3965c94e0fab5929c2576229ad4535e387279c6e7311dbbc7 SHA512 6033cdc41d0d15ca8c8a62923abe4729a471ebb37a7edd41d51d4a4cb8f46346b2940d8e582328c4872953a15040eabbfe20b6fa88a5505e9a0eb1c3e8b8b3b1
-AUX kdelibs4support-5.79.0-no-kdesignerplugin.patch 7385 BLAKE2B de4aee961626019e21483e96381e5dd3a78c829e74b34de2ea81d40bda122345d69203e77aa7e2f6349ee352313a9faf91167af6d1046c5588e95262ebe8553c SHA512 4b0505cfba528e16c56056d18f18522ab8a2233224ffeedfeb9062a1def8b85e7d5cb613aea4083f83f2d5979c48591c0b4c99417cd3bc945b7a6da74d475688
-DIST kdelibs4support-5.77.0.tar.xz 3546468 BLAKE2B c55686f09ddc6f06bd96f6a93906fd6e03b482b66c960644ca6a859f6f8cc851740c81098241063f692cbcb7458bcf36f4453d24380df35fc22cb5f7effea764 SHA512 4b7577d44c0062561d2d315905ee7789595e402213f5508677a3362d3371d40f3c0d2d216dbece712467470aa58128226b797cbc11e39cc4b54779c4bfbac9f4
+AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff
+AUX kdelibs4support-5.80.0-unused-dep.patch 1693 BLAKE2B e4757501ae07b954d7c9010b219d7a233d3d12dbb0c48a72b2f28ae83ad94787290a638f8304624c93ec122f106994d0145ce13de2523c1cc011a1ab274bd80d SHA512 42719d2d8fefcbbf2a0ed0a7cb9d86150973cbf609494834a5a953af214c52098665d1c0aa95404a357ec4e8377d6a76b9c8c4593bfe2c87927368d4e2e6ae77
+AUX kdelibs4support-5.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e9144e69d9011215567dd3a6691e1f1484dedd8c314a10d01c39d2e945eb61a3ddc41a0304f89e9f6f7840fc0f9161bf0a3d4e4829 SHA512 f0b9cd6dd6f97e3d3747a1241221e01b43c31dfba7eb398c33f3515a5a8609e0c12ad2be64df89ea74b7ab95eadb0a8768cb7706b98df6201cd50294c198de8c
DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09
-EBUILD kdelibs4support-5.77.0.ebuild 2493 BLAKE2B 21619bda5e5518c0af8f60663376f2b8b2e0991f02d6bab57f17b5ff6f89f84d431fcc85947b6efa50bde462b8ebf9b117fcc708a85c2223a3f088c8d973df01 SHA512 0f0d08a75e35e843abe08ce2e1b21d5da8bf0f714c56a7e1cb6435fc8f2d6349fae09a8b7830f22ac602377b4cc5db62374eed75fddaf24266665b9028bab3a7
-EBUILD kdelibs4support-5.80.0.ebuild 2442 BLAKE2B de5c50fcfdc70262e1188c8d5303e0619203fbc57a6898bf3ccb0d3d3eb705cb711327b9ab4e714e1fe3ee4717659c4fd4e4be2c565941307feaa3fdebb9f6da SHA512 f3d5683b29585e3a12405b437a7855445e913d6885a836cbd69896e04ba63ae1a3edd021ae9754bb2c0f6d0bf9f2622ddf3b4199f2f38a402ea81bb8f7016a4f
+DIST kdelibs4support-5.81.0.tar.xz 3552860 BLAKE2B 9322860fb7abdca317b34f51c6ed2d89ea55597391e4547c10ae365e1553dffbbe35366e3fefc0679fe72d29a1c43d47a077cf7b3d0580e16079090a9760ccc4 SHA512 4c86d28df61268ce174947b3f203001b20c91d155f1476ca3210ffe25a9f28a9ca39a5de5b21e6522d6c89eea956a4c1b285c963d5ae07234e8b6f8637847c7e
+EBUILD kdelibs4support-5.80.0.ebuild 2469 BLAKE2B 3401aa1e114112e87631206e1bff32f699e2d7ad3a2f32d9b643098311b333823956a30e7218043bef1b02c020c85870c689915d41a9892431de31a027940f8e SHA512 cd5a5eefc19aa139ea80487982bd4fae87a42e863a09c07db577af4199d6acf594b4caf9c86fcf65b3a88a93f9c0ed7d7e0dc0fe3656508077eaee5078829f4a
+EBUILD kdelibs4support-5.81.0.ebuild 2553 BLAKE2B bc1b9bbc2510e82a2e726b4489eb2bd63f69cbb28c3d9583d01a295051233b53fb2a006431e0e7f28e2ac327de8ce53f6f7643fa39d427e2039ae781e8518658 SHA512 1873c1a7182feba18da6b9fedfc284ea41d7dab52d2cbf1d259f41a4d3488f07bcc37f1da8f52a2041aa23853fb1dc4d1b19dfbdfcfe31c3881e624a30165693
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin-1.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin-1.patch
deleted file mode 100644
index 8bdd30dd47ab..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin-1.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From a97b01b220e6ef08d1517fea76fdaddb84a9773e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:25:06 +0100
-Subject: [PATCH 1/2] Drop KDE4_ADD_WIDGET_FILES macro and KF5DesignerPlugin
- dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 1 -
- KF5KDELibs4SupportConfig.cmake.in | 1 -
- cmake/modules/FindKDE4Internal.cmake | 4 ----
- cmake/modules/KDE4Macros.cmake | 2 --
- src/CMakeLists.txt | 19 -------------------
- src/KDEUIMacros.cmake | 25 -------------------------
- 6 files changed, 52 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f4b6d33..20a27b52 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -26,7 +26,6 @@ find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5DesignerPlugin ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED)
-diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
-index b5194f94..5e16c780 100644
---- a/KF5KDELibs4SupportConfig.cmake.in
-+++ b/KF5KDELibs4SupportConfig.cmake.in
-@@ -11,7 +11,6 @@ find_dependency(KF5Archive "@KF5_DEP_VERSION@")
- find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@")
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
- find_dependency(KF5Crash "@KF5_DEP_VERSION@")
--find_dependency(KF5DesignerPlugin "@KF5_DEP_VERSION@")
- find_dependency(KF5DocTools "@KF5_DEP_VERSION@")
- find_dependency(KF5Emoticons "@KF5_DEP_VERSION@")
- find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@")
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 7e252a70..b9636036 100644
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -179,10 +179,6 @@
- # Use optional USE_RELATIVE_PATH to generate the classes in the build following the given
- # relative path to the file.
- #
--# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
--# Use this to add widget description files for the makekdewidgets code generator
--# for Qt Designer plugins.
--#
- # KDE4_ADD_PLUGIN ( name [WITH_PREFIX] file1 ... fileN )
- # Create a KDE plugin (KPart, kioslave, etc.) from the given source files.
- # If WITH_PREFIX is given, the resulting plugin will have the prefix "lib", otherwise it won't.
-diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
-index ca868ad9..27bb28f9 100644
---- a/cmake/modules/KDE4Macros.cmake
-+++ b/cmake/modules/KDE4Macros.cmake
-@@ -10,7 +10,6 @@
- # KDE4_ADD_KDEINIT_EXECUTABLE
- # KDE4_ADD_UNIT_TEST
- # KDE4_ADD_EXECUTABLE
--# KDE4_ADD_WIDGET_FILES
- # KDE4_UPDATE_ICONCACHE
- # KDE4_INSTALL_ICONS
- # KDE4_REMOVE_OBSOLETE_CMAKE_FILES
-@@ -486,7 +485,6 @@ include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
- include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
--include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
-
- # functions deprecated, they still should work
- macro (KDE4_AUTH_INSTALL_ACTIONS)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b249bd53..3ed8114d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -371,25 +371,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES
- )
-
-
--########## Designer plugin
--
--kf5designerplugin_add_plugin(kf5deprecatedwidgets
-- kdedeprecated.widgets
-- kdedeprecated.qrc
-- classpreviews.cpp
--)
--
--target_link_libraries(kf5deprecatedwidgets KF5::KDELibs4Support
-- Qt5::Widgets
-- Qt5::Designer
-- KF5::ConfigCore
-- KF5::Completion
-- KF5::WidgetsAddons
-- KF5::Auth
-- )
--
--install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer)
--
- ##########
-
- add_subdirectory(pics)
-diff --git a/src/KDEUIMacros.cmake b/src/KDEUIMacros.cmake
-index 1570df34..e255960d 100644
---- a/src/KDEUIMacros.cmake
-+++ b/src/KDEUIMacros.cmake
-@@ -163,31 +163,6 @@ macro (KDE4_INSTALL_ICONS _defaultpath )
- endmacro (KDE4_INSTALL_ICONS)
-
-
--set(KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE ${KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE})
--set(_KDE4_MAKEKDEWIDGETS_DEP ${_KF5DESIGNERPLUGIN_GENERATOR_EXECUTABLE_DEP})
--macro (KDE4_ADD_WIDGET_FILES _sources)
-- foreach (_current_FILE ${ARGN})
--
-- get_filename_component(_input ${_current_FILE} ABSOLUTE)
-- get_filename_component(_basename ${_input} NAME_WE)
-- set(_source ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.cpp)
-- set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}widgets.moc)
--
-- # create source file from the .widgets file
-- add_custom_command(OUTPUT ${_source}
-- COMMAND ${KDEWIDGETS_MAKEKDEWIDGETS_EXECUTABLE}
-- ARGS -o ${_source} ${_input}
-- MAIN_DEPENDENCY ${_input} DEPENDS ${_KDE4_MAKEKDEWIDGETS_DEP})
--
-- # create moc file
-- qt5_generate_moc(${_source} ${_moc} )
--
-- list(APPEND ${_sources} ${_source} ${_moc})
--
-- endforeach (_current_FILE)
--
--endmacro (KDE4_ADD_WIDGET_FILES)
--
- # adds application icon to target source list
- # 'appsources' - the sources of the application
- # 'pngfiles' - specifies the list of icon files
---
-2.29.2
-
-
-From 13277f3a50eee8ec2ebc5cd915a83b56c2613966 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:27:55 +0100
-Subject: [PATCH 2/2] Drop Qt5Designer dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/modules/ECMQt4To5Porting.cmake | 1 -
- cmake/modules/FindQt5Transitional.cmake | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
-index 4204fa54..01b8f995 100644
---- a/cmake/modules/ECMQt4To5Porting.cmake
-+++ b/cmake/modules/ECMQt4To5Porting.cmake
-@@ -160,7 +160,6 @@ set(_qt_modules
- DBus
- Network
- Test
-- Designer
- Concurrent
- Xml
- UiTools
-diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
-index df354fc6..68fa6d47 100644
---- a/cmake/modules/FindQt5Transitional.cmake
-+++ b/cmake/modules/FindQt5Transitional.cmake
-@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
- Core
- Gui
- DBus
-- Designer
- Declarative
- Script
- ScriptTools
---
-2.29.2
-
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
deleted file mode 100644
index b616570ab58a..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.77.0-no-kdesignerplugin.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 13277f3a50eee8ec2ebc5cd915a83b56c2613966 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:27:55 +0100
-Subject: [PATCH 2/2] Drop Qt5Designer dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20a27b52..e09b93e2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(GenerateExportHeader)
- include(CMakeFindFrameworks)
-
- set(REQUIRED_QT_VERSION 5.13.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
-
- find_package(KF5Completion ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch
index a053114c39bc..1165a531ab02 100644
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.79.0-no-kdesignerplugin.patch
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-no-kdesignerplugin.patch
@@ -141,57 +141,3 @@ index 1570df34..e255960d 100644
# 'pngfiles' - specifies the list of icon files
--
2.30.0
-
-
-From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:27:55 +0100
-Subject: [PATCH 2/2] Drop Qt5Designer dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 2 +-
- cmake/modules/ECMQt4To5Porting.cmake | 1 -
- cmake/modules/FindQt5Transitional.cmake | 1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a432591..e503999d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(GenerateExportHeader)
- include(CMakeFindFrameworks)
-
- set(REQUIRED_QT_VERSION 5.14.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
-
- find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
-diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
-index 4204fa54..01b8f995 100644
---- a/cmake/modules/ECMQt4To5Porting.cmake
-+++ b/cmake/modules/ECMQt4To5Porting.cmake
-@@ -160,7 +160,6 @@ set(_qt_modules
- DBus
- Network
- Test
-- Designer
- Concurrent
- Xml
- UiTools
-diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
-index df354fc6..68fa6d47 100644
---- a/cmake/modules/FindQt5Transitional.cmake
-+++ b/cmake/modules/FindQt5Transitional.cmake
-@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
- Core
- Gui
- DBus
-- Designer
- Declarative
- Script
- ScriptTools
---
-2.30.0
-
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch
new file mode 100644
index 000000000000..44e474ae0e91
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch
@@ -0,0 +1,51 @@
+From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 22 Nov 2020 00:27:55 +0100
+Subject: [PATCH 2/2] Drop Qt5Designer dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ cmake/modules/ECMQt4To5Porting.cmake | 1 -
+ cmake/modules/FindQt5Transitional.cmake | 1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a432591..e503999d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ include(GenerateExportHeader)
+ include(CMakeFindFrameworks)
+
+ set(REQUIRED_QT_VERSION 5.14.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
+
+ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
+diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
+index 4204fa54..01b8f995 100644
+--- a/cmake/modules/ECMQt4To5Porting.cmake
++++ b/cmake/modules/ECMQt4To5Porting.cmake
+@@ -160,7 +160,6 @@ set(_qt_modules
+ DBus
+ Network
+ Test
+- Designer
+ Concurrent
+ Xml
+ UiTools
+diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
+index df354fc6..68fa6d47 100644
+--- a/cmake/modules/FindQt5Transitional.cmake
++++ b/cmake/modules/FindQt5Transitional.cmake
+@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
+ Core
+ Gui
+ DBus
+- Designer
+ Declarative
+ Script
+ ScriptTools
+--
+2.30.0
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
new file mode 100644
index 000000000000..e6a287ebda37
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
@@ -0,0 +1,51 @@
+From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 22 Nov 2020 00:27:55 +0100
+Subject: [PATCH 2/2] Drop Qt5Designer dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ cmake/modules/ECMQt4To5Porting.cmake | 1 -
+ cmake/modules/FindQt5Transitional.cmake | 1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a432591..e503999d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@ include(GenerateExportHeader)
+ include(CMakeFindFrameworks)
+
+ set(REQUIRED_QT_VERSION 5.15.0)
+-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
+
+ find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
+diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
+index 4204fa54..01b8f995 100644
+--- a/cmake/modules/ECMQt4To5Porting.cmake
++++ b/cmake/modules/ECMQt4To5Porting.cmake
+@@ -160,7 +160,6 @@ set(_qt_modules
+ DBus
+ Network
+ Test
+- Designer
+ Concurrent
+ Xml
+ UiTools
+diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
+index df354fc6..68fa6d47 100644
+--- a/cmake/modules/FindQt5Transitional.cmake
++++ b/cmake/modules/FindQt5Transitional.cmake
+@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
+ Core
+ Gui
+ DBus
+- Designer
+ Declarative
+ Script
+ ScriptTools
+--
+2.30.0
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
index 43e1d42d1e4b..c5beda64a305 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="X"
RESTRICT+=" test"
@@ -77,7 +77,10 @@ RDEPEND="${COMMON_DEPEND}
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-no-kdesignerplugin.patch"
+ "${FILESDIR}/${P}-unused-dep.patch"
+)
src_prepare() {
ecm_src_prepare
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
index 916e9fdee5b4..254009127697 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild
@@ -6,14 +6,14 @@ EAPI=7
ECM_HANDBOOK="true"
ECM_QTHELP="false"
PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="libressl X"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
RESTRICT+=" test"
@@ -23,6 +23,7 @@ BDEPEND="
"
COMMON_DEPEND="
app-text/docbook-xml-dtd:4.2
+ dev-libs/openssl:0
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
@@ -58,8 +59,6 @@ COMMON_DEPEND="
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/solid-${PVCUT}*:5
virtual/libintl
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libICE
@@ -78,7 +77,12 @@ RDEPEND="${COMMON_DEPEND}
=kde-frameworks/kitemmodels-${PVCUT}*:5
"
-PATCHES=( "${FILESDIR}"/${P}-no-kdesignerplugin{,-1}.patch )
+PATCHES=( "${FILESDIR}/${PN}-5.79.0-no-kdesignerplugin.patch" )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
+ "${FILESDIR}/${PN}-5.80.0-unused-dep.patch"
+)
src_prepare() {
ecm_src_prepare
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 02:02:45 +0000