[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kdelibs4support/, kde-frameworks/kdelibs4support/files/

[Andreas Sturmlechner]

commit:     be7febdc5651cf4bcba6d6635b03a96d72f314ec
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 09:26:26 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 10:09:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be7febdc

kde-frameworks/kdelibs4support: 5.78.0 version bump

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kdelibs4support/Manifest            |   1 +
 ...kdelibs4support-5.78.0-no-kdesignerplugin.patch | 197 +++++++++++++++++++++
 .../kdelibs4support/kdelibs4support-5.78.0.ebuild  |  96 ++++++++++
 3 files changed, 294 insertions(+)

diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 8b1acfff627..2560e177602 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1,3 @@
 DIST kdelibs4support-5.74.0.tar.xz 3533248 BLAKE2B 712e9304e2de3a167f2bfae07911b2e4ae236eb1002504cfe7f4507e9615500b10488327a5ca28d25412432a1fed992075e3585afa67038ac2e8d440553e6b9a SHA512 a1b19ec933a947a1ebe3a60004341e1fa4fecd3a64de197ee997bbba6a14fae114e3409180d01de04d20e32e52182eeb9e85e131cba51601689f12eff4af3eab
 DIST kdelibs4support-5.77.0.tar.xz 3546468 BLAKE2B c55686f09ddc6f06bd96f6a93906fd6e03b482b66c960644ca6a859f6f8cc851740c81098241063f692cbcb7458bcf36f4453d24380df35fc22cb5f7effea764 SHA512 4b7577d44c0062561d2d315905ee7789595e402213f5508677a3362d3371d40f3c0d2d216dbece712467470aa58128226b797cbc11e39cc4b54779c4bfbac9f4
+DIST kdelibs4support-5.78.0.tar.xz 3546464 BLAKE2B 3c7dd91a0657d19655ca904b051ca32f417ea8ce7dc9ef83c5904b34505824f67a00b04aafac0b1ff0cd42d8ac0b7d34d449bd54bd1fca38217a5b628ed5961d SHA512 bda42e9ef1d62951cef0ef131871f21362343b0c190d1cd78e98ebffc10d92023297c9cf1a43b4492bddcc122fc5ebfe4d8387e8fd979c88ebe7456b672835fa

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 00000000000..be81bf04ef9
--- /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@g.o>
+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@g.o>
+---
+ 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@g.o>
+Date: Sun, 22 Nov 2020 00:27:55 +0100
+Subject: [PATCH 2/2] Drop Qt5Designer dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@g.o>
+---
+ 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.78.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.78.0.ebuild
new file mode 100644
index 00000000000..bfa7f1cf63a
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.78.0.ebuild
@@ -0,0 +1,96 @@
+# 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"
+
+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
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-5.78.0-no-kdesignerplugin.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
+}