From patchwork Sat Sep 16 09:55:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 17004 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 01ABC27BBEA; Sat, 16 Sep 2023 16:26:09 +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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 5F0B427BBE2 for ; Sat, 16 Sep 2023 16:26:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhXBF-0008K4-DL; Sat, 16 Sep 2023 11:25:57 -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 1qhXBD-0008JT-DM for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25: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 1qhXBD-0007oR-4H for guix-patches@gnu.org; Sat, 16 Sep 2023 11:25:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhXBJ-0001Bf-Lk; Sat, 16 Sep 2023 11:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66034] [PATCH gnome-team 1/3] gnu: glib: fix required.private reference to pcre. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 15:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66034@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66034-submit@debbugs.gnu.org id=B66034.16948779234486 (code B ref 66034); Sat, 16 Sep 2023 15:26:01 +0000 Received: (at 66034) by debbugs.gnu.org; 16 Sep 2023 15:25:23 +0000 Received: from localhost ([127.0.0.1]:48289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAR-00019k-Sd for submit@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:22 -0400 Received: from planete-kraus.eu ([89.234.140.182]:47078) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhXAO-00019W-Vl for 66034@debbugs.gnu.org; Sat, 16 Sep 2023 11:25:06 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id d8cedd7e for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:24:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=albinoniA; bh=qUeX+aw5Im/r+Vuw5g8BpjjOs4w=; b=i GPVKLIiC5OFKfxMJBdIpnL+W52X5GKGsY+X1g7epLDoPJ+MyGu5xPuIcqEFhrHvC O0Ih37etnJ0ScqTpvWDhvT1h6Dc0QeYHUB7xK0B1FhAr40QRC9NHZ39MPV/XzqJy Rq8b6ve0iXPWv20X7I3tbBO6+80YO4+rkznilxNzhCnOzs2JRejIsUVlzaiIfqBG 1EHQ9/+/v/fX7xTy/mtl4ogjuSKRWiyhbZ8wHSuOLPA6IrZHQ5eTjFFdICuaxo3d ZvD8DbkFUarmeZB0IBsXK70GFsGH3qksCt/+k+hYQqeb302mSfpV+sBDTLzikga+ v5oLaALuotG685WZMfpsw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 93b2f4b0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66034@debbugs.gnu.org>; Sat, 16 Sep 2023 15:24:56 +0000 (UTC) Message-ID: <1683acded2289fca76c221a997c6735b355f5a27.1694877577.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sat, 16 Sep 2023 11:55:07 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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) [#:phases 'patch-pkg-config-files]: Replace the reference to libpcre-8 to libpcre2-8. --- gnu/packages/glib.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8af89d60e0..dcc61802a4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -449,7 +449,12 @@ (define glib (("^bindir=.*") "") (("=\\$\\{bindir\\}/") - "="))))))) + "=")) + ;; Update the required.private pcre pkg-config name + (substitute* + (list (search-input-file outputs "lib/pkgconfig/glib-2.0.pc")) + (("libpcre-8") + "libpcre2-8"))))))) (native-inputs (list dbus gettext-minimal