diff --git a/pkg.info b/info.yml similarity index 98% rename from pkg.info rename to info.yml index 692c4d2..8322259 100644 --- a/pkg.info +++ b/info.yml @@ -1,7 +1,7 @@ name: yelp description: Get help with GNOME version: "49.1" -revision: 1 +revision: 2 url: https://apps.gnome.org/Yelp license: GPL-2.0-or-later maintainers: diff --git a/source.sh b/recipe.sh similarity index 75% rename from source.sh rename to recipe.sh index fe70379..3b420ba 100644 --- a/source.sh +++ b/recipe.sh @@ -1,7 +1,14 @@ -# This is the source.sh script. It is executed by BPM in a temporary directory when compiling a source package +# This is the recipe.sh script. It is executed by BPM in a temporary directory when compiling a source package # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT +# The prepare function is executed in the root of the temp directory +# This function is used for putting downloaded files to the correct location or applying patches +prepare() { + cd "$BPM_SOURCE" + patch -Np1 -i "$BPM_WORKDIR"/remove-include-of-gdkkeysyms.h.patch +} + # The build function is executed in the source directory # This function is used to compile the source code build() { diff --git a/source-files/remove-include-of-gdkkeysyms.h.patch b/source-files/remove-include-of-gdkkeysyms.h.patch new file mode 100644 index 0000000..7d5350e --- /dev/null +++ b/source-files/remove-include-of-gdkkeysyms.h.patch @@ -0,0 +1,50 @@ +From 96850f19a6dd000ef848031c4a23e60227aff6af Mon Sep 17 00:00:00 2001 +From: Jordan Petridis +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 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: +--- + 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 + #endif + +-#include + #include + #include + #include +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 + +-#include + #include + #include + #include +-- +GitLab +