Package: guix-patches;
Reported by: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Date: Mon, 21 Apr 2025 13:55:02 UTC
Severity: normal
Tags: patch
Message #35 received at 77956 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 77956 <at> debbugs.gnu.org Subject: [PATCH gnome-team 07/23] gnu: vala <at> 0.52: Fix GIR parser. Date: Mon, 21 Apr 2025 15:47:48 +0200
* gnu/packages/patches/vala-0.52-fix-valagirparser.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/gnome.scm (vala-0.52)[patches]: Use it here.
---
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 3 +-
.../patches/vala-0.52-fix-valagirparser.patch | 72 +++++++++++++++++++
3 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/vala-0.52-fix-valagirparser.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 9929877bbbe..31d34b6b72e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2385,6 +2385,7 @@ dist_patch_DATA = \
%D%/packages/patches/unzip-32bit-zipbomb-fix.patch \
%D%/packages/patches/ustr-fix-build-with-gcc-5.patch \
%D%/packages/patches/util-linux-tests.patch \
+ %D%/packages/patches/vala-0.52-fix-valagirparser.patch \
%D%/packages/patches/vboot-utils-fix-format-load-address.patch \
%D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \
%D%/packages/patches/vboot-utils-skip-test-workbuf.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d9ecfea832d..48cc923093d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4675,7 +4675,8 @@ (define-public vala-0.52
"vala-" version ".tar.xz"))
(sha256
(base32
- "12y6p8wdjp01vmfhxg2cgh32xnyqq6ivblvrar9clnj6vc867qhx"))))))
+ "12y6p8wdjp01vmfhxg2cgh32xnyqq6ivblvrar9clnj6vc867qhx"))
+ (patches (search-patches "vala-0.52-fix-valagirparser.patch"))))))
(define-public vte
(package
diff --git a/gnu/packages/patches/vala-0.52-fix-valagirparser.patch b/gnu/packages/patches/vala-0.52-fix-valagirparser.patch
new file mode 100644
index 00000000000..3cb7b16d05c
--- /dev/null
+++ b/gnu/packages/patches/vala-0.52-fix-valagirparser.patch
@@ -0,0 +1,72 @@
+Starting with GLib 2.84, GModule.gir uses a hitherto unsupported
+ <doc:format name="gi-docgen"/>
+tag to indicate that gi-docgen is/ought to be used for formatting the
+documentation. We lazily "support" this tag by skipping it.
+
+This patch applies to both the original Vala source and generated C sources,
+making sure that the change is present in both, but notably also that it is
+slightly prettier in the C code. For a proper Vala-only patch, we would need
+to bootstrap Vala first.
+
+Index: vala-0.52.0/vala/valagirparser.c
+===================================================================
+--- vala-0.52.0.orig/vala/valagirparser.c
++++ vala-0.52.0/vala/valagirparser.c
+@@ -3641,6 +3641,8 @@ vala_gir_parser_parse_repository (ValaGi
+ _tmp31_ = _tmp30_;
+ if (g_strcmp0 (_tmp31_, "c:include") == 0) {
+ vala_gir_parser_parse_c_include (self);
++ } else if (g_strcmp0 (_tmp31_, "doc:format") == 0) {
++ vala_gir_parser_skip_element (self);
+ } else {
+ ValaSourceReference* _tmp32_;
+ ValaSourceReference* _tmp33_;
+Index: vala-0.52.0/vala/valagirparser.vala
+===================================================================
+--- vala-0.52.0.orig/vala/valagirparser.vala
++++ vala-0.52.0/vala/valagirparser.vala
+@@ -2034,6 +2034,8 @@ public class Vala.GirParser : CodeVisito
+ }
+ } else if (reader.name == "c:include") {
+ parse_c_include ();
++ } else if (reader.name == "doc:format") {
++ skip_element ();
+ } else {
+ // error
+ Report.error (get_current_src (), "unknown child element `%s' in `repository'", reader.name);
+Index: vala-0.52.0/libvaladoc/importer/girdocumentationimporter.c
+===================================================================
+--- vala-0.52.0.orig/libvaladoc/importer/girdocumentationimporter.c
++++ vala-0.52.0/libvaladoc/importer/girdocumentationimporter.c
+@@ -794,6 +794,8 @@ valadoc_importer_gir_documentation_impor
+ _tmp21_ = _tmp20_;
+ if (g_strcmp0 (_tmp21_, "c:include") == 0) {
+ valadoc_importer_gir_documentation_importer_parse_c_include (self);
++ } else if (g_strcmp0 (_tmp21_, "doc:format") == 0) {
++ valadoc_importer_gir_documentation_importer_skip_element (self);
+ } else {
+ ValaMarkupReader* _tmp22_;
+ const gchar* _tmp23_;
+@@ -2977,4 +2979,3 @@ _vala_array_free (gpointer array,
+ _vala_array_destroy (array, array_length, destroy_func);
+ g_free (array);
+ }
+-
+Index: vala-0.52.0/libvaladoc/importer/girdocumentationimporter.vala
+===================================================================
+--- vala-0.52.0.orig/libvaladoc/importer/girdocumentationimporter.vala
++++ vala-0.52.0/libvaladoc/importer/girdocumentationimporter.vala
+@@ -213,6 +213,8 @@ public class Valadoc.Importer.GirDocumen
+ parse_package ();
+ } else if (reader.name == "c:include") {
+ parse_c_include ();
++ } else if (reader.name == "doc:format") {
++ skip_element ();
+ } else {
+ // error
+ error ("unknown child element `%s' in `repository'".printf (reader.name));
+@@ -856,4 +858,3 @@ public class Valadoc.Importer.GirDocumen
+ end_element ("constant");
+ }
+ }
+-
--
2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.