diff options
Diffstat (limited to 'kde-apps/yakuake')
-rw-r--r-- | kde-apps/yakuake/Manifest | 3 | ||||
-rw-r--r-- | kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch | 87 | ||||
-rw-r--r-- | kde-apps/yakuake/yakuake-22.08.0.ebuild | 60 |
3 files changed, 150 insertions, 0 deletions
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest index fe258a189ba2..99c46b671dd8 100644 --- a/kde-apps/yakuake/Manifest +++ b/kde-apps/yakuake/Manifest @@ -1,4 +1,7 @@ AUX yakuake-22.04.3-without_x11.patch 2382 BLAKE2B e9d4de7f7e9c084f6bba308c73f635e3ac68e8256d6430ba99981cf352a544efd7d5dcaa509f0acd203b8cd7dd496bfbf3eb304fbd6737180fedde4f37ba9443 SHA512 eb5f4d904fdf477092be8e57ec00bf047b9dea09ee360b0f2e536ca7384a2c795c7c9ee6a9a1493c2f78ae2d43e46f0d4e1211e54cad5d932ad13afba1569c7c +AUX yakuake-22.07.90-without_x11.patch 2791 BLAKE2B 8e6a399b07ee4659d2aa55fa03b02c351863c463aa4f75def752ac92e3fe3d848430a9aea1a6a9ef3321451ba5eb4fcd87153d3f4c6ecac88e23f88fc415f8b2 SHA512 88c96e5cc688ae256aedbc70982e51bc26aab043fe15221f634fd64d28b3bdff08f987f484cda6b33cfeedead040738bea363cb86337bbd30d1e22542acde81b DIST yakuake-22.04.3.tar.xz 404952 BLAKE2B eaab58a553269d28dbcdb2e330beb4a86b212d9428da8d1967575ac976159c5f02d03a0ff6f70839eefb19295918b46db01d29014544584582caade006c814b4 SHA512 1c1b03f2136104fca9c91f6f6bf562f66abfa12dff9145f7c54db42f175495c57031caa1628f37cdf645787349f77d61c4047883d085e13dc221aca06765537e +DIST yakuake-22.08.0.tar.xz 413520 BLAKE2B 4f75c026ac00ce5cb1284c2cb88ca3255b683745dbdd96725fe9c45632ce14b75fcf9c00156ed617daabd95dc9dbce610f483fe634d076ea42ce5a6ceb25cb41 SHA512 6f82363bed5fda135723a434511a2f488279a35f1a38e1222a240659d01ed4aa1342e40041aca1433d2d2eda8799f028ee0bc0acb4211de729f73b4b6aacdc3d EBUILD yakuake-22.04.3.ebuild 1591 BLAKE2B 9b8b156307dcf5783910e7e2e8a389181709c00e37e42951562af26bbffd4e09e24ec50a72419ad6bae06ba9951fa3f0af6ad1241a600e70dff8aac1f6fec74f SHA512 243f2867292e3cc8b7e88b353ff9484af57b29be88cf27899d26d8b6b270cf6b220afd67a9f5bdc1deb4884e61653e245ec1d99d53d4beb9f4e95621dd01872b +EBUILD yakuake-22.08.0.ebuild 1604 BLAKE2B 165a7876ca4ead5d52605d56b91b3c3452a5ad61463d4cb3470afee54b34ac98bdedf203326dfe77e7e60b78a2943fd0589b8d4ffc265a333396a435f7cbbb6a SHA512 149c26413a1f8fefab8ba94c3c2e1765cb8969755616d5f3e812e9a661f86fdf03ec9a7007b6386984fc8523c8a5f025214fbdc8fc6b31cf3359004e0df2526e MISC metadata.xml 730 BLAKE2B a366bbedfe3a0b4257147f664f48130ff318a003433134d63e4bd076b9ee43169f28798e0c8da2e13804446abc2b80b1c5327c7468a1f8d6e8243c44c3c72c60 SHA512 7594648f5354d0660fa1063c52fb99af6955b0f3de5603a7c9eca3d1a24db24315990efa13f85680e56d63f77bedfde01f5728271594be794bd896fcf0f01f56 diff --git a/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch b/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch new file mode 100644 index 000000000000..2d46600e3dc2 --- /dev/null +++ b/kde-apps/yakuake/files/yakuake-22.07.90-without_x11.patch @@ -0,0 +1,87 @@ +From 1213c6dfd34583b005d0a2dbe7876951a13361a2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 27 Nov 2021 14:49:51 +0100 +Subject: [PATCH] Add CMake option to build WITHOUT_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. + +Introducing this option means there is no behavior change by default, +cmake will just skip finding X11 or adding unwanted features if the +option is enabled. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 30 ++++++++++++++++-------------- + app/CMakeLists.txt | 4 ++-- + 2 files changed, 18 insertions(+), 16 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eafad24..f9a8167 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,20 +51,22 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED + ) + + if(NOT APPLE) +- find_package(X11) +- set(HAVE_X11 ${X11_FOUND}) +- +- if(X11_FOUND) +- if (QT_MAJOR_VERSION EQUAL "5") +- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras) +- else() +- find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) +- endif() +- endif(X11_FOUND) +- +- find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG) +- set(HAVE_KWAYLAND ${KF5Wayland_FOUND}) +-endif(NOT APPLE) ++ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) ++ if(NOT WITHOUT_X11) ++ find_package(X11) ++ set(HAVE_X11 ${X11_FOUND}) ++ if(X11_FOUND) ++ if (QT_MAJOR_VERSION EQUAL "5") ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras) ++ else() ++ find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) ++ endif() ++ endif() ++ endif() ++ ++ find_package(KF5Wayland ${KF5_MIN_VERSION} CONFIG) ++ set(HAVE_KWAYLAND ${KF5Wayland_FOUND}) ++endif() + + add_subdirectory(app) + add_subdirectory(data) +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index b2838ec..6ada125 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -63,13 +63,13 @@ target_link_libraries(yakuake + KF5::WidgetsAddons + KF5::WindowSystem) + +-if(X11_FOUND) ++if(HAVE_X11) + if (TARGET Qt5::X11Extras) + target_link_libraries(yakuake Qt5::X11Extras) + elseif (TARGET Qt6::Gui) + target_link_libraries(yakuake Qt6::GuiPrivate) # qtx11extras_p.h in knotificationrestrictions + endif() +-endif(X11_FOUND) ++endif() + + if(KF5Wayland_FOUND) + target_link_libraries(yakuake KF5::WaylandClient) +-- +GitLab + diff --git a/kde-apps/yakuake/yakuake-22.08.0.ebuild b/kde-apps/yakuake/yakuake-22.08.0.ebuild new file mode 100644 index 000000000000..c33cbfc2a4dd --- /dev/null +++ b/kde-apps/yakuake/yakuake-22.08.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-3) +KFMIN=5.96.0 +QTMIN=5.15.5 +inherit ecm gear.kde.org + +DESCRIPTION="Quake-style terminal emulator based on konsole" +HOMEPAGE="https://apps.kde.org/yakuake/" + +LICENSE="GPL-2 LGPL-2" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="absolute-position X" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/konsole-${PVCUT}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-22.07.90-without_x11.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package absolute-position KF5Wayland) + -DWITHOUT_X11=$(usex !X) + ) + + ecm_src_configure +} |