From patchwork Mon Apr 21 13:47:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41856 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AD91427BC4A; Mon, 21 Apr 2025 16:00:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F18C327BC49 for ; Mon, 21 Apr 2025 16:00:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6scJ-0006vS-Qf; Mon, 21 Apr 2025 10:59:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6scA-0006pf-3C for guix-patches@gnu.org; Mon, 21 Apr 2025 10:59:18 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6sc9-0000iI-Q0 for guix-patches@gnu.org; Mon, 21 Apr 2025 10:59:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=k+mlpmcFTqFTNR8DQy3qREL77y/eoTWNSkPiGM59uqQ=; b=bIgTL7jPMVdwKz/g6BPbr/VViKU18kd48MV0JOmsdhtjf2JWlCuTps9B6h5E3fH1vLxgZeSydnjXv8yzjYufEXisM/FJXNuJgrIJzJbLFPHw2cdji+pcyP0/XJ7/yvk7li5b4bJBroXERCjKofA4lqUhzNPsocJPFWX5WC+TPKTSaQU9sbw6Rq4vl70eIqm8LCFo01yI7JN1nJBHDrgupVRU2nHt8D22AbzoEzCerBURK1N4AYcS0qGf7DwImtVhage5BpzfSdiilK3hSGRg97EXqrmDLcdPzv34m9IpUYz6ojddSexk7tMDcV/IGcahYVpMtFyYwJZBxEXl8cnfhA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6sc8-0005y4-38; Mon, 21 Apr 2025 10:59:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77956] [PATCH gnome-team 07/23] gnu: vala@0.52: Fix GIR parser. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 14:59:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77956 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77956@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, noelopez@free.fr, vivien@planete-kraus.eu Received: via spool by 77956-submit@debbugs.gnu.org id=B77956.174524751922579 (code B ref 77956); Mon, 21 Apr 2025 14:59:15 +0000 Received: (at 77956) by debbugs.gnu.org; 21 Apr 2025 14:58:39 +0000 Received: from localhost ([127.0.0.1]:36334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6sbX-0005s3-1Q for submit@debbugs.gnu.org; Mon, 21 Apr 2025 10:58:39 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:60436) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6sbJ-0005oS-Eg for 77956@debbugs.gnu.org; Mon, 21 Apr 2025 10:58:27 -0400 Received: by mail-wr1-x441.google.com with SMTP id ffacd0b85a97d-39129fc51f8so3632444f8f.0 for <77956@debbugs.gnu.org>; Mon, 21 Apr 2025 07:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745247499; x=1745852299; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=k+mlpmcFTqFTNR8DQy3qREL77y/eoTWNSkPiGM59uqQ=; b=f4WS0McqsHEi+Yz9Ei+Ew6V6y/sAttFGiWwrRD6C2pWSE3Sz7FnbCoIWWN6EFhLzrN kom/a+OqOeTI+Tchr7NEaWILL/Nh+Drv03Lp0L67QsmDh+iTVMwXHhBAab13B9fCqByl BiWhD5D3FdZqH7Qxy+Z+e7q0ZFaFFbiplg5UL9UwFjGlFIcuA6wlRlpg6sQg+VaeG25K 8QTM4LHM8rHmWxPG1M+A7uiZRuYZWstxn20+gRa9E4JZBj5AXLySZC4a8jpMPnNerdCR mixGDeqFMQCsKboJJ20HZnaeiVk7oJ0k9e6iBx9PgsChHJpXR2vPdOLjRiZWzFGfr+gC S8KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745247499; x=1745852299; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=k+mlpmcFTqFTNR8DQy3qREL77y/eoTWNSkPiGM59uqQ=; b=k0Yu74wTHSyi4c3tHJFAqkbvuDs/FPCS5NbyoWBErmX9larMNrQRxuyTldydMclX9a nrCCL60B5ANJ8QFqT9igwy/IczqRQM1jNmSGrwX8XvHz9YCAVnBoB/z7vNbwinQN7o5z e7Ies+vH81k/+b7+sg7NeQXh/XAcOE7hfJ9IU1WpMZCrBC3VO2dnD3qMoQEq0OeLNoVu fGuxauDfoxAMXfsJfiAy0+dj5DYLRxuA1pEBSEbT4JJen7vSeTrCDbxnoL2+HQ+PYJ0a bcMj81cnpOY/wAaOjoJcF3g0xx/CWg57R1p0ndsUXyK0LUSyd6EQvM2gzKPhrUeZ10FQ vUVA== X-Gm-Message-State: AOJu0Yz30c5spvFfoPS7y4i6MtbVSn1bZqBFM+0tmUNRq6FkJkZzAkHo Gqp9b2sKOk9btMDbjXbIjlgzzGyJmkhezL56XUqURyTJaQYD30gDLa5NsoUD X-Gm-Gg: ASbGncu8tHr/4My2okuTc3b5xk6R8RVj9fU/L6VrNSKx8SDELZg/Dck/DluRdf+5cPO w8MeN3fDoR8zCttWWnPLjAi3mfcIKHH64rSz2fdXy14qAZhRpQeK2DzMxWv/haC26Vis1KWYN2M lYlqlXx2PXRLHTKlSlG/bTMAv86naJ/m6GrOVU07EobArkKPR9zhgNS1+dpM4/roinzdFizvDzA CAM8h7TGfHyaDFQctgfjHH8zjKdSFdLPoLtOYGS7lQkTgVS6ngVV/qRfb12Xq/V52pPQrlGq3h8 Rt0nhKcjTZnRpDvRFM4+zoJx6GyJd77hRSLMh0nqILa+r9xdluXyez+b9ppIzDVNMEhmK03XWP3 pjsC5414h0cB/CypZ X-Google-Smtp-Source: AGHT+IG5/VitJnFkZ6eotx81wNA2LIeGF3wfkzV5pbJP1ZnEo7NYEvigyO5o0jl1IescH/x2hQ1KxQ== X-Received: by 2002:a5d:5f89:0:b0:391:ba6:c069 with SMTP id ffacd0b85a97d-39efbad555amr7986746f8f.44.1745247499107; Mon, 21 Apr 2025 07:58:19 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5acce9sm138719555e9.13.2025.04.21.07.58.18 for <77956@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Apr 2025 07:58:18 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Mon, 21 Apr 2025 15:47:48 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 + +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"); + } + } +-