public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: David King <amigadave@amigadave.com>
To: git-commits@fedoraproject.org
Subject: [rpms/yelp] rawhide: Fix build against recent gtk4
Date: Fri, 24 Jul 2026 22:00:28 GMT	[thread overview]
Message-ID: <178493042864.1.12508496985454680125.rpms-yelp-16463a79f562@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/yelp
Branch : rawhide
Commit : 16463a79f5629dedd0b1cc2d19a13e671e7f9abc
Author : David King <amigadave@amigadave.com>
Date   : 2026-07-24T23:00:03+01:00
Stats  : +51/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/yelp/c/16463a79f5629dedd0b1cc2d19a13e671e7f9abc?branch=rawhide

Log:
Fix build against recent gtk4

---
diff --git a/yelp-49.1-gdk-include.patch b/yelp-49.1-gdk-include.patch
new file mode 100644
index 0000000..7d5350e
--- /dev/null
+++ b/yelp-49.1-gdk-include.patch
@@ -0,0 +1,50 @@
+From 96850f19a6dd000ef848031c4a23e60227aff6af Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jpetridis@gnome.org>
+Date: Thu, 21 May 2026 16:32:18 +0300
+Subject: [PATCH] build: Remove include of gdkkeysyms.h
+
+18bd5e8cd2cf73e2a6c5d54e2fc5414177151868 in GTK [1] added a guard against
+the direct inclusion of the header and we should be including gdk.h
+instead.
+
+```
+error "Only <gdk/gdk.h> can be included directly."
+```
+
+Additionally gtk.h will include gdk.h for us so we can just remove it.
+
+[1] https://gitlab.gnome.org/GNOME/gtk/-/commit/18bd5e8cd2cf73e2a6c5d54e2fc5414177151868
+
+Part-of: <https://gitlab.gnome.org/GNOME/yelp/-/merge_requests/79>
+---
+ src/yelp-search-entry.c | 1 -
+ src/yelp-window.c       | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/yelp-search-entry.c b/src/yelp-search-entry.c
+index 7d830167..9e75dc15 100644
+--- a/src/yelp-search-entry.c
++++ b/src/yelp-search-entry.c
+@@ -24,7 +24,6 @@
+ #include <config.h>
+ #endif
+ 
+-#include <gdk/gdkkeysyms.h>
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+diff --git a/src/yelp-window.c b/src/yelp-window.c
+index a65be6e9..3dff75da 100644
+--- a/src/yelp-window.c
++++ b/src/yelp-window.c
+@@ -25,7 +25,6 @@
+ 
+ #include <math.h>
+ 
+-#include <gdk/gdkkeysyms.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ #include <gtk/gtk.h>
+-- 
+GitLab
+

diff --git a/yelp.spec b/yelp.spec
index 9620061..9fee9b2 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -8,6 +8,7 @@ Summary:       Help browser for the GNOME desktop
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later AND Apache-2.0 AND CC0-1.0
 URL:           https://wiki.gnome.org/Apps/Yelp
 Source:        https://download.gnome.org/sources/%{name}/%{gnome_major_version}/%{name}-%{gnome_tarball_version}.tar.xz
+Patch:         yelp-49.1-gdk-include.patch
 
 %gnome_check_version
 

                 reply	other threads:[~2026-07-24 22:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178493042864.1.12508496985454680125.rpms-yelp-16463a79f562@fedoraproject.org \
    --to=amigadave@amigadave.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox