From patchwork Thu Jun 9 18:49:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39828 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 28F6527BBEA; Sat, 11 Jun 2022 07:38:45 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 6D19527BBE9 for ; Sat, 11 Jun 2022 07:38:44 +0100 (BST) Received: from localhost ([::1]:49040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzulf-00015Y-I2 for patchwork@mira.cbaines.net; Sat, 11 Jun 2022 02:38:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzul1-00012f-Ew for guix-patches@gnu.org; Sat, 11 Jun 2022 02:38:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzul0-0007cH-C6 for guix-patches@gnu.org; Sat, 11 Jun 2022 02:38:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nzul0-00017E-6z for guix-patches@gnu.org; Sat, 11 Jun 2022 02:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55899] [PATCH core-updates] gnu: gobject-introspection: Update to 1.72.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Jun 2022 06:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55899@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16549294414233 (code B ref -1); Sat, 11 Jun 2022 06:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jun 2022 06:37:21 +0000 Received: from localhost ([127.0.0.1]:51750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzukL-00016D-8C for submit@debbugs.gnu.org; Sat, 11 Jun 2022 02:37:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:56532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nzukG-000161-8S for submit@debbugs.gnu.org; Sat, 11 Jun 2022 02:37:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzukF-0000vs-TO for guix-patches@gnu.org; Sat, 11 Jun 2022 02:37:15 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:40897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzukD-0007aK-RS for guix-patches@gnu.org; Sat, 11 Jun 2022 02:37:15 -0400 Received: by mail-ej1-x643.google.com with SMTP id fu3so1754815ejc.7 for ; Fri, 10 Jun 2022 23:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=9ZSK3q+EQrQAZr+dLJbyLGLIS0PSKi2B+peyYZA/hXI=; b=kDbSZqkAc6IyZsFsPqPpgcGgKH6ETMCj26qTEAgIP1o81OQD9lpFwM9f5Gp6/pfn02 F43drvHE0p6w7W+z1g1MEACo1/zTGnZN/GpDDlRzhuk2VhJpGjxaDsc0pYGnQUn8fSct 8vpXBgGAucEYtl5hnTsDUD4GvBiNEqlwM+JsVg8YaDyEKKlKCoLZBLeaS8jOJQp6mraj rWuDktLtfwvY9GpXljTduw06g09XomIdSoTep+ttceqDHeZzgGMV17+VXCMXFquiRDza tD4RbYdCS0m05ryCj6Rrq+eXzeKhFlMPJoD5uU6UNQd4GXt7qFFyh5A31kZVPyPndWGB 6Smw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=9ZSK3q+EQrQAZr+dLJbyLGLIS0PSKi2B+peyYZA/hXI=; b=zFknqIsz3DRXZV43edN5C0HWE+1RLyF5caZteiJlllD0mJgkWSLzxbunBwaBpaooRw jloZJW/IeDmAPOXKnp94uWNDA3VEwnWJGgc7ov+jT7DXliKqO1tpThDio7n480tGeMXw wc3e55ohrpPbw0P3q2YOU552Vw00+kJlbNJgJVH4bfUq2fAb30owNWCPwb/xPGzeqzj3 W49hY7CETa1ffIUM6tl2ES5cBpbi37N/Kmg8OA5vqMAIf0AtTDdcWnIu/CFPLWjBqY9M xaKTdDHfNtRVpsEuqgDRhGzwQLzP2m6MnqAbNWti5Po5vRgp6AY1jDG9AvK8JUpU6Bn1 jwbQ== X-Gm-Message-State: AOAM531RKYk6eVkwcPKv0AUO++EWfM9TgMdRK0el9PaFUoGfv9DJpYYP poL4Moo76t7WBsPPxWEXgwqoGJlzgs4= X-Google-Smtp-Source: ABdhPJwpTsb4IK8bGL8QESBBxTcxa1N3feQ4q7H+6DqWQOjuWWIidT30DnIAaSNAQ1uBRC49AWV4bA== X-Received: by 2002:a17:906:7a5c:b0:712:38a6:9ac0 with SMTP id i28-20020a1709067a5c00b0071238a69ac0mr3748836ejo.713.1654929432068; Fri, 10 Jun 2022 23:37:12 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r20-20020a056402235400b0042bdb6a3602sm817869eda.69.2022.06.10.23.37.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 23:37:11 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 9 Jun 2022 20:49:32 +0200 Message-ID: <9e3d90ade0281802e0afebd265755fa9f11a1780.camel@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::643; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x643.google.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_24_48=1.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (gobject-introspection): Update to 1.72.0. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: Adjust to changes in upstream source. --- gnu/packages/glib.scm | 4 +- ...ct-introspection-absolute-shlib-path.patch | 49 +++++++++---------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 95839a856d..06639aae8f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -427,14 +427,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.68.0") + (version "1.72.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj")) + (base32 "1g5aps3b20ck96ahy7fjl4nhp9nabkd9rlqd0s1qzn3111cqxzh2")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index c23b054a39..adc38e39bf 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -13,10 +13,10 @@ gobject-introspection. tests/scanner/test_shlibs.py | 3 ++- 4 files changed, 65 insertions(+), 20 deletions(-) -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 957ba0b7..78f9b11b 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py +Index: gobject-introspection-1.72.0/giscanner/scannermain.py +=================================================================== +--- gobject-introspection-1.72.0.orig/giscanner/scannermain.py ++++ gobject-introspection-1.72.0/giscanner/scannermain.py @@ -95,6 +95,39 @@ def get_windows_option_group(parser): return group @@ -57,7 +57,7 @@ index 957ba0b7..78f9b11b 100644 def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) -@@ -214,6 +247,10 @@ match the namespace prefix.""") +@@ -217,6 +250,10 @@ match the namespace prefix.""") parser.add_option("", "--filelist", action="store", dest="filelist", default=[], help="file containing headers and sources to be scanned") @@ -65,13 +65,13 @@ index 957ba0b7..78f9b11b 100644 + action="store", dest="fallback_libpath", + default=_get_default_fallback_libpath(), + help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 9f8ab5df..8aa37c99 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py + parser.add_option("", "--compiler", + action="store", dest="compiler", default=None, + help="the C compiler to use internally") +Index: gobject-introspection-1.72.0/giscanner/shlibs.py +=================================================================== +--- gobject-introspection-1.72.0.orig/giscanner/shlibs.py ++++ gobject-introspection-1.72.0/giscanner/shlibs.py @@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): $""" % re.escape(library_name), re.VERBOSE) @@ -87,7 +87,7 @@ index 9f8ab5df..8aa37c99 100644 # This is a what we do for non-la files. We assume that we are on an # ELF-like system where ldd exists and the soname extracted with ldd is # a filename that can be opened with dlopen(). -@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary output = output.decode("utf-8", "replace") shlibs = resolve_from_ldd_output(libraries, output) @@ -122,7 +122,7 @@ index 9f8ab5df..8aa37c99 100644 if len(patterns) == 0: return [] -@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): +@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, o if line.endswith(':'): continue for word in line.split(): @@ -137,11 +137,11 @@ index 9f8ab5df..8aa37c99 100644 if m: del patterns[library] shlibs.append(m.group()) -diff --git a/giscanner/utils.py b/giscanner/utils.py -index 45807f17..8a319cd1 100644 ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file): +Index: gobject-introspection-1.72.0/giscanner/utils.py +=================================================================== +--- gobject-introspection-1.72.0.orig/giscanner/utils.py ++++ gobject-introspection-1.72.0/giscanner/utils.py +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -163,10 +163,10 @@ index 45807f17..8a319cd1 100644 # Returns arguments for invoking libtool, if applicable, otherwise None -diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py -index a8337c60..7f123103 100644 ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py +Index: gobject-introspection-1.72.0/tests/scanner/test_shlibs.py +=================================================================== +--- gobject-introspection-1.72.0.orig/tests/scanner/test_shlibs.py ++++ gobject-introspection-1.72.0/tests/scanner/test_shlibs.py @@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): self.assertEqual( @@ -177,6 +177,3 @@ index a8337c60..7f123103 100644 def test_unresolved_library(self): output = '' --- -2.33.0 -