From 8d1e75103cf3df3788acb8f7afb3b36d3009b5ac Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 16 Mar 2026 14:35:12 -0700 Subject: [PATCH 01/10] gi-docgen: update to 2026.1. --- srcpkgs/gi-docgen/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template index a63ba369c4592e..1d06641b45020b 100644 --- a/srcpkgs/gi-docgen/template +++ b/srcpkgs/gi-docgen/template @@ -1,7 +1,7 @@ # Template file for 'gi-docgen' pkgname=gi-docgen -version=2025.4 -revision=2 +version=2026.1 +revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml @@ -12,5 +12,5 @@ license="Apache-2.0, GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gi-docgen/" changelog="https://gitlab.gnome.org/GNOME/gi-docgen/-/releases" distfiles="${GNOME_SITE}/gi-docgen/${version%.*}/gi-docgen-$version.tar.xz" -checksum=66c865d459febdfb5e4078a88df06183620c3e91f726d1dc608d88ee3605526e +checksum=c316d6c04699976b6823912aae1fb2a6a3ffa2553b422be88fb56eb881acf479 make_check=no # no tests, but check fails From b9770dadf061352b2e16e9a4dcb9b96adad0aa3c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 16 Mar 2026 14:35:42 -0700 Subject: [PATCH 02/10] glib-bootstrap: update to 2.88.0. --- srcpkgs/glib-bootstrap/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/glib-bootstrap/template b/srcpkgs/glib-bootstrap/template index 8f8ca0f72ac893..17c62043192860 100644 --- a/srcpkgs/glib-bootstrap/template +++ b/srcpkgs/glib-bootstrap/template @@ -4,7 +4,7 @@ # This aloing with gobject-introspection-bootstrap is unfortunately necessary as a part of the # libgirepository-1.0 to libgirepository-2.0 migration. pkgname=glib-bootstrap -version=2.86.1 +version=2.88.0 revision=1 build_style=meson # static version is necessary for qemu-user @@ -18,11 +18,11 @@ checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest" short_desc="GNU library of C routines" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Projects/GLib" -changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS" +homepage="https://www.gtk.org" +changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-88/NEWS" #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=119d1708ca022556d6d2989ee90ad1b82bd9c0d1667e066944a6d0020e2d5e57 +checksum=3546251ccbb3744d4bc4eb48354540e1f6200846572bab68e3a2b7b2b64dfd07 python_version=3 make_check_pre="dbus-run-session" From e6782e1199b7acb0f5de6da3c3bdb26aa696a23e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 16 Mar 2026 14:35:56 -0700 Subject: [PATCH 03/10] glib: update to 2.88.0. --- ...9b7fb2bb3c92d2e68b74c64c20a5418cf986.patch | 42 ----------- ...e1c16f1b5f89815a7bd6f66835e2a19db11f.patch | 34 --------- ...a0e8cb2426c1b52a0d3d89bd97cc17919961.patch | 69 ------------------- srcpkgs/glib/template | 10 +-- 4 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 srcpkgs/glib/patches/90c29b7fb2bb3c92d2e68b74c64c20a5418cf986.patch delete mode 100644 srcpkgs/glib/patches/9f47e1c16f1b5f89815a7bd6f66835e2a19db11f.patch delete mode 100644 srcpkgs/glib/patches/bb23a0e8cb2426c1b52a0d3d89bd97cc17919961.patch diff --git a/srcpkgs/glib/patches/90c29b7fb2bb3c92d2e68b74c64c20a5418cf986.patch b/srcpkgs/glib/patches/90c29b7fb2bb3c92d2e68b74c64c20a5418cf986.patch deleted file mode 100644 index 8521bf5e5bbc9e..00000000000000 --- a/srcpkgs/glib/patches/90c29b7fb2bb3c92d2e68b74c64c20a5418cf986.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 90c29b7fb2bb3c92d2e68b74c64c20a5418cf986 Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Tue, 21 Oct 2025 15:42:54 -0500 -Subject: [PATCH] gresolver: Fix loopback detection of IPv6 addresses - -Previously the len passed to g_socket_address_new_from_native() was only -for IPv4 addresses and the constructor would fail. - -This was reported and discussed here: -https://gitlab.gnome.org/GNOME/glib/-/commit/fe0139ee985075f3c12932d7123cb594356e7e9d#note_2581394 ---- - gio/gthreadedresolver.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c -index 988015b7a4..78740b0910 100644 ---- a/gio/gthreadedresolver.c -+++ b/gio/gthreadedresolver.c -@@ -292,11 +292,19 @@ check_only_has_loopback_interfaces (void) - for (struct ifaddrs *addr = addrs; addr; addr = addr->ifa_next) - { - struct sockaddr *sa = addr->ifa_addr; -+ size_t addrlen; - GSocketAddress *saddr; - if (!sa) - continue; - -- saddr = g_socket_address_new_from_native (sa, sizeof (struct sockaddr)); -+ if (sa->sa_family == AF_INET) -+ addrlen = sizeof (struct sockaddr_in); -+ else if (sa->sa_family == AF_INET6) -+ addrlen = sizeof (struct sockaddr_in6); -+ else -+ continue; -+ -+ saddr = g_socket_address_new_from_native (sa, addrlen); - if (!saddr) - continue; - --- -GitLab - diff --git a/srcpkgs/glib/patches/9f47e1c16f1b5f89815a7bd6f66835e2a19db11f.patch b/srcpkgs/glib/patches/9f47e1c16f1b5f89815a7bd6f66835e2a19db11f.patch deleted file mode 100644 index 464b7c6463242c..00000000000000 --- a/srcpkgs/glib/patches/9f47e1c16f1b5f89815a7bd6f66835e2a19db11f.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9f47e1c16f1b5f89815a7bd6f66835e2a19db11f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= -Date: Thu, 23 Oct 2025 22:35:42 +0200 -Subject: [PATCH] gregex: Handle PCRE2_ERROR_MISSING_NUMBER_TERMINATOR if - defined - -When the error is defined in a new enough PCRE2 we should handle it. - -However let's not define an error message for this in this commit (just -let's use the old one that is generic enough), so that it can be backported -to stable versions without having to require new translations. - -Closes: #3809 ---- - glib/gregex.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/glib/gregex.c b/glib/gregex.c -index 969c702b4d..fac3f58fe1 100644 ---- a/glib/gregex.c -+++ b/glib/gregex.c -@@ -770,6 +770,9 @@ translate_compile_error (gint *errcode, const gchar **errmsg) - *errmsg = _("inconsistent NEWLINE options"); - break; - case PCRE2_ERROR_BACKSLASH_G_SYNTAX: -+#ifdef PCRE2_ERROR_MISSING_NUMBER_TERMINATOR -+ case PCRE2_ERROR_MISSING_NUMBER_TERMINATOR: -+#endif - *errcode = G_REGEX_ERROR_MISSING_BACK_REFERENCE; - *errmsg = _("\\g is not followed by a braced, angle-bracketed, or quoted name or " - "number, or by a plain number"); --- -GitLab - diff --git a/srcpkgs/glib/patches/bb23a0e8cb2426c1b52a0d3d89bd97cc17919961.patch b/srcpkgs/glib/patches/bb23a0e8cb2426c1b52a0d3d89bd97cc17919961.patch deleted file mode 100644 index 481eda3f68d2af..00000000000000 --- a/srcpkgs/glib/patches/bb23a0e8cb2426c1b52a0d3d89bd97cc17919961.patch +++ /dev/null @@ -1,69 +0,0 @@ -From bb23a0e8cb2426c1b52a0d3d89bd97cc17919961 Mon Sep 17 00:00:00 2001 -From: Tobias Stoeckmann -Date: Fri, 24 Oct 2025 13:34:03 +0200 -Subject: [PATCH] gutils: Strip all trailing slashes - -The code stripped all but the first trailing slash in order to handle -the absolute root path "/". This breaks the removal of trailing slashes -for paths starting with $HOME, though. - -Fix the logic to remove all trailing slashes if $HOME is encountered. - -Closes #3811 ---- - glib/gutilsprivate.c | 6 ++++-- - glib/tests/utils.c | 7 ++++++- - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/glib/gutilsprivate.c b/glib/gutilsprivate.c -index 083f88c2cc..3b9206c45c 100644 ---- a/glib/gutilsprivate.c -+++ b/glib/gutilsprivate.c -@@ -27,6 +27,7 @@ load_user_special_dirs_from_string (const gchar *string, const gchar *home_dir, - { - gchar **lines; - gint n_lines, i; -+ size_t min_len; - - lines = g_strsplit (string, "\n", -1); - n_lines = g_strv_length (lines); -@@ -122,8 +123,9 @@ load_user_special_dirs_from_string (const gchar *string, const gchar *home_dir, - - d = p; - -- /* remove trailing slashes */ -- for (len = strlen (d); len > 1 && d[len - 1] == '/'; len--) -+ /* remove trailing slashes, but keep first slash in absolute path */ -+ min_len = is_relative ? 0 : 1; -+ for (len = strlen (d); len > min_len && d[len - 1] == '/'; len--) - d[len - 1] = 0; - - /* Duplicates override the previous value. This is not explicit in the -diff --git a/glib/tests/utils.c b/glib/tests/utils.c -index 2d0b2ed708..e886897ba0 100644 ---- a/glib/tests/utils.c -+++ b/glib/tests/utils.c -@@ -883,7 +883,9 @@ test_user_special_dirs_load_unlocked (void) - "XDG_DOWNLOAD_DIR = \"$HOME/Downloads\"\n" - "XDG_MUSIC_DIR = \"///\"\n" - "XDG_PICTURES_DIR = \"$HOME/Pictures\"\n" -- "XDG_PICTURES_DIR = \"/\"\nXDG_DOWNLOAD_DIR = \"/dev/null\n"); -+ "XDG_PICTURES_DIR = \"/\"\n" -+ "XDG_PUBLICSHARE_DIR = \"$HOME/\"\n" -+ "XDG_DOWNLOAD_DIR = \"/dev/null\n"); - - g_reload_user_special_dirs_cache (); - -@@ -903,6 +905,9 @@ test_user_special_dirs_load_unlocked (void) - - dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES); - g_assert_cmpstr (dir, ==, "/"); -+ -+ dir = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE); -+ g_assert_cmpstr (dir, ==, g_get_home_dir ()); - } - else - { --- -GitLab - diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index ca402c15f73fd0..d08c7b0cc13ea1 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,8 +1,8 @@ # Template file for 'glib' # keep in sync with glib-bootstrap pkgname=glib -version=2.86.1 -revision=2 +version=2.88.0 +revision=1 build_style=meson build_helper="qemu" # static version is necessary for qemu-user @@ -17,11 +17,11 @@ checkdepends="glib-bootstrap desktop-file-utils shared-mime-info dbus python3-py short_desc="GNU library of C routines" maintainer="Orphaned " license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Projects/GLib" -changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-82/NEWS" +homepage="https://www.gtk.org" +changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-88/NEWS" #changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=119d1708ca022556d6d2989ee90ad1b82bd9c0d1667e066944a6d0020e2d5e57 +checksum=3546251ccbb3744d4bc4eb48354540e1f6200846572bab68e3a2b7b2b64dfd07 python_version=3 conflicts="gir-freedesktop<1.80.0_1" # glib typelibs are now in glib make_check_pre="dbus-run-session" From 22e8e14d35f8ccfdb408e835d0116d2e86aaef6e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 19:51:53 -0700 Subject: [PATCH 04/10] python3-gobject: update to 3.56.2. --- srcpkgs/python3-gobject/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template index 07d1fa8400cc6a..f3d1b65148f028 100644 --- a/srcpkgs/python3-gobject/template +++ b/srcpkgs/python3-gobject/template @@ -1,7 +1,7 @@ # Template file for 'python3-gobject' pkgname=python3-gobject -version=3.54.2 -revision=2 +version=3.56.2 +revision=1 build_style=meson build_helper="gir" configure_args="-Dpython=python${py3_ver}" @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://pygobject.readthedocs.io/" changelog="https://pygobject.readthedocs.io/en/latest/changelog.html" distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.gz" -checksum=03cffeb49d8a1879b621d8f606ac904218019a0ae699b1cd3780a8ee611e696b +checksum=b816098969544081de9eecedb94ad6ac59c77e4d571fe7051f18bebcec074313 provides="py3:gi-${version}_${revision}" make_check_pre="xvfb-run" From 5b979942df48402dc2d6bf4da5393b1564f8c639 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 19:52:18 -0700 Subject: [PATCH 05/10] gjs: update to 1.88.0. Install mosjs140 as hostmakedep to ensure the correct ICU data is installed for the GIR qemu. --- srcpkgs/gjs/patches/ignore-encoding-test.patch | 13 +++++++------ srcpkgs/gjs/template | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/srcpkgs/gjs/patches/ignore-encoding-test.patch b/srcpkgs/gjs/patches/ignore-encoding-test.patch index 98c42ad1010977..9a3f8dba98e118 100644 --- a/srcpkgs/gjs/patches/ignore-encoding-test.patch +++ b/srcpkgs/gjs/patches/ignore-encoding-test.patch @@ -1,11 +1,12 @@ broken on musl --- a/installed-tests/js/meson.build --- b/installed-tests/js/meson.build -@@ -242,7 +242,6 @@ modules_tests = [ - 'Console', - 'ESModules', +@@ -23,7 +23,6 @@ jasmine_tests = [ 'AsyncMainloop', + 'Cairo', + 'Console', - 'Encoding', - 'GLibLogWriter', - 'Global', - 'Timers', + 'ESModules', + 'Exceptions', + 'Fundamental', + diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 1832b603583d78..911d8d0f52243a 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -1,11 +1,11 @@ # Template file for 'gjs' pkgname=gjs -version=1.86.0 +version=1.88.0 revision=1 build_style=meson build_helper="gir qemu" configure_args="-Dprofiler=disabled -Dinstalled_tests=false" -hostmakedepends="glib-devel pkg-config icu" +hostmakedepends="glib-devel pkg-config mozjs140" makedepends="dbus-glib-devel mozjs140-devel readline-devel sysprof-devel" checkdepends="xvfb-run cantarell-fonts gtk4-devel" short_desc="Mozilla-based javascript bindings for the GNOME platform" @@ -15,7 +15,7 @@ homepage="https://gitlab.gnome.org/GNOME/gjs" changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/master/NEWS" #changelog="https://gitlab.gnome.org/GNOME/gjs/-/raw/gnome-49/NEWS" distfiles="${GNOME_SITE}/gjs/${version%.*}/gjs-${version}.tar.xz" -checksum=63448f7a57804d4c2a8d0c7f5e90e224d04d4eb2d560142c076c65a8eda00799 +checksum=30a0b9f3317e8e60b1896db2903c70e8b0cd33df953c328755803a75191dc453 make_check_pre="xvfb-run" if [ "$XBPS_CHECK_PKGS" ]; then From b86c25c9d4bc7671fb96bdff1b6a7075565c5e82 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 19:52:41 -0700 Subject: [PATCH 06/10] libpeas2: update to 2.2.1. --- .../libpeas2/patches/test-gobject-3.55.patch | 25 +++++++++++++++++++ srcpkgs/libpeas2/template | 6 ++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/libpeas2/patches/test-gobject-3.55.patch diff --git a/srcpkgs/libpeas2/patches/test-gobject-3.55.patch b/srcpkgs/libpeas2/patches/test-gobject-3.55.patch new file mode 100644 index 00000000000000..e4cf796afd4350 --- /dev/null +++ b/srcpkgs/libpeas2/patches/test-gobject-3.55.patch @@ -0,0 +1,25 @@ +Source: https://gitlab.gnome.org/GNOME/libpeas/-/issues/65 + +diff --git a/tests/libpeas/extension-py.c b/tests/libpeas/extension-py.c +index 4ac6fe5..995e698 100644 +--- a/tests/libpeas/extension-py.c ++++ b/tests/libpeas/extension-py.c +@@ -51,7 +51,7 @@ test_extension_py_instance_refcount (PeasEngine *engine, + + g_object_add_weak_pointer (extension, (gpointer *) &extension); + +- g_assert_cmpint (extension->ref_count, ==, 2); ++ g_assert_cmpint (extension->ref_count, ==, 1); + + g_object_unref (extension); + g_assert_true (extension == NULL); +@@ -88,7 +88,7 @@ test_extension_py_activatable_subject_refcount (PeasEngine *engine, + wrapper = g_object_get_data (object, "PyGObject::wrapper"); + g_assert_cmpint (wrapper->ob_refcnt, ==, 1); + +- g_assert_cmpint (G_OBJECT (extension)->ref_count, ==, 2); ++ g_assert_cmpint (G_OBJECT (extension)->ref_count, ==, 1); + g_object_unref (extension); + + /* We unreffed the extension, so it should have been destroyed and our dummy + diff --git a/srcpkgs/libpeas2/template b/srcpkgs/libpeas2/template index d6b30a4594d3ad..74e4bbba6d2b15 100644 --- a/srcpkgs/libpeas2/template +++ b/srcpkgs/libpeas2/template @@ -1,7 +1,7 @@ # Template file for 'libpeas2' pkgname=libpeas2 -version=2.2.0 -revision=2 +version=2.2.1 +revision=1 build_style=meson build_helper="gir" configure_args="-Dgtk_doc=true -Dvapi=true" @@ -17,7 +17,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/Libpeas" changelog="https://gitlab.gnome.org/GNOME/libpeas/-/raw/main/NEWS" distfiles="${GNOME_SITE}/libpeas/${version%.*}/libpeas-${version}.tar.xz" -checksum=c2887233f084a69fabfc7fa0140d410491863d7050afb28677f9a553b2580ad9 +checksum=589eca89b437006edf3755478df037c740a2a84cfa5d202dbad6095e828e2488 make_check_pre="xvfb-run" post_patch() { From a2d1445f558617d269a3c5a62125810dccad3117 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 19:53:21 -0700 Subject: [PATCH 07/10] glibmm2.68: update to 2.88.0. --- srcpkgs/glibmm2.68/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/glibmm2.68/template b/srcpkgs/glibmm2.68/template index 749125a5fe950e..4ee2e16326fa42 100644 --- a/srcpkgs/glibmm2.68/template +++ b/srcpkgs/glibmm2.68/template @@ -1,6 +1,6 @@ # Template file for 'glibmm2.68' pkgname=glibmm2.68 -version=2.86.0 +version=2.88.0 revision=1 build_style=meson configure_args="-Dbuild-examples=false" @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" changelog="https://gitlab.gnome.org/GNOME/glibmm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz" -checksum=39c0e9f6da046d679390774efdb9ad564436236736dc2f7825e614b2d4087826 +checksum=a6549da3a6c43de83b8717dae5413c57a60d92f6ecc624615c612d0bb0ad0fe2 glibmm2.68-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From db3b17c8e94b29ae8ad52af69649916f53c2bbd7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 19:56:15 -0700 Subject: [PATCH 08/10] glibmm: update to 2.66.8. --- srcpkgs/glibmm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index d876dde883db69..65445dc1b52ac9 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,6 +1,6 @@ # Template file for 'glibmm' pkgname=glibmm -version=2.66.6 +version=2.66.8 revision=1 build_style=meson configure_args="-Dbuild-examples=false" @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" changelog="https://gitlab.gnome.org/GNOME/glibmm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz" -checksum=5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f +checksum=64f11d3b95a24e2a8d4166ecff518730f79ecc27222ef41faf7c7e0340fc9329 glibmm-devel_package() { depends="${makedepends} glibmm>=${version}_${revision}" From a712bda5af90da5a8906fc6d0570eed77bde767b Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 31 Mar 2026 20:15:58 -0700 Subject: [PATCH 09/10] gobject-introspection-bootstrap: force rebuild for glib 2.88 --- srcpkgs/gobject-introspection-bootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template index 8ddaf131ba72da..a3aa8cb3cfdf09 100644 --- a/srcpkgs/gobject-introspection-bootstrap/template +++ b/srcpkgs/gobject-introspection-bootstrap/template @@ -5,7 +5,7 @@ # libgirepository-1.0 to libgirepository-2.0 migration. pkgname=gobject-introspection-bootstrap version=1.86.0 -revision=2 +revision=3 build_style=meson build_helper="qemu" configure_args="-Dbuild_introspection_data=false" From 747730f2e5007b1065eb077252d44724f230f7c6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Wed, 1 Apr 2026 16:12:56 -0700 Subject: [PATCH 10/10] lua54-lgi: backport patches for glib 2.88.x --- srcpkgs/lua54-lgi/patches/glib-2.87.0.patch | 38 +++++++++++++++++++++ srcpkgs/lua54-lgi/template | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lua54-lgi/patches/glib-2.87.0.patch diff --git a/srcpkgs/lua54-lgi/patches/glib-2.87.0.patch b/srcpkgs/lua54-lgi/patches/glib-2.87.0.patch new file mode 100644 index 00000000000000..014ffc2816a91f --- /dev/null +++ b/srcpkgs/lua54-lgi/patches/glib-2.87.0.patch @@ -0,0 +1,38 @@ +From cd40a5edfc72f2abd26de3f8be34c3f48a4b4897 Mon Sep 17 00:00:00 2001 +From: Victoria Lacroix +Date: Wed, 4 Feb 2026 14:12:03 -0500 +Subject: [PATCH] ffi: conform load_enum to GLib 2.87.0 + +GLib 2.87.0 includes a fix +(https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4803) to how enum +values are handled, causing the value to be read as a Lua table instead +of a GLib array. This requires some slightly tweaked code when loading +an enum. +--- + LuaGObject/ffi.lua | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/LuaGObject/ffi.lua b/LuaGObject/ffi.lua +index 62ecffb3..e8912f95 100644 +--- a/lgi/ffi.lua ++++ b/lgi/ffi.lua +@@ -86,9 +86,15 @@ function ffi.load_enum(gtype, name) + end + local enum_class = core.record.cast( + type_class, is_flags and GObject.FlagsClass or GObject.EnumClass) +- for i = 0, enum_class.n_values - 1 do +- local val = core.record.fromarray(enum_class.values, i) +- enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value ++ if GLib.check_version(2, 87, 0) then ++ for i = 0, enum_class.n_values - 1 do ++ local val = core.record.fromarray(enum_class.values, i) ++ enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value ++ end ++ else ++ for _, val in ipairs(enum_class.values) do ++ enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value ++ end + end + -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd + if GLib.check_version(2, 86, 0) then + diff --git a/srcpkgs/lua54-lgi/template b/srcpkgs/lua54-lgi/template index c7ca36f326bbe2..45835cfc6563cd 100644 --- a/srcpkgs/lua54-lgi/template +++ b/srcpkgs/lua54-lgi/template @@ -1,7 +1,7 @@ # Template file for 'lua54-lgi' pkgname=lua54-lgi version=0.9.2 -revision=5 +revision=6 hostmakedepends="pkg-config" makedepends="libglib-devel libffi-devel lua51-devel lua52-devel lua53-devel lua54-devel gobject-introspection gir-freedesktop"