commit:     abafcded6b538a32c608eeeae45b541a42f6e671
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 19 18:25:29 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 19 18:25:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abafcded

media-gfx/gimp: forward-port -std=gnu17 to 3.x too

In d3d83c6a06a57241395a389970cf2fb8495a36ba, I said I wasn't going to do this,
but it hasn't been merged upstream yet still, so whatever. Let's avoid
an unnecessary build failure for people.

Closes: https://bugs.gentoo.org/944284
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/gimp/gimp-3.0.0_rc1.ebuild | 7 +++++--
 media-gfx/gimp/gimp-3.0.0_rc2.ebuild | 7 +++++--
 media-gfx/gimp/gimp-9999.ebuild      | 5 ++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
index 00639d92cbe4..88005560e5f9 100644
--- a/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit lua-single flag-o-matic meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -162,6 +162,9 @@ _adjust_sandbox() {
 src_configure() {
        _adjust_sandbox
 
+       # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+       append-cflags -std=gnu17
+
        use vala && vala_setup
 
        local emesonargs=(

diff --git a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild 
b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
index 1f159711d6dd..4fb8488213ef 100644
--- a/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
+++ b/media-gfx/gimp/gimp-3.0.0_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit lua-single flag-o-matic meson python-single-r1 toolchain-funcs vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -162,6 +162,9 @@ _adjust_sandbox() {
 src_configure() {
        _adjust_sandbox
 
+       # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+       append-cflags -std=gnu17
+
        use vala && vala_setup
 
        local emesonargs=(

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 8c2e550fc140..31b624a374d0 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -7,7 +7,7 @@ LUA_COMPAT=( luajit )
 PYTHON_COMPAT=( python3_{10..13} )
 VALA_USE_DEPEND=vapigen
 
-inherit git-r3 lua-single meson python-single-r1 toolchain-funcs vala xdg
+inherit git-r3 lua-single flag-o-matic meson python-single-r1 toolchain-funcs 
vala xdg
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/";
@@ -164,6 +164,9 @@ _adjust_sandbox() {
 src_configure() {
        _adjust_sandbox
 
+       # bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+       append-cflags -std=gnu17
+
        use vala && vala_setup
 
        local emesonargs=(

Reply via email to