From 6de28447d66e6c47ee682740b840cdb67244d4b1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Apr 2023 05:24:13 +0100 Subject: gentoo auto-resync : 05:04:2023 - 05:24:13 --- kde-apps/kruler/Manifest | 3 - .../kruler/files/kruler-22.04.3-without_x11.patch | 64 ---------------------- kde-apps/kruler/kruler-22.08.3.ebuild | 45 --------------- 3 files changed, 112 deletions(-) delete mode 100644 kde-apps/kruler/files/kruler-22.04.3-without_x11.patch delete mode 100644 kde-apps/kruler/kruler-22.08.3.ebuild (limited to 'kde-apps/kruler') diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest index 20c765d52804..87fe87103e8b 100644 --- a/kde-apps/kruler/Manifest +++ b/kde-apps/kruler/Manifest @@ -1,6 +1,3 @@ -AUX kruler-22.04.3-without_x11.patch 2241 BLAKE2B 92f51f62bf0b88ec20f03088a9f752741b4d236052774764c9cd251a1c8a052253c561f314fc44f213c56383d4ccc270f9313a9071d832d44b51e26cf360698c SHA512 c8942f3ac2e5163b2df7c595f8ec4bdb0c121ee109b98c962e38f3cce45a5800f8b284811175c230deca8e94b7f906a4b58d35bf89fece9aa36959542283f3cf -DIST kruler-22.08.3.tar.xz 276568 BLAKE2B 34ee748ca4bad2acc6fc0802dd483cd326a6c4907ca0d998ba78cccfb00526c34e61da5ea6d6275f89ab2d768d9a107e15c1c338d7c1e1454883c0e01b956173 SHA512 61af626cb9dc74059b369ca40b917d330721f74f3f31c4412830bf4cf321927d568d3eefdd0885cad9f22b737f5bf48f88c59e260df0ff3a48536cabe4eade40 DIST kruler-22.12.3.tar.xz 285792 BLAKE2B ec1a92efedbb1a8366062deb561e146bf8139e1a03be1d53e0874f07124737dee89ba2fe561520b0fa2cb874ae1996994690700ee3ea5d734fedf5d5d48e38a7 SHA512 909fe29f83b130cbe56a61e145bc9670320f09e402ac86fdd3267e3f5c46a660507f62f9dcb845f796811062e370e651d82f5502210f63c06ed7a45bb92f66e1 -EBUILD kruler-22.08.3.ebuild 998 BLAKE2B 4e616e697e652d6c3720c46c019bcc7739f684624428e6207dd00d3552a64dbd65597a7b4c487c85df7fad6c8602ab9c4d85c67ac326da6b51eb66d526915cc5 SHA512 5214bfef7bed5fa563da19e8938c620dec2603a95dca0f2b6944116c5ed973b3076c0d449020e57f6dca85cc8ab3edacf5b0f043d13160986a07c605b6171bc1 EBUILD kruler-22.12.3.ebuild 940 BLAKE2B 5d051753235fac159a300eb6a7bceaeba420ff930dc0165825f247ecfad2f9f10e42f39d619d0512325a4fcebca17b66d1c5c4b47aa7a46276527291010b0c2c SHA512 cb4d4d5fe68d7f5a7c7e8a3ddd1045122a3fabef48164549f3545fb93ea3acd66ac54b0bdd7274e7feb92851008f3830a783fd8e1aa50ce591343d02d03fe469 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch b/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch deleted file mode 100644 index 79bd597d9377..000000000000 --- a/kde-apps/kruler/files/kruler-22.04.3-without_x11.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7a29873231061948408b36089a683ab4e0fc8a69 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 31 Jul 2022 14:59:24 +0200 -Subject: [PATCH] Add CMake option to build WITHOUT_X11, drop unused X11 - dependency - -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. - -KRULER_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. - -X11 dependency (introduced in 4c7cab8e90f8f360fb1c6b21c73f4acba609e0fe) -was not actually used at build time, so the new option will replace it -to determine if the feature is enabled, however libXCB remains -non-required. - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 86a5dc7..a5839ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,14 +41,16 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION - TYPE OPTIONAL - ) - if (NOT APPLE) -- find_package(X11) -- set (KRULER_HAVE_X11 ${X11_FOUND}) -- if (X11_FOUND) -+ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) -+ if (NOT WITHOUT_X11) - find_package(XCB COMPONENTS XCB) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -- else() -- # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above -+ set (KRULER_HAVE_X11 ${XCB_FOUND}) -+ if (XCB_FOUND) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ else() -+ # qtx11extras_p.h is in Qt6Gui, which implied by the Qt6Gui above -+ endif() - endif() - endif() - endif() -@@ -101,7 +103,7 @@ target_link_libraries(kruler - KF5::WindowSystem - KF5::XmlGui - ) --if (X11_FOUND) -+if (KRULER_HAVE_X11) - target_link_libraries(kruler - ${XCB_LIBRARIES} - ) --- -GitLab - diff --git a/kde-apps/kruler/kruler-22.08.3.ebuild b/kde-apps/kruler/kruler-22.08.3.ebuild deleted file mode 100644 index 59d907a6172b..000000000000 --- a/kde-apps/kruler/kruler-22.08.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.96.0 -QTMIN=5.15.5 -inherit ecm gear.kde.org - -DESCRIPTION="Screen ruler for Plasma" -HOMEPAGE="https://apps.kde.org/kruler/" - -LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="X" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libxcb - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" ) - -src_configure() { - local mycmakeargs=( - -DWITHOUT_X11=$(usex !X) - ) - - ecm_src_configure -} -- cgit v1.2.3