commit: 6305b6d9ac457cebac03f3371168aae1b52c6231
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 19:21:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 22:40:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6305b6d9
kde-frameworks/kdelibs4support: drop 5.99.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/kdelibs4support/Manifest | 1 -
.../files/kdelibs4support-5.99.0-with_x11.patch | 98 -------------------
.../kdelibs4support/kdelibs4support-5.99.0.ebuild | 107 ---------------------
3 files changed, 206 deletions(-)
diff --git a/kde-frameworks/kdelibs4support/Manifest
b/kde-frameworks/kdelibs4support/Manifest
index 05aa553fc41c..7811de199210 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,3 +1,2 @@
DIST kdelibs4support-5.102.0.tar.xz 3720092 BLAKE2B
557bda562e1f502f6e2a985e536a1fa9554242835e7169c8c1843d9b3e4ec002b8bf25d984c5bf4159d82cb2aa49c6e0076c2e775db5c42fd04c710231d4da0f
SHA512
f915e0c034ba3562a0636d3e79293c5e56d41f686b1375923fc2fbd6cfe884f81ce78c7aa85642071bf14d22b69fce7edf4f3736741602807032a15ecbfac3b0
DIST kdelibs4support-5.103.0.tar.xz 3720876 BLAKE2B
140d1e253775be1e50d17420b9e3c7252a1c1de027f83db64d4c45a9b8fed46502c1a96a8e7bb38605f28b39fbf188d8382ca461e0247273839a5a59a14be3aa
SHA512
7f663dc2a23f4ef32de2a456bc8b30dbaa1ae4298585c9cd3f8e37ac475bd1825f08f29687913a69dff99aa361e8cf9f1242d1473e96751cd8c631cdcb45b13c
-DIST kdelibs4support-5.99.0.tar.xz 3667732 BLAKE2B
371b9b96e1f99424d85034d20c79759b0d2a4796ed3771626c2623f9732b37d0f02451c44e9e42e78eddd211f6c4f24c3b0dfa20f21181d17124af28583299e9
SHA512
06716965e50d0adbfe57f3024045ee7f60b62f0ee9910e0ebcf92cf0592434631fae45d5be6ee4e91fdc9ca384bfedbedb9fb3c32acd09b81ce5ee37695f2676
diff --git
a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
deleted file mode 100644
index 24bcb1b9cca0..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.99.0-with_x11.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 026571f37c990007be3d7e536b335c19ab98009e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <ast...@gentoo.org>
-Date: Sat, 6 Aug 2022 11:16:00 +0200
-Subject: [PATCH] Add CMake option to build WITH_X11
-
-We want to be able to build without X11 support even if some of the used
-libraries may not work w/o X11 themselves yet or need to be built with
-X11 support for other reverse dependencies.
-
-HAVE_X11 already exists and is set automagically so far, but using
--DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
-as required in their cmake config. This is a behavior change as previously
-it was silently disabled if X11 was not found.
-
-Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org>
----
- CMakeLists.txt | 18 +++++++++++-------
- src/CMakeLists.txt | 6 +++---
- tests/CMakeLists.txt | 2 +-
- 3 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f577df45..378d23d4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,14 +51,18 @@ if(WIN32)
- endif()
-
- if (NOT APPLE AND NOT WIN32)
-- find_package(X11)
-+ option(WITH_X11 "Build with X11 integration and session management" ON)
-+ if(WITH_X11)
-+ find_package(X11)
-+ set(HAVE_X11 ${X11_FOUND})
-+ if (HAVE_X11)
-+ add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND
"Support for session management in KApplication")
-+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
-+ find_package(XCB REQUIRED COMPONENTS XCB)
-+ endif()
-+ endif()
- endif()
--set(HAVE_X11 ${X11_FOUND})
--if (HAVE_X11)
-- add_feature_info("X11 Session Management (libSM)" X11_SM_FOUND "Support for
session management in KApplication")
-- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras)
-- find_package(XCB REQUIRED COMPONENTS XCB)
--endif ()
-+
- if (APPLE)
- cmake_find_frameworks(CoreFoundation)
- endif ()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2096b355..4649a9d5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -226,7 +226,7 @@ if (NOT KIO_NO_NEPOMUK)
- )
- endif ()
-
--if (X11_FOUND)
-+if (HAVE_X11)
- set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS}
kdeui/kxerrorhandler.cpp )
- list(APPEND libkdelibs4support_OPTIONAL_LIBS Qt5::X11Extras
${X11_LIBRARIES})
- endif ()
-@@ -312,7 +312,7 @@ set(platformLinkLibraries)
- if (APPLE)
- set(platformLinkLibraries "-framework CoreFoundation -framework Carbon
-lresolv")
- endif()
--if (X11_FOUND)
-+if (HAVE_X11)
- set(platformLinkLibraries ${XCB_XCB_LIBRARY})
- endif()
-
-@@ -545,7 +545,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/all_languages
DESTINATION ${KDE_INSTA
- install( FILES kdeui/40.colors kdeui/Oxygen.colors kdeui/Web.colors
kdeui/Royal.colors kdeui/Rainbow.colors
- DESTINATION ${KDE_INSTALL_CONFDIR}/colors)
-
--if (NOT X11_FOUND)
-+if (NOT HAVE_X11)
- # install our copy of the rgb.txt named colors list on systems without X11
- install(FILES kdeui/rgb.txt DESTINATION ${KDE_INSTALL_DATADIR_KF5}/kdeui)
- endif ()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 53f870ff..db4b28db 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -63,7 +63,7 @@ target_link_libraries(networkingservice KF5::KDELibs4Support)
-
- ###### kxerrorhandlertest #####
-
--if (X11_FOUND)
-+if (HAVE_X11)
- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
- kdelibs4support_examples( kxerrorhandlertest )
-
---
-2.35.1
-
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild
b/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild
deleted file mode 100644
index a867e3633595..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.99.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 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.5
-VIRTUALX_REQUIRED="test"
-inherit ecm frameworks.kde.org
-
-DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF
5"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="X"
-
-RESTRICT="test"
-
-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[X?]
- =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[X?]
- =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/countryflags-${PVCUT}:5
- =kde-frameworks/kinit-${PVCUT}*:5
- =kde-frameworks/kitemmodels-${PVCUT}*:5
-"
-BDEPEND="
- dev-lang/perl
- dev-perl/URI
-"
-
-PATCHES=(
- # downstream patches
- "${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
- "${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
- # pending upstream:
- # https://invent.kde.org/frameworks/kdelibs4support/-/merge_requests/21
- "${FILESDIR}/${P}-with_x11.patch"
-)
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use handbook; then
- sed -e "/kdoctools_install/ s/^/#DONT/" -i CMakeLists.txt || die
- fi
-
- cmake_run_in src cmake_comment_add_subdirectory l10n
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_X11=$(usex X)
- )
-
- ecm_src_configure
-}
