[gentoo-commits] repo/gentoo:master commit in: kde-apps/spectacle/files/, kde-apps/spectacle/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/spectacle/files/, kde-apps/spectacle/

[David Seifert]

commit:     7dd98a4042d9da68f1d59a701d8ca9fc6a992e60
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  5 12:52:13 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jul  5 12:52:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd98a40

kde-apps/spectacle: allow building with GCC 12

Closes: https://bugs.gentoo.org/934449
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../spectacle/files/spectacle-24.05.2-gcc12.patch  | 30 ++++++++++++++++++++++
 kde-apps/spectacle/spectacle-24.05.2.ebuild        |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch b/kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch
new file mode 100644
index 000000000000..e60de2c07123
--- /dev/null
+++ b/kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch
@@ -0,0 +1,30 @@
+Allow building with GCC 12
+https://invent.kde.org/graphics/spectacle/-/merge_requests/383
+
+--- a/src/Gui/Annotations/AnnotationDocument.cpp
++++ b/src/Gui/Annotations/AnnotationDocument.cpp
+@@ -16,6 +16,7 @@
+ #include <QQuickWindow>
+ #include <QScreen>
+ #include <memory>
++#include <source_location>
+ 
+ using G = Geometry;
+ 
+@@ -73,12 +74,12 @@
+ {
+     // Don't allow an invalid canvas rect or device pixel ratio.
+     if (rect.isEmpty()) {
+-        Log::warning() << std::format("`{}`:\n\t`rect` is empty. This should not happen.",
+-                                      std::source_location::current().function_name());
++        Log::warning() << '`' << std::source_location::current().function_name()
++            << "`:\n\t`rect` is empty. This should not happen.";
+         return;
+     } else if (dpr <= 0) {
+-        Log::warning() << std::format("`{}`:\n\t`dpr` <= 0. This should not happen.",
+-                                      std::source_location::current().function_name());
++        Log::warning() << '`' << std::source_location::current().function_name()
++            << "`:\n\t`dpr` <= 0. This should not happen.";
+         return;
+     }
+     const bool posChanged = m_canvasRect.topLeft() != rect.topLeft();

diff --git a/kde-apps/spectacle/spectacle-24.05.2.ebuild b/kde-apps/spectacle/spectacle-24.05.2.ebuild
index 18918f9a95ae..c26afa6446ac 100644
--- a/kde-apps/spectacle/spectacle-24.05.2.ebuild
+++ b/kde-apps/spectacle/spectacle-24.05.2.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
-KDE_GCC_MINIMAL=13
 PVCUT=$(ver_cut 1-3)
 KFMIN=6.3.0
 QTMIN=6.6.2
@@ -62,6 +61,8 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
+PATCHES=( "${FILESDIR}"/${P}-gcc12.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package share KF6Purpose)