diff options
author | 2022-11-27 12:13:33 +0100 | |
---|---|---|
committer | 2022-11-27 12:20:25 +0100 | |
commit | 1c1fe267b3bd1b0c44977029c103bdcd4056caff (patch) | |
tree | 5c0493476faa68ec06144d6e6ad1b4b98e34ce68 | |
parent | kde-frameworks/kiconthemes: drop 5.96.0 (diff) | |
download | gentoo-1c1fe267b3bd1b0c44977029c103bdcd4056caff.tar.gz gentoo-1c1fe267b3bd1b0c44977029c103bdcd4056caff.tar.bz2 gentoo-1c1fe267b3bd1b0c44977029c103bdcd4056caff.zip |
kde-frameworks/kinit: drop 5.96.0-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r-- | kde-frameworks/kinit/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch | 72 | ||||
-rw-r--r-- | kde-frameworks/kinit/kinit-5.96.0-r1.ebuild | 51 |
3 files changed, 0 insertions, 124 deletions
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest index 0b019f936f09..b347af3d6d41 100644 --- a/kde-frameworks/kinit/Manifest +++ b/kde-frameworks/kinit/Manifest @@ -1,3 +1,2 @@ DIST kinit-5.100.0.tar.xz 2433276 BLAKE2B 289613d8d669f69fae4c0f302939ba80a648b2176c0588dbc481df9497774b720c1db23a84116abe2014c2fd574fee37a05e54b46a360c6d7bd254c6fdccc999 SHA512 092d7278a98693d60d1db31e1efad1d8f1e400fcb6953c63adeb8d2ecf79c4816fc5bdde825388890c6f58f97ad200ffadc9dad6a80357efd3a2e4fd4f97f78a -DIST kinit-5.96.0.tar.xz 119408 BLAKE2B 7372a85d89e1344e1205035fd1bd643b88619ccb487667cb7f41b64b59046253e8afcb053e51e5093c31a86a8ee7bb71c8c1b9b9fdca342612d0a9ba024c4fb6 SHA512 e3f2a8fc3a4487baa1ecc60ac86e6322b9b15a1cc0fdda288eba9cf9fce387fb299435a689abeaef8570e22c9f5fdd646021409a72aa37653e28e37c8a230e7d DIST kinit-5.99.0.tar.xz 119504 BLAKE2B 431b1640ad39dbf2d87fba02116431fedf9d5088d79cb39f33cc91905b1fae8d8d11304890c70da58e60e54bfaaa68e9a30c0d1ebdf4872529d235ac58c86c7f SHA512 5629c43949d13208fb1353c849aca9bab97b09e0aec365f914f43ca9f69c8c7844d10582509a999f63ccbbd178bacf87c8fc0947534d7848046e3d5bb5ab778d diff --git a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch b/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch deleted file mode 100644 index fd6efe2fae00..000000000000 --- a/kde-frameworks/kinit/files/kinit-5.96.0-with_x11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 85ca4b6515ac2539fb31b74db6fe5ceae1590be1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 2 Aug 2022 00:19:19 +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 <asturm@gentoo.org> ---- - CMakeLists.txt | 15 +++++++++------ - src/kdeinit/CMakeLists.txt | 4 ++-- - 2 files changed, 11 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 90baa57..e27c41f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,13 +30,16 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KINIT - - #optional features - if (NOT APPLE) -- find_package(X11) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ find_package(X11 REQUIRED) -+ set(HAVE_X11 1) -+ -+ find_package(XCB MODULE COMPONENTS XCB) -+ set_package_properties(XCB PROPERTIES TYPE OPTIONAL) -+ set(HAVE_XCB ${XCB_XCB_FOUND}) -+ endif() - endif() --set(HAVE_X11 ${X11_FOUND}) -- --find_package(XCB MODULE COMPONENTS XCB) --set_package_properties(XCB PROPERTIES TYPE OPTIONAL) --set(HAVE_XCB ${XCB_XCB_FOUND}) - - # used by 4 executables in this module - if(HAVE_SOCKET_LIBRARY) -diff --git a/src/kdeinit/CMakeLists.txt b/src/kdeinit/CMakeLists.txt -index af84a14..3fcbd1c 100644 ---- a/src/kdeinit/CMakeLists.txt -+++ b/src/kdeinit/CMakeLists.txt -@@ -38,7 +38,7 @@ target_compile_definitions(kdeinit5 PRIVATE - KDE_INSTALL_FULL_LIBEXECDIR_KF5="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}" - ) - --if (X11_FOUND) -+if (HAVE_X11) - target_link_libraries(kdeinit5 ${X11_X11_LIB}) - endif() - -@@ -63,7 +63,7 @@ if (NOT WIN32) - - target_link_libraries(kdeinit5_wrapper ${KINIT_SOCKET_LIBRARY} Qt5::Core KF5::DBusAddons) - -- if (NOT X11_FOUND) -+ if (NOT HAVE_X11) - target_compile_definitions(kdeinit5_wrapper PRIVATE -DNO_DISPLAY) - endif () - --- -GitLab - diff --git a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild b/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild deleted file mode 100644 index 60cf6e3ee5cd..000000000000 --- a/kde-frameworks/kinit/kinit-5.96.0-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="false" -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -inherit ecm frameworks.kde.org - -DESCRIPTION="Helper library to speed up start of applications on KDE workspaces" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="+caps +man X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5[X?] - caps? ( sys-libs/libcap ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )" - -# Approved upstream: https://invent.kde.org/frameworks/kinit/-/merge_requests/13 -PATCHES=( "${FILESDIR}/${P}-with_x11.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package caps Libcap) - $(cmake_use_find_package man KF5DocTools) - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} |