commit: 7f926c5668535da582371bddf718852305e6bcb1 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 10 18:23:33 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 10 18:44:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f926c56
kde-frameworks/kdelibs4support: 5.81.0 version bump Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-frameworks/kdelibs4support/Manifest | 1 + .../files/kdelibs4support-5.82.0-unused-dep.patch | 51 +++++++++++ .../kdelibs4support/kdelibs4support-5.81.0.ebuild | 100 +++++++++++++++++++++ 3 files changed, 152 insertions(+) diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index 5c5db99d1c2..eebf4b2ff7f 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,2 +1,3 @@ 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.82.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch new file mode 100644 index 00000000000..e6a287ebda3 --- /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 <[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 +- + 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.81.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild new file mode 100644 index 00000000000..25400912769 --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.81.0.ebuild @@ -0,0 +1,100 @@ +# 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.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="X" + +RESTRICT+=" test" + +BDEPEND=" + dev-lang/perl + dev-perl/URI +" +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] + >=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 + 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}/${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 + 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 +}
