From patchwork Sun Sep 8 20:44:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 67940 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 BCC8C27BBEA; Fri, 13 Sep 2024 18:22:18 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 DF13027BBE2 for ; Fri, 13 Sep 2024 18:22:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp9zb-0004IL-1W; Fri, 13 Sep 2024 13:21:59 -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 1sp9zX-0004I0-7q for guix-patches@gnu.org; Fri, 13 Sep 2024 13:21:55 -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 1sp9zV-00058n-Pe for guix-patches@gnu.org; Fri, 13 Sep 2024 13:21:54 -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:To:In-Reply-To:References:Subject; bh=q25IDp14oEC5YuIwMprgWD629BXCGvFBrbH9ZLV6914=; b=FCrXVn5I8E7e2IiLYTtZazhcX1TefGRq7PPnv7UHo+C93y5gtQqGVJb4ZxUcLXf7V6uT8nEJxESMwDHPzPEIDbfdBlEkjgNenZ90GyLFV6yXzgQCw2Refo6ljX2w+NnijKS/RvkXuKLJ5FJPgWBGyDU7e2ZV52OGBrPNJ+eizeFOSbFT9Kumw6N6G4IRQ9ceu0R51RWFVr4NjLLVWboS0BcfFXRCT0cUILOrJrxJR7mnWxP6Aqkzku8n0TP0HA1d+OUXhS9MObCCUCcVVnexkYfOCpmZ/IlSoS8o/yg0Qhnlq98LEDirajAQycZFq/ULQPvZSxFFR+XNHDzsexQvyA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp9zd-0004gb-Pa; Fri, 13 Sep 2024 13:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73127] [PATCH gnome-team v2] gnu: glib: Update to 2.80.5. References: <29a668e15846a06eeab999db38296bf45d0810a0.1725829268.git.liliana.prikler@gmail.com> In-Reply-To: <29a668e15846a06eeab999db38296bf45d0810a0.1725829268.git.liliana.prikler@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Fri, 13 Sep 2024 17:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73127 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73127@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 73127-submit@debbugs.gnu.org id=B73127.172624808417937 (code B ref 73127); Fri, 13 Sep 2024 17:22:01 +0000 Received: (at 73127) by debbugs.gnu.org; 13 Sep 2024 17:21:24 +0000 Received: from localhost ([127.0.0.1]:44191 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp9z2-0004fE-23 for submit@debbugs.gnu.org; Fri, 13 Sep 2024 13:21:24 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:57603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp9yz-0004ew-Uz for 73127@debbugs.gnu.org; Fri, 13 Sep 2024 13:21:22 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-5c3ca32974fso2745835a12.3 for <73127@debbugs.gnu.org>; Fri, 13 Sep 2024 10:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726248006; x=1726852806; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=q25IDp14oEC5YuIwMprgWD629BXCGvFBrbH9ZLV6914=; b=bfZmPcKnuZaW1FMhJvu6u9kDlZFuI9kDVxbcV2MtJeDe6WWfZe/vAiJ1Hmbk2Em0zS vVTI6m+g1ttQtLz0w4FyNr8YuPJCPtNPr49T7XnOoNM6MRmhL/6vDM6xjmY4LVSjSFtL If7viVF4+xUEIVQVD028TSazmXWxSmPHvIubk2yKA2RUe72ZqsXn94Jz2W6bYMo7GiyZ 8IVaW1W3cWslg26vdEm7w8W8yuKowN1NaglpK8Hj8iTr5isnU6L2stuplBa8Vsub5FMK coQEC1DPoU8F8MBXQ4dSXamPyddwVqV/jcXoH03Dq4bqOCEjRwGoNz73Q0SIiiHj8JZO QVrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726248006; x=1726852806; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=q25IDp14oEC5YuIwMprgWD629BXCGvFBrbH9ZLV6914=; b=nXkNnjceLX1zOgBsJX6FfSXXJ/JnFaybUoufkyBBij45j0tCl5hVnkrHijWdpT64vf cAyNzrcXamuOixGWq4dxF7JQPhkQ+hRX5d7ENR/8fM5T/TX84Rg9jr2Q3gA+9PS4NQAt tjNPVGuU1OAmv9fvu3VcjcUr92D8ErNDoPs0T686tOvcQ6RxCkHvtlWSo75ce/6d4UXX LuBybK3TLOFHzGiqq1gC2YwE14R89eEFq8qv1bOvXpq+X07+Now1Caha8Q8ONOdMFK9U OkBle4xy0ybwfzYfBRt2I6T093W4XZ9OGiT7PGKMA5xS1zuysPvJsFkVGjqW/Bh3ciPo OJ0w== X-Gm-Message-State: AOJu0YzsQj8Ik+folO/MVc2K7kbJ/teqqWbV+rODhxiqULkGvncUKd6h 0NAd8nmdTwwW2WcNyT2YYB+GmwtnhT1gza1IsBiPDhQHAAFX0frRoOJa6IcF X-Google-Smtp-Source: AGHT+IHzn5mSYvR7ziWWGDpvYR3NLjvD9jAGM/UATj8wYDvSti6Y8ybatEimLcCIBE6t/0AOEmgO5A== X-Received: by 2002:a05:6402:280a:b0:5c2:8249:b2d3 with SMTP id 4fb4d7f45d1cf-5c413e4c51fmr5146300a12.26.1726248006192; Fri, 13 Sep 2024 10:20:06 -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 4fb4d7f45d1cf-5c3ebd4696asm7828762a12.30.2024.09.13.10.20.05 for <73127@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 10:20:05 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Sun, 8 Sep 2024 22:44:25 +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/glib.scm (glib): Update to 2.80.5. [#:phases]: Add ‘wrap-python’. [inputs]: Add python-packaging-bootstrap. --- v2 fixes builds in dependent packages, but may come at the cost of making glib no longer cross-compilable (note: I don't know whether it can be cross-built currently, and would like some pointers on how to achieve this for a potential v3). qtbase still fails --- bug report incoming. gnu/packages/glib.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) base-commit: bf0af917fe6127d79251c7c0f3e3d33e1e8b1403 diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d6275ea63e..72bcbdcc61 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -73,6 +73,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) #:use-module (gnu packages web) @@ -243,7 +244,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.78.0") + (version "2.80.5") (source (origin (method url-fetch) @@ -252,7 +253,7 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0c3vagxl77wma85qinbj974jvw96n5bvch2m7hqcwxq8fa5spsj4")) + (base32 "0wb77rnfcfmz368dg7b8d4waif8qddidcdvyvszmns9wh3gaj8wz")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) @@ -475,7 +476,12 @@ (define glib (("^bindir=.*") "") (("=\\$\\{bindir\\}/") - "="))))))) + "=")))) + (add-after 'install 'wrap-python + (lambda* (#:key outputs #:allow-other-keys) + ;; gdbus-codegen imports packaging.version. + (wrap-program (search-input-file outputs "bin/gdbus-codegen") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))))))) (native-inputs (list dbus gettext-minimal @@ -486,13 +492,17 @@ (define glib python-wrapper tzdata-for-tests)) ;for tests/gdatetime.c (inputs - (list ;; "python", "python-wrapper" and "bash-minimal" + (list + ;; "python", "python-wrapper" and "bash-minimal" ;; are for the 'patch-shebangs' phase, to make ;; sure the installed scripts end up with a correct shebang ;; when cross-compiling. + ;; "python-packaging-bootstrap" is needed by 'wrap-python' to + ;; ensure gdbus-codegen works as expected. bash-minimal python - python-wrapper)) + python-wrapper + python-packaging-bootstrap)) (propagated-inputs (list libffi ; in the Requires.private field of gobject-2.0.pc pcre2 ; in the Requires.private field of glib-2.0.pc