diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /kde-frameworks/kdelibs4support | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'kde-frameworks/kdelibs4support')
-rw-r--r-- | kde-frameworks/kdelibs4support/Manifest | 7 | ||||
-rw-r--r-- | kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch | 197 | ||||
-rw-r--r-- | kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild | 4 | ||||
-rw-r--r-- | kde-frameworks/kdelibs4support/kdelibs4support-5.78.0.ebuild (renamed from kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild) | 14 |
4 files changed, 210 insertions, 12 deletions
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index 8379b140f41a..6a0a6ea5de4f 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,6 +1,7 @@ AUX kdelibs4support-5.77.0-no-kdesignerplugin.patch 7403 BLAKE2B a4abfc514d0dc268cbaadd42a47339eae287ed5df0b3d9ec44106946661494765193ed072d2955eadd6f72130fa6eaa4ee00f02336236a303893dd554c5bba78 SHA512 a6b9aca1fda57582be21df2e0078de8b154519793b53598450665a6a344c1012b34de0093838fb136bc4cd7c2ed682e51d204b672d658beb08a107ffcf90c04b -DIST kdelibs4support-5.74.0.tar.xz 3533248 BLAKE2B 712e9304e2de3a167f2bfae07911b2e4ae236eb1002504cfe7f4507e9615500b10488327a5ca28d25412432a1fed992075e3585afa67038ac2e8d440553e6b9a SHA512 a1b19ec933a947a1ebe3a60004341e1fa4fecd3a64de197ee997bbba6a14fae114e3409180d01de04d20e32e52182eeb9e85e131cba51601689f12eff4af3eab +AUX kdelibs4support-5.78.0-no-kdesignerplugin.patch 7403 BLAKE2B 0138832bd76e1fbc285ec3157f93c7ec1165fa8830d803c30ab26be6516bfc9180bc80b48dc317a428287cffdef54faaf1154d6d8f856d25b4fb2c31e1545fc5 SHA512 62b4f18639182bdb9b12fdac9b4fcccec825f3e3cc43f9cfec79ede95af5da8a75cd3d5656d18d0d2ee6a341a9d4700e37e7654f2c5777e7ca4c25e4986454aa DIST kdelibs4support-5.77.0.tar.xz 3546468 BLAKE2B c55686f09ddc6f06bd96f6a93906fd6e03b482b66c960644ca6a859f6f8cc851740c81098241063f692cbcb7458bcf36f4453d24380df35fc22cb5f7effea764 SHA512 4b7577d44c0062561d2d315905ee7789595e402213f5508677a3362d3371d40f3c0d2d216dbece712467470aa58128226b797cbc11e39cc4b54779c4bfbac9f4 -EBUILD kdelibs4support-5.74.0.ebuild 2506 BLAKE2B 566e910ac98f4aecd4b78ec53efdc54db228477718041b5fb5ad9317bed0b5f5bc169b63fa18f729b2c3d56900321af161d890d6a5c1d2d0c7eb23bd69b7218e SHA512 5c69a3c63b7a86ded07138340448d778011dfaf169a6f245b263364e31bafe3d0766c3ef354a3bbb95777d7ae1a77e1815ab8d4494733b4c7d88345c06dc5901 -EBUILD kdelibs4support-5.77.0.ebuild 2499 BLAKE2B 5dbccbfe6ed860f1a111f8decf9f75318515903db284be1a908c456d08c40113dedf4825f8f08413c8aae1849088691bff700e15698c08a14948f72b1daeeeff SHA512 c7b1e53268d387e31cd0307e9aebaddc6e0c5981ed31a7669e676e70c73c50a733816e3514567c2517fef583fa01e92800478bac7c4e165896d036f97a1aa4c6 +DIST kdelibs4support-5.78.0.tar.xz 3546464 BLAKE2B 3c7dd91a0657d19655ca904b051ca32f417ea8ce7dc9ef83c5904b34505824f67a00b04aafac0b1ff0cd42d8ac0b7d34d449bd54bd1fca38217a5b628ed5961d SHA512 bda42e9ef1d62951cef0ef131871f21362343b0c190d1cd78e98ebffc10d92023297c9cf1a43b4492bddcc122fc5ebfe4d8387e8fd979c88ebe7456b672835fa +EBUILD kdelibs4support-5.77.0.ebuild 2496 BLAKE2B 3a7052f105f1c20e55c8e236d9e33c2dd5c7ff99016c3dc6a1a4c9d44a2c8a1e4d8ef922bb780cfcf5c7a69093a05f6dea73788b59e15460deb42d5f2ece71cd SHA512 fe914827dbb6b6f9c6c8ef0c9835c329133c905451ea6ae6f7968c7f6632c01040d9405253b377d66add7fefc701b24b0f7d75389f97cfb6843de113f4b0459a +EBUILD kdelibs4support-5.78.0.ebuild 2499 BLAKE2B 4976198ea6fdece09048a4ed078b6d3e48d66a0499cf5c73b032563e494f22a816968c084e52a126983bf9eeaa63c2ed5a0e5e6634fb08558ee6a3cd3e8fe9cf SHA512 f3039ca3b16f9d55729c4aafac567fc1c95ad8d2f378850426ed623f2d5402487578b12dca733b0b8a62528efc6da10d6cbb036d246e2d68e362f84b7c2f209a MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch new file mode 100644 index 000000000000..be81bf04ef95 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.78.0-no-kdesignerplugin.patch @@ -0,0 +1,197 @@ +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> +--- + 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 20a27b52..e09b93e2 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 ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5Config ${KF5_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.29.2 + diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild index ace1a258917f..ce58a9ee597e 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.77.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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="libressl X" BDEPEND=" diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.78.0.ebuild index 7fd625e26c3d..bfa7f1cf63ad 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-5.74.0.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.78.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,13 +6,13 @@ EAPI=7 ECM_HANDBOOK="true" ECM_QTHELP="false" PVCUT=$(ver_cut 1-2) -QTMIN=5.14.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" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="libressl X" BDEPEND=" @@ -20,6 +20,7 @@ BDEPEND=" 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] @@ -36,7 +37,6 @@ COMMON_DEPEND=" =kde-frameworks/kcrash-${PVCUT}*:5 =kde-frameworks/kdbusaddons-${PVCUT}*:5 >=kde-frameworks/kded-${PVCUT}:5 - =kde-frameworks/kdesignerplugin-${PVCUT}*:5 =kde-frameworks/kdoctools-${PVCUT}*:5 =kde-frameworks/kemoticons-${PVCUT}*:5 =kde-frameworks/kglobalaccel-${PVCUT}*:5 @@ -55,7 +55,6 @@ COMMON_DEPEND=" =kde-frameworks/kwindowsystem-${PVCUT}*:5 =kde-frameworks/kxmlgui-${PVCUT}*:5 =kde-frameworks/solid-${PVCUT}*:5 - app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) @@ -68,18 +67,19 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - >=dev-qt/designer-${QTMIN}:5 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 - >=dev-qt/qtxml-${QTMIN}:5 " RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-5.78.0-no-kdesignerplugin.patch" ) + src_prepare() { ecm_src_prepare if ! use handbook; then |