summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-04-24 18:31:16 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-04-24 18:51:59 +0200
commit0acf1a0e0d4ac2e604ae282a894a1086c86a5df5 (patch)
treee1247b64e709c539f4f5762bbc8126c961bfe713
parentkde-apps/kate: Drop 21.04.0 (r0) (diff)
downloadgentoo-0acf1a0e.tar.gz
gentoo-0acf1a0e.tar.bz2
gentoo-0acf1a0e.zip
kde-apps/spectacle: Fix and add implicit dependency
See also: https://invent.kde.org/graphics/spectacle/-/merge_requests/63 Reported-by: Marco Genasci <fedeliallalinea@gmail.com> Closes: https://bugs.gentoo.org/785403 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch42
-rw-r--r--kde-apps/spectacle/spectacle-21.04.0-r1.ebuild73
2 files changed, 115 insertions, 0 deletions
diff --git a/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
new file mode 100644
index 000000000000..572cc501aeb8
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-21.04.0-implicit-dep.patch
@@ -0,0 +1,42 @@
+From a4450b62365d5e7c511e9855d31a68808c9bcfba Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 24 Apr 2021 18:22:10 +0200
+Subject: [PATCH] Add missing Qt5Concurrent
+
+Implicit use via KIO.
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 1 +
+ src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c63dca..7aac0d2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOR
+ find_package(
+ Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
+ Core
++ Concurrent
+ Widgets
+ DBus
+ PrintSupport
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3cd737b..c715a29 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -69,6 +69,7 @@ ki18n_wrap_ui(spectacle Gui/SettingsDialog/GeneralOptions.ui Gui/SettingsDialog/
+
+ target_link_libraries(
+ spectacle
++ Qt::Concurrent
+ Qt::DBus
+ Qt::PrintSupport
+ KF5::CoreAddons
+--
+2.31.1
+
diff --git a/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild
new file mode 100644
index 000000000000..5e0fd6932847
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-21.04.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Screenshot capture utility"
+HOMEPAGE="https://apps.kde.org/en/spectacle"
+
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+annotate kipi share"
+
+# TODO: Qt5Svg leaking from media-libs/kimageannotator
+DEPEND="
+ >=dev-qt/qdbus-${QTMIN}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ annotate? ( >=media-libs/kimageannotator-0.4.1 )
+ kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+ kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-implicit-dep.patch" ) # bug 785403
+
+src_prepare() {
+ ecm_src_prepare
+ # Unnecessary with >=media-libs/kimageannotator-0.4.0
+ sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package annotate kImageAnnotator)
+ $(cmake_use_find_package kipi KF5Kipi)
+ $(cmake_use_find_package share KF5Purpose)
+ )
+ ecm_src_configure
+}