* [gentoo-commits] repo/gentoo:master commit in: kde-apps/spectacle/, kde-apps/spectacle/files/
@ 2016-05-20 16:47 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2016-05-20 16:47 UTC (permalink / raw
To: gentoo-commits
commit: ddb8b02b1acbb281b21b09be7af15403fea9ee8f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 16:45:47 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 20 16:45:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb8b02b
kde-apps/spectacle: Fix hotkeys
Revision bump adds upstream patch to fix hotkeys, caused by invalid hotkeys
version specification.
Gentoo-bug: 581292
Package-Manager: portage-2.3.0_rc1
.../files/spectacle-16.04.1-hotkeys.patch | 25 +++++++++++
kde-apps/spectacle/spectacle-16.04.1-r1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/kde-apps/spectacle/files/spectacle-16.04.1-hotkeys.patch b/kde-apps/spectacle/files/spectacle-16.04.1-hotkeys.patch
new file mode 100644
index 0000000..421d0f5
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-16.04.1-hotkeys.patch
@@ -0,0 +1,25 @@
+From df84ed53f92c844ca98ef3b0a8bc9b4308eee816 Mon Sep 17 00:00:00 2001
+From: Boudhayan Gupta <me@BaloneyGeek.com>
+Date: Fri, 20 May 2016 21:40:19 +0530
+Subject: [PATCH] Fix invalid KHotkeys file version
+
+BUG: 362257
+---
+ desktop/spectacle.khotkeys | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/desktop/spectacle.khotkeys b/desktop/spectacle.khotkeys
+index b28fe37..d83d0c7 100644
+--- a/desktop/spectacle.khotkeys
++++ b/desktop/spectacle.khotkeys
+@@ -1,6 +1,6 @@
+ [Main]
+ ImportId=spectacle
+-Version=3
++Version=2
+
+ [Data]
+ DataCount=1
+--
+2.8.2
+
diff --git a/kde-apps/spectacle/spectacle-16.04.1-r1.ebuild b/kde-apps/spectacle/spectacle-16.04.1-r1.ebuild
new file mode 100644
index 0000000..b792c35
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-16.04.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screenshot capture utility"
+KEYWORDS="~amd64 ~x86"
+IUSE="kipi share"
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_plasma_dep libkscreen '' '' '5=')
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-image
+ kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+ share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+ !kde-apps/ksnapshot
+"
+
+PATCHES=( "${FILESDIR}/${P}-hotkeys.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package kipi KF5Kipi)
+ $(cmake-utils_use_find_package share KDEExperimentalPurpose)
+ )
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/spectacle/, kde-apps/spectacle/files/
@ 2021-04-24 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 0acf1a0e0d4ac2e604ae282a894a1086c86a5df5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 16:31:16 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 16:51:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0acf1a0e
kde-apps/spectacle: Fix and add implicit dependency
See also: https://invent.kde.org/graphics/spectacle/-/merge_requests/63
Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Closes: https://bugs.gentoo.org/785403
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/spectacle-21.04.0-implicit-dep.patch | 42 +++++++++++++
kde-apps/spectacle/spectacle-21.04.0-r1.ebuild | 73 ++++++++++++++++++++++
2 files changed, 115 insertions(+)
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 00000000000..572cc501aeb
--- /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 00000000000..5e0fd693284
--- /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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/spectacle/, kde-apps/spectacle/files/
@ 2021-05-07 22:14 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-05-07 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 8d0030b4778266c94f7972bbb01fa960fe9cc98a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 5 02:17:06 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 7 22:14:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0030b4
kde-apps/spectacle: Backport fix for implicit dependency to 20.12.3
Upstream commit a4450b62365d5e7c511e9855d31a68808c9bcfba
See also: https://invent.kde.org/graphics/spectacle/-/merge_requests/63
Reported-by: Marco Genasci <fedeliallalinea <AT> gmail.com>
Bug: https://bugs.gentoo.org/785403
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/spectacle-20.12.3-implicit-dep.patch | 42 +++++++++++++
kde-apps/spectacle/spectacle-20.12.3-r1.ebuild | 73 ++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/kde-apps/spectacle/files/spectacle-20.12.3-implicit-dep.patch b/kde-apps/spectacle/files/spectacle-20.12.3-implicit-dep.patch
new file mode 100644
index 00000000000..48ad7752b80
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-20.12.3-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
++ Qt5::Concurrent
+ Qt5::DBus
+ Qt5::PrintSupport
+ KF5::CoreAddons
+--
+2.31.1
+
diff --git a/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild b/kde-apps/spectacle/spectacle-20.12.3-r1.ebuild
new file mode 100644
index 00000000000..cf416d9e826
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-20.12.3-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.75.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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-07 22:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-24 16:52 [gentoo-commits] repo/gentoo:master commit in: kde-apps/spectacle/, kde-apps/spectacle/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-05-07 22:14 Andreas Sturmlechner
2016-05-20 16:47 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox