mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-10 06:57:08 -08:00
kde-frameworks/kdelibs4support: drop 5.80.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -1,2 +1 @@
|
||||
DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09
|
||||
DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
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.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 ${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
|
||||
@@ -1,98 +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.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}/${P}-no-kdesignerplugin.patch"
|
||||
"${FILESDIR}/${P}-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
|
||||
}
|
||||
Reference in New Issue
Block a user