From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- kde-apps/konsole/Manifest | 5 +- .../files/konsole-22.04.2-musl_malloc_trim.patch | 92 ---------------------- kde-apps/konsole/konsole-22.04.2.ebuild | 70 ---------------- kde-apps/konsole/konsole-22.04.3.ebuild | 68 ++++++++++++++++ 4 files changed, 70 insertions(+), 165 deletions(-) delete mode 100644 kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch delete mode 100644 kde-apps/konsole/konsole-22.04.2.ebuild create mode 100644 kde-apps/konsole/konsole-22.04.3.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 7690a8f6e217..c8d0303bfc5b 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,6 +1,5 @@ -AUX konsole-22.04.2-musl_malloc_trim.patch 2750 BLAKE2B 1fcfd6dd63d9210152f6a002cca997f1f4a418a3347b0af1bef9c16343ea30096c99db0030b980fa05f5d7b68e4d9f4c2ad25f24479756666857160ed577159e SHA512 2385215c0d84feaa2f34234eef9a5554575cbbca987132c29d5efcd44d838da6b1de4f8b0d60dce9b58cc4b073f60c2dbda5184182c36f20a043b5ea6617a6be DIST konsole-21.12.3.tar.xz 1391132 BLAKE2B d59bac520ab2fc6bd5edb8e3ea64f8bd7434ece2a1718a8149c7aed03321f91423903ce1a2a1b3ee604b8b2425dcee6df32f26f57003251e33fb1bfbc7cc1faf SHA512 75e1ad0c35b56e7e0e903600d87ba2391efe8f5715917d5cb5d13be27f1a5c2d971817e0acfbc291670c2076f2c829c80cf657641994aacfd71399846adb75e0 -DIST konsole-22.04.2.tar.xz 1467412 BLAKE2B 32c76d3ec6405887f2a9d3bb0234b3658b344fb27936d379c0638e1952960b4cff4503d19ad69ec272c713897016a4ef47f5f6fe1d5f8a730965e91678596098 SHA512 cd8ecc3e494cc2c087e03b4537b822986d36a04d75edf9c8d053a79578e148498582238f96018262cc74cdf86fe7abf7a0a4408e220ec0a9a49bb94d8aa10a76 +DIST konsole-22.04.3.tar.xz 1476120 BLAKE2B 6675955b6c2257d342e7560c759c95fe19301f76c72db6c542275acc879b78606eeb17893111930d575290048cb9047c7b42b8af7b60169d6995ae0efd03fd35 SHA512 05728efc051ae76b395c7ece1599e654ce3bdae0c8b43d7f8e34c76f57041f7722e161147c4a5699377b764aa8b3799421d5c735967216c5420b6f92330c1338 EBUILD konsole-21.12.3.ebuild 1697 BLAKE2B 56b9457ff9542f786d14a368282c6f326fd2f1c2200582a659002a179b883e5d04f46d4f11a02960ee6ce74a5c07572a9a6ca2990c86f186ba3452b1b9802f20 SHA512 480ae09515641749a421e6ebd137c3b29155f8a0202faa42e6305dd93df23c7da5b6e1857792e3fa1a95ad81bc25cfc6c87ac92b6aa0dd33349f29870e2fb576 -EBUILD konsole-22.04.2.ebuild 1764 BLAKE2B a64a50476763358dc8cec1b012891acbf900bbebdccc2d96c77686c67fc54852c8bff1b3f3a5d95f162f74bcf034e286b7c48cbe3bd7822297df4640e83f90f4 SHA512 06c545a86f412f0c00ebb72dac23b51d7ecf26373a47fa14db03be3d7490573a33ea8fd12d8e81253e337a22b61ac893ec9b2150cee454cdb4bcdeb5b3ec07ea +EBUILD konsole-22.04.3.ebuild 1700 BLAKE2B 2130661b407b127bab326f0c8a8479f7ab3b61c889f330932583d6673ed7bd7a861c85c8bf02e5dbb9ed811c47ef3b9e509338fd289d9b21fe02239bc55e8ff1 SHA512 98dc661b4f1ee1c100ee0665751d624d18ed47d174443ea34c4b349e4343346e5f12ae7a7277cca2247630cbdf926d389a59a1307503d16ad0470b7ce73a5a57 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch b/kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch deleted file mode 100644 index 455dbc55821f..000000000000 --- a/kde-apps/konsole/files/konsole-22.04.2-musl_malloc_trim.patch +++ /dev/null @@ -1,92 +0,0 @@ -https://invent.kde.org/utilities/konsole/-/merge_requests/621 -https://invent.kde.org/utilities/konsole/-/commit/b8c90a830ceaf293e61f6cd5217bb3e584f997b8 (backport) - - -From b8c90a830ceaf293e61f6cd5217bb3e584f997b8 Mon Sep 17 00:00:00 2001 -From: Heiko Becker -Date: Tue, 22 Mar 2022 22:08:10 +0100 -Subject: [PATCH] Detect the presence of malloc_trim to fix the build with musl - -malloc_trim is indeed a GNU extension, but an extension of glibc. -Relying on __GNUC__ unfortunately doesn't help with that. Check for -the actual presence of malloc_trim with cmake's check_function_exists -instead. -This fixes the build with musl libc, which doesn't come with -malloc_trim. - -Co-authored-by: Ahmad Samir -(cherry picked from commit f6310c2b791275f3727f2240ca7fab9f58db943d) ---- - CMakeLists.txt | 2 +- - src/Screen.cpp | 17 +++++++---------- - src/config-konsole.h.cmake | 4 ++-- - 3 files changed, 10 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2c9d43ac..b306597ba 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,7 @@ set(HAVE_X11 ${X11_FOUND}) - # Check for function GETPWUID - check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID) - --check_include_files(malloc.h HAVE_MALLOC_H) -+check_function_exists(malloc_trim HAVE_MALLOC_TRIM) - - # See above includes for defaults - add_definitions( -diff --git a/src/Screen.cpp b/src/Screen.cpp -index e57314cd5..dff9b54a4 100644 ---- a/src/Screen.cpp -+++ b/src/Screen.cpp -@@ -28,13 +28,11 @@ - #include "history/HistoryType.h" - #include "profile/Profile.h" - --#ifdef HAVE_MALLOC_H -- // For malloc_trim, which is a GNU extension -- #ifdef __GNUC__ -- extern "C" { -- #include -- } -- #endif -+#ifdef HAVE_MALLOC_TRIM -+// For malloc_trim, which is a GNU extension -+extern "C" { -+#include -+} - #endif - - using namespace Konsole; -@@ -1799,14 +1797,13 @@ void Screen::setScroll(const HistoryType &t, bool copyPreviousScroll) - t.scroll(_history); - } - --#ifdef HAVE_MALLOC_H -+#ifdef HAVE_MALLOC_TRIM -+ - #ifdef Q_OS_LINUX --#ifdef __GNUC__ - // We might have been using gigabytes of memory, so make sure it is actually released - malloc_trim(0); - #endif - #endif --#endif - } - - bool Screen::hasScroll() const -diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake -index b74992b0a..4b1d9b515 100644 ---- a/src/config-konsole.h.cmake -+++ b/src/config-konsole.h.cmake -@@ -15,5 +15,5 @@ - - #cmakedefine HAVE_GETPWUID ${HAVE_GETPWUID} - --/* Define to 1 if you have the header file. */ --#cmakedefine HAVE_MALLOC_H 1 -+/* Defined if system has the malloc_trim function, which is a GNU extension */ -+#cmakedefine HAVE_MALLOC_TRIM --- -GitLab - diff --git a/kde-apps/konsole/konsole-22.04.2.ebuild b/kde-apps/konsole/konsole-22.04.2.ebuild deleted file mode 100644 index 28bfdda48455..000000000000 --- a/kde-apps/konsole/konsole-22.04.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.92.0 -QTMIN=5.15.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="X" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${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/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/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - X? ( x11-libs/libX11 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-22.04.2-musl_malloc_trim.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} - -src_test() { - # drkonqi process interferes. bug 702690 - local myctestargs=( - -E "(DBusTest)" - ) - - ecm_src_test -} diff --git a/kde-apps/konsole/konsole-22.04.3.ebuild b/kde-apps/konsole/konsole-22.04.3.ebuild new file mode 100644 index 000000000000..25c6af697aab --- /dev/null +++ b/kde-apps/konsole/konsole-22.04.3.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.92.0 +QTMIN=5.15.4 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="X" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${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/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/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kpty-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=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=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +src_test() { + # drkonqi process interferes. bug 702690 + local myctestargs=( + -E "(DBusTest)" + ) + + ecm_src_test +} -- cgit v1.2.3