summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2024-07-05 14:52:13 +0200
committerDavid Seifert <soap@gentoo.org>2024-07-05 14:52:13 +0200
commit7dd98a4042d9da68f1d59a701d8ca9fc6a992e60 (patch)
treeed072d234c23ccec2b2d207a9bc8a06717508cf1 /kde-apps/spectacle
parentsys-kernel/gentoo-sources: add 6.9.8, BMQ Sched with USE=experimental (diff)
downloadgentoo-7dd98a4042d9da68f1d59a701d8ca9fc6a992e60.tar.gz
gentoo-7dd98a4042d9da68f1d59a701d8ca9fc6a992e60.tar.bz2
gentoo-7dd98a4042d9da68f1d59a701d8ca9fc6a992e60.zip
kde-apps/spectacle: allow building with GCC 12
Closes: https://bugs.gentoo.org/934449 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'kde-apps/spectacle')
-rw-r--r--kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch30
-rw-r--r--kde-apps/spectacle/spectacle-24.05.2.ebuild3
2 files changed, 32 insertions, 1 deletions
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)