From 7b53727c308405425c55017c58d6ab033fd40a15 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 13 Jun 2026 19:59:29 +0300 Subject: [PATCH] Switch to new package format --- pkg.info => info.yml | 4 ++-- source.sh => recipe.sh | 11 +++++++++-- source-files/include-gdk-gdk.h.patch | 23 +++++++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) rename pkg.info => info.yml (96%) rename source.sh => recipe.sh (69%) create mode 100644 source-files/include-gdk-gdk.h.patch diff --git a/pkg.info b/info.yml similarity index 96% rename from pkg.info rename to info.yml index 1bfb4ff..082f15c 100644 --- a/pkg.info +++ b/info.yml @@ -1,7 +1,7 @@ name: gtkmm4 description: The official C++ interface for the popular GUI library GTK (version 4) version: 4.22.0 -revision: 1 +revision: 2 url: https://www.gtkmm.org/ license: LGPL2.1-or-later maintainers: @@ -9,7 +9,6 @@ maintainers: architecture: any type: source depends: - - atkmm - cairomm-1.16 - gcc-libs - gdk-pixbuf @@ -22,6 +21,7 @@ depends: - pangomm-2.48 - vulkan-loader make_depends: + - doxygen - meson - mm-common downloads: diff --git a/source.sh b/recipe.sh similarity index 69% rename from source.sh rename to recipe.sh index 3ff6b31..c9c619f 100644 --- a/source.sh +++ b/recipe.sh @@ -1,11 +1,18 @@ -# 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"/include-gdk-gdk.h.patch +} + # The build function is executed in the source directory # This function is used to compile the source code build() { - meson setup --prefix=/usr --libdir=/usr/lib --buildtype=release -Dmaintainer-mode=false build + meson setup --prefix=/usr -Dmaintainer-mode=false build meson compile -C build } diff --git a/source-files/include-gdk-gdk.h.patch b/source-files/include-gdk-gdk.h.patch new file mode 100644 index 0000000..5ded86d --- /dev/null +++ b/source-files/include-gdk-gdk.h.patch @@ -0,0 +1,23 @@ +From 149ba0a9803b1a5f0369069554095eb853d84d80 Mon Sep 17 00:00:00 2001 +From: Kjell Ahlstedt +Date: Sun, 17 May 2026 20:56:56 +0200 +Subject: [PATCH] Gtk::AccelKey: include + +It's no longer possible to include only gdk/gdkkeysyms.h. +--- + gtk/gtkmm/accelkey.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtk/gtkmm/accelkey.h b/gtk/gtkmm/accelkey.h +index 67a22bf98..d773de358 100644 +--- a/gtk/gtkmm/accelkey.h ++++ b/gtk/gtkmm/accelkey.h +@@ -19,7 +19,7 @@ + + #include + +-#include ++#include + #include + + namespace Gtk