diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-16 04:59:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-16 04:59:22 +0100 |
| commit | c748acf4192a1e08c9feb2d5f0004937a4869639 (patch) | |
| tree | 3d3802bdd2770dc25d23a317afd0149df5a53cb2 /kde-apps/konsole | |
| parent | d458376753e8fa261bdf469a99543577fb8d95a0 (diff) | |
gentoo auto-resync : 16:09:2023 - 04:59:22
Diffstat (limited to 'kde-apps/konsole')
| -rw-r--r-- | kde-apps/konsole/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch | 30 | ||||
| -rw-r--r-- | kde-apps/konsole/konsole-23.08.1.ebuild (renamed from kde-apps/konsole/konsole-23.08.0.ebuild) | 14 |
3 files changed, 37 insertions, 12 deletions
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 9db00850bc20..7ba133ca353f 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,5 +1,6 @@ +AUX konsole-23.08.1-drop-unused-X11-dep.patch 917 BLAKE2B 0e471d484e7aeeaf1457b75e96d1c05dbe3d63b867e77045b4470686a0bd713d431b9f897d446477333d6d8ea96b05ce9afc94c0f7e1c32604f51000977e9375 SHA512 665ef7b2073f16dfcb9b13718c4a6e4182ed62a54c85eea3fe03f18a9c790fd3e0907816f031045df27c9d0b22543ff4f9b4a0877b6868e925d72a48b0b8e552 DIST konsole-23.04.3.tar.xz 1818368 BLAKE2B c9f88f214686ed1cc6bf80d2d46142050a842e0732c8413d79921a6a3de7c36f9ec074cbb9e401d42c592acad588e8439cbcd773813da6f5b6812ed0ad50ba6f SHA512 9d332efe21dee41c6f34b91f373f4ac15798ad977e429f5f57995a619a9ebcad9e506c21ee811a1ccb595509cfd15a33cef721d01573b1245f2798a88d93c04b -DIST konsole-23.08.0.tar.xz 1827212 BLAKE2B e187034ebfe22c529323ad514149462aafe2ac2f5a78645f62dcb97301b41941c5ab92b20e8713ab4b1756da065c8b983b591e41db956ed8eb15b0a5381ae57c SHA512 09cab00340d163d8d9e336c851933a68738504c0a77822a3da4b25324c5a499487384f6564da8958d1fc89a50b43da25031fb67c01fd790c655be3e9bb84eb1f +DIST konsole-23.08.1.tar.xz 1827052 BLAKE2B ca2281e7ca2515be4d25bf6d84884be2875a65911b50ad7f61f0f403910d1faa7cb25c916bcf68cb59b5135832743becf8bdefd984e708c36338ac79aa551815 SHA512 44095d08f3145bb556a0db861b63a17519d16d233905d024929ef0b641ae5ae02af53e1ecd87b00cfda3300c6e036412045a21b9da1113700887817bb4188a0a EBUILD konsole-23.04.3.ebuild 1832 BLAKE2B c0b0c7dd9f5ddbce636ac2c5da1d53d0a1b18102f34fec3b4395dfc8c0a09de3c4e1fe72f55f0e01154cd443a575eb9ebf3722181f1b4ce735a718576f67bbca SHA512 37ad7e327f435b10cdecfa1118b445f521d426219258d72aeae7dcce9f8ab5534e47231cc98c99938c71cbd258da83310575faa9edc2bacc65ab50e5ba836d24 -EBUILD konsole-23.08.0.ebuild 1835 BLAKE2B 09b5d0d60cff717b7ee04410e607f17304d74ae9cb4bd7f76f7da6a17433fe96c9507ef62dd8b98c83bcf310514fe0026ebabbfbc4c31e24f239d8ec8b87f86c SHA512 232a26f9a7b168d8c3e888ab4b772c4de55a177b296c91dc08cff56a0c9666a92502963ac3dc969fdb7f85f7ad6936ff06424fcab71c67cda68dcfef8144539b +EBUILD konsole-23.08.1.ebuild 1853 BLAKE2B f182cc1d62a4a09b41cb8113c0c3f7863eb4a83684e34a794756fdafcb8e8c5a7666335e631db51f0ea45d7b4a8d05247b21c4f1f5c6341e94ce2dda57e7ac97 SHA512 3c383f0d91142335742a16c6f1b2773e1380477431d2396a36ce2c798bd65cee9b6b6c076bb91501b91792abe76f0c2ec912d2309491aae810ae5db3a10af696 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch new file mode 100644 index 000000000000..6719fbfac0fb --- /dev/null +++ b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch @@ -0,0 +1,30 @@ +From 68f6ef2ea203e047743a97fc17be23a4a964a05a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 15 Sep 2023 09:47:42 +0200 +Subject: [PATCH] Drop unused X11 dependency + +It seems it is (no longer) needed and was only a leftover for feature selection. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9fd6f4f01..47c234498 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,9 +105,7 @@ find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED) + if(NOT APPLE) + option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" OFF) + if (NOT WITHOUT_X11) +- find_package(X11) +- set_package_properties(X11 PROPERTIES TYPE OPTIONAL) +- set(HAVE_X11 ${X11_FOUND}) ++ set(HAVE_X11 1) + endif() + endif() + +-- +2.42.0 + diff --git a/kde-apps/konsole/konsole-23.08.0.ebuild b/kde-apps/konsole/konsole-23.08.1.ebuild index e79c8b5c5ae1..9ad0d4a2e1a0 100644 --- a/kde-apps/konsole/konsole-23.08.0.ebuild +++ b/kde-apps/konsole/konsole-23.08.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="X" +IUSE="" DEPEND=" dev-libs/icu:= @@ -32,11 +32,12 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 @@ -47,17 +48,10 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - X? ( x11-libs/libX11 ) " RDEPEND="${DEPEND}" -src_configure() { - local mycmakeargs=( - -DWITHOUT_X11=$(usex !X) - ) - - ecm_src_configure -} +PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME properly upstream src_test() { # DBusTest: drkonqi process interferes. bug 702690 |