summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-09-19 16:49:47 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-09-19 17:23:16 +0200
commit429fa82f6d78b50aed431a0689223d8d54140992 (patch)
treece5c61eaaf2038de30a0133711c9bf851f9c0745 /kde-plasma/drkonqi
parentkde-plasma/kdeplasma-addons: drop 5.27.8 (diff)
downloadgentoo-429fa82f6d78b50aed431a0689223d8d54140992.tar.gz
gentoo-429fa82f6d78b50aed431a0689223d8d54140992.tar.bz2
gentoo-429fa82f6d78b50aed431a0689223d8d54140992.zip
kde-plasma/drkonqi: Add IUSE systemd and fix dependencies
Closes: https://bugs.gentoo.org/914138 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/drkonqi')
-rw-r--r--kde-plasma/drkonqi/Manifest1
-rw-r--r--kde-plasma/drkonqi/drkonqi-5.27.8-r1.ebuild84
-rw-r--r--kde-plasma/drkonqi/files/drkonqi-5.27.8-cmake.patch67
-rw-r--r--kde-plasma/drkonqi/metadata.xml3
4 files changed, 155 insertions, 0 deletions
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index c07930a9f828..079fc1c0ab92 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,3 +1,4 @@
DIST drkonqi-5.27.1-revert-add-sentry-support.patch.xz 11852 BLAKE2B 79cf8fd5bc07209ed85fd343593157d23f7ed0ca0e64c1d3deef2a11124781de8c5ae3f70e5a472aa0e4385412501b318b8052e07e13966cf96b8c6222163ca1 SHA512 fd4e02cc1f317fb49539794c0645f73805b4e71d414c4a6904a2da7a6b850c5778ed25c3341217ef3d820d8288bba78518045726d150a0ad6e756e4c59768c32
DIST drkonqi-5.27.7.tar.xz 861680 BLAKE2B a687c037a9002bc9920cfa477bc81f962b376c3d898e4c6c1611f90e6758e40fc759dcb40626da7627515817448e27f69ef7206de589d8d72112962ade8bff19 SHA512 7e600d6fff3af44d2d47cfdaec6edb99849e24f677b495cb28b55cd5d3d7803966dead8cfff11d94930f141dcaf5ea5022c64dfeba1fe03a316f7b2fe0e9e3ed
+DIST drkonqi-5.27.8-revert-add-sentry-support.patch.xz 11996 BLAKE2B 17bf8c3e5c9a5bad200d22fa59b84a97caeca2c164d8b92a1dea665df7e73111401e82c1bacf5ab24c40fb21767c6dea38b38afd288d32190e1c72e453a38558 SHA512 50e448f311bde34c7e77a229aa7816899b7eb743b522d41bd31cc2b18741939a028fe42e267ba440560535fcb33890e3360e20d157a2e5959d2943ce8960491d
DIST drkonqi-5.27.8.tar.xz 861576 BLAKE2B f60f1b87d2adfebe37e533aa8dd4667f41e8e8f5742d3b0215230a532a2325fbc127aff48cd6265961b3016050b3d192eafaadfd551203845739c95bef666b04 SHA512 f65f290f2980eca9819753b8bdbc49033d6c91d54e5443419641c9ad306f1cc6612d5eeafad9fbb78416d324cc48b31ae7d411aef4a264d93cc6d5baf8e8ef0a
diff --git a/kde-plasma/drkonqi/drkonqi-5.27.8-r1.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.8-r1.ebuild
new file mode 100644
index 000000000000..3becce8ceff4
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.27.8-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.9
+inherit ecm plasma.kde.org systemd
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="systemd"
+
+COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kidletime-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/syntax-highlighting-${KFMIN}:5
+ systemd? (
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ sys-apps/systemd:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+ || (
+ sys-devel/gdb
+ dev-util/lldb
+ )
+"
+
+PATCHES=(
+ "${WORKDIR}/${PN}-5.27.8-revert-add-sentry-support.patch" # bug 871759
+ "${FILESDIR}/${P}-cmake.patch" # bug 914138
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package systemd Systemd)
+ )
+ ecm_src_configure
+}
+
+src_test() {
+ # needs network access, bug #698510
+ local myctestargs=(
+ -E "(connectiontest)"
+ )
+ ecm_src_test
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] && systemd_is_booted ; then
+ elog "For systemd, steps are needed for integration with systemd-coredumpd."
+ elog "As root, run the following:"
+ elog "1. systemctl enable drkonqi-coredump-processor@.service"
+ elog "2. systemctl --user enable --now --global drkonqi-coredump-launcher.socket"
+ fi
+}
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.27.8-cmake.patch b/kde-plasma/drkonqi/files/drkonqi-5.27.8-cmake.patch
new file mode 100644
index 000000000000..9fc7b41035b3
--- /dev/null
+++ b/kde-plasma/drkonqi/files/drkonqi-5.27.8-cmake.patch
@@ -0,0 +1,67 @@
+From 1bb60d3eda5bc68e12b340bbbd4b4c4d296da603 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 19 Sep 2023 15:46:55 +0200
+Subject: [PATCH 1/2] Drop unused KCompletion dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 -
+ src/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index faa4260e..09ee0fab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,7 +48,6 @@ find_package(
+ JobWidgets
+ KIO
+ Crash
+- Completion
+ WidgetsAddons
+ Wallet
+ Notifications
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 112d97f7..fd0b9571 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -91,7 +91,6 @@ target_link_libraries(
+ KF5::KIOCore
+ KF5::KIOGui
+ KF5::Crash
+- KF5::Completion
+ KF5::WindowSystem
+ Qt::DBus
+ Qt::Concurrent
+--
+2.42.0
+
+
+From e2b9f7f3b1227d5cc4612d890c199a4864f217df Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 19 Sep 2023 16:00:59 +0200
+Subject: [PATCH 2/2] Don't build tests if not requested
+
+This is copied from src/tests/CMakeLists.txt
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt b/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt
+index cd1d3b6c..2d44ae76 100644
+--- a/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt
++++ b/src/bugzillaintegration/libbugzilla/autotests/CMakeLists.txt
+@@ -1,3 +1,8 @@
++if(NOT BUILD_TESTING)
++ # Skip everything. Particularly trying to look for integration test deps.
++ return()
++endif()
++
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+
+ include(ECMAddTests)
+--
+2.42.0
+
diff --git a/kde-plasma/drkonqi/metadata.xml b/kde-plasma/drkonqi/metadata.xml
index d925f2439758..be35b35a0d33 100644
--- a/kde-plasma/drkonqi/metadata.xml
+++ b/kde-plasma/drkonqi/metadata.xml
@@ -5,6 +5,9 @@
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
+ <use>
+ <flag name="systemd">Enable Coredumpd integration</flag>
+ </use>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>