diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-12 22:53:04 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-13 07:19:01 +0200 |
commit | d592135a8ea7d00b8634e6b58669f8a5b27f1ef2 (patch) | |
tree | e953490f2c7b09de1d5f2c355a14501de88a6fbf /kde-frameworks/kdelibs4support | |
parent | kde-frameworks/purpose: 5.86.0 version bump (diff) | |
download | gentoo-d592135a8ea7d00b8634e6b58669f8a5b27f1ef2.tar.gz gentoo-d592135a8ea7d00b8634e6b58669f8a5b27f1ef2.tar.bz2 gentoo-d592135a8ea7d00b8634e6b58669f8a5b27f1ef2.zip |
kde-frameworks/kdelibs4support: 5.86.0 version bump
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kdelibs4support')
3 files changed, 150 insertions, 0 deletions
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest index d744f940f34c..e540c37ee657 100644 --- a/kde-frameworks/kdelibs4support/Manifest +++ b/kde-frameworks/kdelibs4support/Manifest @@ -1,2 +1,3 @@ DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9 DIST kdelibs4support-5.85.0.tar.xz 3642876 BLAKE2B 436645e8ac519b5078c37797fdea854e25e71a8079a49a33436a88576f1f370409a6fd780ab778520c474263df66b3a37d06398fdcc1ddfbeef8be5933f30192 SHA512 6edf7d612be56f81b7908ae85f6cfcc9618b14e8b9741fb19e0c8eb55ac73b9b82963be923d67ddfd450401fffc29bf164d112e45cba3657f10a1c84f86e346c +DIST kdelibs4support-5.86.0.tar.xz 3643140 BLAKE2B d857c7a128f26a289195b39d1ce2a948c483902e21d913d05a1397aa326402986abbd7ffa5c7af03e6b70a1d4cdd311c921fb978435e578abe1cd67b5e3b0631 SHA512 c02743f74db0e228fc77d152de7b72053d1decbfb0c4979c47c425ab256adf34464b493942b55388466800cab86efc13b3bd412597fa330cce794473c1fbf59a diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch new file mode 100644 index 000000000000..8614a8490222 --- /dev/null +++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.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.2) +-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.86.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.86.0.ebuild new file mode 100644 index 000000000000..5b1f46010ffe --- /dev/null +++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.86.0.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~riscv ~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.80.0-no-kdesignerplugin.patch" # bug 755956 + "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956 +) + +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 +} |