From 482a48c0e1675b1e92663b8b5222bb7261aa7956 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jul 2024 12:26:41 +0100 Subject: gentoo auto-resync : 13:07:2024 - 12:26:41 --- kde-apps/konsole/Manifest | 3 +- kde-apps/konsole/files/konsole-24.05.2-cmake.patch | 136 +++++++++++++++++++++ kde-apps/konsole/konsole-24.05.2-r1.ebuild | 67 ++++++++++ kde-apps/konsole/konsole-24.05.2.ebuild | 60 --------- 4 files changed, 205 insertions(+), 61 deletions(-) create mode 100644 kde-apps/konsole/files/konsole-24.05.2-cmake.patch create mode 100644 kde-apps/konsole/konsole-24.05.2-r1.ebuild delete mode 100644 kde-apps/konsole/konsole-24.05.2.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 9ebef66545f5..b08ed60f04b6 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,6 +1,7 @@ AUX konsole-23.08.1-drop-unused-X11-dep.patch 917 BLAKE2B 0e471d484e7aeeaf1457b75e96d1c05dbe3d63b867e77045b4470686a0bd713d431b9f897d446477333d6d8ea96b05ce9afc94c0f7e1c32604f51000977e9375 SHA512 665ef7b2073f16dfcb9b13718c4a6e4182ed62a54c85eea3fe03f18a9c790fd3e0907816f031045df27c9d0b22543ff4f9b4a0877b6868e925d72a48b0b8e552 +AUX konsole-24.05.2-cmake.patch 4607 BLAKE2B e0ac57c4901a8374625ec368b37f05b86a0be33321902d39138c2e6067043c43be2bd40dfda79f8a2f20fb868e9607e25ee72558154be09f0bdbcb6538ca0a70 SHA512 da8387a5ba1beaffaa42b8b18b2892f16dc5bd60f7a3b4f87285d84992c1c12d8f80b983860b6dd8e12d4cbce50e7c4ccf13d913a8b87d247f82671a3dfda9e7 DIST konsole-23.08.5.tar.xz 1839952 BLAKE2B 6e8c373a346903b741b3a16953b80590fe87f286613783dc99e96d815920240ce53a4774b27c920d842d8b189fe53d7bb7da95995c058102853ee9dc151d45d8 SHA512 dd227f0446b623839f984cfa2f00b94e16c929f35b4714e791a11baf90907ac87ed469f50980a07e6528fbcc1654192d2504676b73d7856b6389077a4ef01f88 DIST konsole-24.05.2.tar.xz 1770568 BLAKE2B feda024d6ee3c4ac0f2e84c9a4825829c63167cfbc86b6506dd0fefcc6ea28075a5b5685d474dfb746daee0cefeac6adef7227808f0da9a3d47bb941d82b2e2c SHA512 47b2fdfc4b79b1e8cef72aed9d77858347c0c89e7b0cd4106a2f0d362ea72a2d54b79385deb8525654a5b0da0fb19c8e1db370618a6f0ae2d8e1aab41e7261f3 EBUILD konsole-23.08.5.ebuild 1850 BLAKE2B 90e601c6d2e27cc5effded383ce09c2822307a2cb0c50282d5d87051fff6b5413556854aa8d66b3e5322a2a44387e3bfae714620c5d6a177c3a4475f3b2778df SHA512 dcbb54b206ac73a656013c6751e336267df0cac34e307c57ede405b8ccbe852a7361565ea29b55f9787e0e740fb7a2cf6cdddefef0e5cd8c42c0e9b5f9da203b -EBUILD konsole-24.05.2.ebuild 1740 BLAKE2B 497ce50cd059b3962f8e2b937adc0cd04bdc67de59ce6e45eebbe547dd28c4ad5fbcb618b1776b9099a6a855e055a937b1cc439f573bc182341e7c5ef8e4bd28 SHA512 dcedbecd6c12224889b26912ec33ae33b74cf2f5c05c03f67467c67663f691d3c35d623fd2a3857028148512b4d954fbae6a1d94f7f3f805c2a0e18c196bc866 +EBUILD konsole-24.05.2-r1.ebuild 1800 BLAKE2B 57fd0179a56ee1b367975f4b1bfc75c7529f8917c02d3c011758c8f52595edf50d9829757ca6ab3793393211c9f5719b33936df3340de291c492bac11382fd1e SHA512 9809877486c9d466ea1b60f3542c97db7db1d57153d4fe610d1e2a8b0cf0d3c6a344aae4e197b607a1885f699304fade1ae948812f635395db470fd531f72a50 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/konsole/files/konsole-24.05.2-cmake.patch b/kde-apps/konsole/files/konsole-24.05.2-cmake.patch new file mode 100644 index 000000000000..19064a3fde4c --- /dev/null +++ b/kde-apps/konsole/files/konsole-24.05.2-cmake.patch @@ -0,0 +1,136 @@ +From 3800a40653355dd165fe68f80611228fa94656ee Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 7 Jul 2024 23:27:32 +0200 +Subject: [PATCH] Drop faux X11 dependency and switch WITHOUT_X11 option to + WITH_X11 + +X11 is nowhere needed in the codebase. Follow-up to 2f116f9fb2438a6e66b6702b3cc2ace9d0205f96 + +Signed-off-by: Andreas Sturmlechner +(cherry picked from commit c5f2315c9df05ca069de25ab741d9fc38a6de21a) +--- + CMakeLists.txt | 7 +------ + src/MainWindow.cpp | 8 ++++---- + src/WindowSystemInfo.cpp | 4 ++-- + src/config-konsole.h.cmake | 2 +- + src/main.cpp | 4 ++-- + 5 files changed, 10 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd30a9888..0f00be8f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -95,12 +95,7 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION + 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}) +- endif() ++ option(WITH_X11 "Build with X11 integration" ON) + endif() + + # Check for function GETPWUID +diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp +index c034288df..163105357 100644 +--- a/src/MainWindow.cpp ++++ b/src/MainWindow.cpp +@@ -35,7 +35,7 @@ + #include + #include + +-#if HAVE_X11 ++#if WITH_X11 + #include + #endif + +@@ -156,7 +156,7 @@ void MainWindow::activationRequest(const QString &xdgActivationToken) + KWindowSystem::setCurrentXdgActivationToken(xdgActivationToken); + + if (KWindowSystem::isPlatformX11()) { +-#if HAVE_X11 ++#if WITH_X11 + KX11Extras::forceActiveWindow(winId()); + #endif + } else { +@@ -713,7 +713,7 @@ bool MainWindow::queryClose() + // NOTE: Some, if not all, of the below KWindowSystem calls are only + // implemented under x11 (KDE4.8 kdelibs/kdeui/windowmanagement). + +-#if HAVE_X11 ++#if WITH_X11 + // make sure the window is shown on current desktop and is not minimized + KX11Extras::setOnDesktop(winId(), KX11Extras::currentDesktop()); + #endif +@@ -1022,7 +1022,7 @@ void MainWindow::setRemoveWindowTitleBarAndFrame(bool frameless) + } + + if (KWindowSystem::isPlatformX11()) { +-#if HAVE_X11 ++#if WITH_X11 + const auto oldGeometry = saveGeometry(); + // This happens for every Konsole window. It depends on + // the fact that every window is processed in single thread +diff --git a/src/WindowSystemInfo.cpp b/src/WindowSystemInfo.cpp +index d6cad5f68..28cc3bd6c 100644 +--- a/src/WindowSystemInfo.cpp ++++ b/src/WindowSystemInfo.cpp +@@ -11,7 +11,7 @@ + + #include + +-#if HAVE_X11 ++#if WITH_X11 + #include + #include + #endif +@@ -22,7 +22,7 @@ bool WindowSystemInfo::HAVE_TRANSPARENCY = false; + + bool WindowSystemInfo::compositingActive() + { +-#if HAVE_X11 ++#if WITH_X11 + return !KWindowSystem::isPlatformX11() || KX11Extras::compositingActive(); + #else + return true; +diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake +index b860764d3..b9fac1e56 100644 +--- a/src/config-konsole.h.cmake ++++ b/src/config-konsole.h.cmake +@@ -3,7 +3,7 @@ + /* Defined if on DragonFly BSD */ + #cmakedefine01 HAVE_OS_DRAGONFLYBSD + +-#cmakedefine01 HAVE_X11 ++#cmakedefine01 WITH_X11 + + /* If defined, remove public access to dbus sendInput/runCommand */ + #cmakedefine01 REMOVE_SENDTEXT_RUNCOMMAND_DBUS_METHODS +diff --git a/src/main.cpp b/src/main.cpp +index 9f3b88286..b05877f3d 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -284,7 +284,7 @@ bool shouldUseNewProcess(int argc, char *argv[]) + QStringList qtProblematicOptions; + qtProblematicOptions << QStringLiteral("--session") << QStringLiteral("--name") << QStringLiteral("--reverse") << QStringLiteral("--stylesheet") + << QStringLiteral("--graphicssystem"); +-#if HAVE_X11 ++#if WITH_X11 + qtProblematicOptions << QStringLiteral("--display") << QStringLiteral("--visual"); + #endif + for (const QString &option : std::as_const(qtProblematicOptions)) { +@@ -296,7 +296,7 @@ bool shouldUseNewProcess(int argc, char *argv[]) + // take KDE options into consideration + QStringList kdeProblematicOptions; + kdeProblematicOptions << QStringLiteral("--config") << QStringLiteral("--style"); +-#if HAVE_X11 ++#if WITH_X11 + kdeProblematicOptions << QStringLiteral("--waitforwm"); + #endif + +-- +2.45.2 + diff --git a/kde-apps/konsole/konsole-24.05.2-r1.ebuild b/kde-apps/konsole/konsole-24.05.2-r1.ebuild new file mode 100644 index 000000000000..f9039c642964 --- /dev/null +++ b/kde-apps/konsole/konsole-24.05.2-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=6.3.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~riscv" +IUSE="X" + +DEPEND=" + dev-libs/icu:= + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kpty-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?] + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # fixed in 24.08 + +src_configure() { + local mycmakeargs=( + -DWITH_X11=$(usex X) + ) + ecm_src_configure +} + +src_test() { + # DBusTest: drkonqi process interferes. bug 702690 + # TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756 + local myctestargs=( + -E "(DBusTest|TerminalInterfaceTest)" + ) + + ecm_src_test +} diff --git a/kde-apps/konsole/konsole-24.05.2.ebuild b/kde-apps/konsole/konsole-24.05.2.ebuild deleted file mode 100644 index ebe2729c67c4..000000000000 --- a/kde-apps/konsole/konsole-24.05.2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org - -DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64 ~arm64 ~riscv" -IUSE="" - -DEPEND=" - dev-libs/icu:= - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] - >=dev-qt/qt5compat-${QTMIN}:6 - >=dev-qt/qtmultimedia-${QTMIN}:6 - >=kde-frameworks/kbookmarks-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/kpty-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME properly upstream - -src_test() { - # DBusTest: drkonqi process interferes. bug 702690 - # TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756 - local myctestargs=( - -E "(DBusTest|TerminalInterfaceTest)" - ) - - ecm_src_test -} -- cgit v1.2.3