From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/spectacle/
Date: Fri, 8 Jan 2021 00:00:42 +0000 (UTC) [thread overview]
Message-ID: <1610063449.ca596f8bfb5dccac2c74ba17d47a5574840ef3d5.asturm@gentoo> (raw)
commit: ca596f8bfb5dccac2c74ba17d47a5574840ef3d5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 23:46:02 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 23:50:49 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca596f8b
kde-apps/spectacle: Add IUSE="+annotate"
Bug: https://bugs.gentoo.org/760069
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/spectacle/metadata.xml | 1 +
kde-apps/spectacle/spectacle-20.12.49.9999.ebuild | 20 ++++++++++++--------
kde-apps/spectacle/spectacle-9999.ebuild | 20 ++++++++++++--------
3 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml
index 661377e45a..bc2d96259f 100644
--- a/kde-apps/spectacle/metadata.xml
+++ b/kde-apps/spectacle/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
+ <flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag>
<flag name="kipi">Enable support for the KDE Image Plugin Interface</flag>
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
</use>
diff --git a/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild b/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild
index 807e57548f..6749b4defc 100644
--- a/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild
+++ b/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild
@@ -16,19 +16,14 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
SLOT="5"
KEYWORDS=""
-IUSE="kipi share"
-
-# TODO: mv guru.git -> gentoo.git
-# IUSE+=" annotate"
-# DEPEND+="
-# dev-qt/qtsvg-${QTMIN}:5
-# x11-libs/kimageannotator
-# "
+IUSE="+annotate kipi share"
+# TODO: Qt5Svg leaking from media-libs/kimageannotator
DEPEND="
>=dev-qt/qdbus-${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
@@ -50,6 +45,7 @@ DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-cursor
x11-libs/xcb-util-image
+ annotate? ( media-libs/kimageannotator )
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
"
@@ -57,8 +53,16 @@ RDEPEND="${DEPEND}
kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
"
+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)
)
diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild
index 807e57548f..6749b4defc 100644
--- a/kde-apps/spectacle/spectacle-9999.ebuild
+++ b/kde-apps/spectacle/spectacle-9999.ebuild
@@ -16,19 +16,14 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"
LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
SLOT="5"
KEYWORDS=""
-IUSE="kipi share"
-
-# TODO: mv guru.git -> gentoo.git
-# IUSE+=" annotate"
-# DEPEND+="
-# dev-qt/qtsvg-${QTMIN}:5
-# x11-libs/kimageannotator
-# "
+IUSE="+annotate kipi share"
+# TODO: Qt5Svg leaking from media-libs/kimageannotator
DEPEND="
>=dev-qt/qdbus-${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
@@ -50,6 +45,7 @@ DEPEND="
x11-libs/xcb-util
x11-libs/xcb-util-cursor
x11-libs/xcb-util-image
+ annotate? ( media-libs/kimageannotator )
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
"
@@ -57,8 +53,16 @@ RDEPEND="${DEPEND}
kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
"
+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)
)
next reply other threads:[~2021-01-08 0:00 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 0:00 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-16 21:52 [gentoo-commits] proj/kde:master commit in: kde-apps/spectacle/ Andreas Sturmlechner
2025-03-16 21:52 Andreas Sturmlechner
2025-03-16 21:52 Andreas Sturmlechner
2025-03-15 21:41 Andreas Sturmlechner
2024-11-10 16:46 Andreas Sturmlechner
2024-11-04 23:01 Andreas Sturmlechner
2024-08-24 17:19 Sam James
2024-08-09 17:30 Andreas Sturmlechner
2024-06-20 14:25 Sam James
2024-06-19 12:46 Sam James
2024-06-17 16:04 Andreas Sturmlechner
2024-06-16 2:43 Sam James
2024-05-16 14:26 Andreas Sturmlechner
2024-04-22 20:41 Andreas Sturmlechner
2024-03-15 14:07 Andreas Sturmlechner
2024-02-27 22:08 Andreas Sturmlechner
2024-02-25 19:24 Sam James
2024-01-11 18:19 Sam James
2023-12-09 10:03 Andreas Sturmlechner
2023-03-23 22:10 Andreas Sturmlechner
2023-02-24 9:04 Andreas Sturmlechner
2023-02-23 20:25 Andreas Sturmlechner
2022-03-21 20:40 Andreas Sturmlechner
2022-03-21 20:40 Andreas Sturmlechner
2022-03-21 11:23 Andreas Sturmlechner
2022-03-21 10:43 Andreas Sturmlechner
2022-03-15 21:59 Andreas Sturmlechner
2022-03-15 21:59 Andreas Sturmlechner
2021-12-21 3:57 Sam James
2021-12-09 9:28 Andreas Sturmlechner
2021-02-26 13:09 Andreas Sturmlechner
2020-02-08 20:02 Andreas Sturmlechner
2019-09-08 18:23 Andreas Sturmlechner
2019-07-17 18:19 Andreas Sturmlechner
2019-06-22 11:40 Andreas Sturmlechner
2019-05-08 6:09 Andreas Sturmlechner
2019-03-26 22:01 Andreas Sturmlechner
2018-08-15 17:40 Andreas Sturmlechner
2018-08-06 23:59 Andreas Sturmlechner
2016-12-11 19:13 Michael Palimaka
2016-11-27 11:30 Michael Palimaka
2016-10-20 20:55 Michael Palimaka
2016-08-25 18:15 Michael Palimaka
2016-08-25 18:15 Michael Palimaka
2016-05-31 19:03 Johannes Huber
2016-04-24 18:08 Manuel Rüger
2016-03-25 14:00 Michael Palimaka
2016-03-08 10:25 Michael Palimaka
2016-03-08 10:25 Michael Palimaka
2016-01-20 14:52 Michael Palimaka
2016-01-20 14:52 Michael Palimaka
2016-01-04 16:21 Michael Palimaka
2016-01-02 15:36 Michael Palimaka
2016-01-01 16:28 Michael Palimaka
2015-11-14 16:03 Michael Palimaka
2015-11-13 16:52 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1610063449.ca596f8bfb5dccac2c74ba17d47a5574840ef3d5.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox