commit: 81101d50db944d8257702a8254868f7792e7e068 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 6 12:14:15 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 11 14:23:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81101d50
kde-frameworks/kdelibs4support: drop 5.77.0* Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/kdelibs4support/Manifest | 1 - ...elibs4support-5.77.0-no-kdesignerplugin-1.patch | 183 --------------------- ...kdelibs4support-5.77.0-no-kdesignerplugin.patch | 23 --- .../kdelibs4support/kdelibs4support-5.77.0.ebuild | 96 ----------- 4 files changed, 303 deletions(-) diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index eebf4b2ff7f..488cb5702dd 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,3 +1,2 @@ -DIST kdelibs4support-5.77.0.tar.xz 3546468 BLAKE2B c55686f09ddc6f06bd96f6a93906fd6e03b482b66c960644ca6a859f6f8cc851740c81098241063f692cbcb7458bcf36f4453d24380df35fc22cb5f7effea764 SHA512 4b7577d44c0062561d2d315905ee7789595e402213f5508677a3362d3371d40f3c0d2d216dbece712467470aa58128226b797cbc11e39cc4b54779c4bfbac9f4 DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09 DIST kdelibs4support-5.81.0.tar.xz 3552860 BLAKE2B 9322860fb7abdca317b34f51c6ed2d89ea55597391e4547c10ae365e1553dffbbe35366e3fefc0679fe72d29a1c43d47a077cf7b3d0580e16079090a9760ccc4 SHA512 4c86d28df61268ce174947b3f203001b20c91d155f1476ca3210ffe25a9f28a9ca39a5de5b21e6522d6c89eea956a4c1b285c963d5ae07234e8b6f8637847c7e 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 8bdd30dd47a..00000000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -Date: Sun, 22 Nov 2020 00:27:55 +0100 -Subject: [PATCH 2/2] Drop Qt5Designer dependency - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - 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 b616570ab58..00000000000 --- 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 <[email protected]> -Date: Sun, 22 Nov 2020 00:27:55 +0100 -Subject: [PATCH 2/2] Drop Qt5Designer dependency - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - 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/kdelibs4support-5.77.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild deleted file mode 100644 index 916e9fdee5b..00000000000 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="true" -ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.1 -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" - -RESTRICT+=" test" - -BDEPEND=" - dev-lang/perl - dev-perl/URI -" -COMMON_DEPEND=" - app-text/docbook-xml-dtd:4.2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5[ssl] - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qttest-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - >=kde-frameworks/kded-${PVCUT}:5 - =kde-frameworks/kdoctools-${PVCUT}*:5 - =kde-frameworks/kemoticons-${PVCUT}*:5 - =kde-frameworks/kglobalaccel-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kparts-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kunitconversion-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - =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 - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 ) - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kinit-${PVCUT}*:5 - =kde-frameworks/kitemmodels-${PVCUT}*:5 -" - -PATCHES=( "${FILESDIR}"/${P}-no-kdesignerplugin{,-1}.patch ) - -src_prepare() { - ecm_src_prepare - if ! use handbook; then - sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -}
