commit: 5978acce87e698bc8d978ed9eb41539b39cb321e Author: Markus Meier <maekke <AT> gentoo <DOT> org> AuthorDate: Sat Jan 3 08:20:42 2026 +0000 Commit: Markus Meier <maekke <AT> gentoo <DOT> org> CommitDate: Sat Jan 3 08:20:42 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5978acce
media-gfx/darktable: add GDK patch for bug #968174 Bug: https://bugs.gentoo.org/968174 Signed-off-by: Markus Meier <maekke <AT> gentoo.org> media-gfx/darktable/darktable-5.4.0.ebuild | 5 ++-- .../files/darktable-5.4.0-gdk-20034.patch | 34 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/media-gfx/darktable/darktable-5.4.0.ebuild b/media-gfx/darktable/darktable-5.4.0.ebuild index 5017d26afe14..18b4acaecac2 100644 --- a/media-gfx/darktable/darktable-5.4.0.ebuild +++ b/media-gfx/darktable/darktable-5.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -98,9 +98,8 @@ PATCHES=( "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch "${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch - "${FILESDIR}/${PN}-5.0.1-no-Werror.patch" - #"${FILESDIR}/${PN}-5.0.1-fix-c-linkage-gcc-15.patch" + "${FILESDIR}/${P}-gdk-20034.patch" ) pkg_pretend() { diff --git a/media-gfx/darktable/files/darktable-5.4.0-gdk-20034.patch b/media-gfx/darktable/files/darktable-5.4.0-gdk-20034.patch new file mode 100644 index 000000000000..3cb044a308f7 --- /dev/null +++ b/media-gfx/darktable/files/darktable-5.4.0-gdk-20034.patch @@ -0,0 +1,34 @@ +From da91b66678b6b5e2c7656d842bb57da1137ffd27 Mon Sep 17 00:00:00 2001 +From: yuri1969 <[email protected]> +Date: Tue, 30 Dec 2025 11:34:47 +0100 +Subject: [PATCH] fix(gtk): amend build against X11-enabled GTK + +* Build failed at missing `GDK_TYPE_X11_DISPLAY` +* Corrected a typo +--- + src/gui/gtk.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/gui/gtk.c b/src/gui/gtk.c +index 398bf0e82918..7816660a01d8 100644 +--- a/src/gui/gtk.c ++++ b/src/gui/gtk.c +@@ -51,6 +51,9 @@ + #ifdef GDK_WINDOWING_WAYLAND + #include <gdk/gdkwayland.h> + #endif ++#ifdef GDK_WINDOWING_X11 ++#include <gdk/gdkx.h> ++#endif + #include <gtk/gtk.h> + #include <math.h> + #include <stdlib.h> +@@ -995,7 +998,7 @@ dt_gui_session_type_t dt_gui_get_session_type(void) + : DT_GUI_SESSION_X11; + #elif defined(GDK_WINDOWING_X11) + GdkDisplay* disp = gdk_display_get_default(); +- retun G_TYPE_CHECK_INSTANCE_TYPE(disp, GDK_TYPE_X11_DISPLAY) ++ return G_TYPE_CHECK_INSTANCE_TYPE(disp, GDK_TYPE_X11_DISPLAY) + ? DT_GUI_SESSION_X11 + : DT_GUI_SESSION_WAYLAND; + #else
