From patchwork Mon Dec 4 13:39:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 57283 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 9243127BBEA; Mon, 4 Dec 2023 13:40:13 +0000 (GMT) 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 AE57427BBE2 for ; Mon, 4 Dec 2023 13:40:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rA9Au-0003GM-Qv; Mon, 04 Dec 2023 08:39:52 -0500 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 1rA9At-0003G6-Vi for guix-patches@gnu.org; Mon, 04 Dec 2023 08:39:51 -0500 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 1rA9At-0001Cc-Mz for guix-patches@gnu.org; Mon, 04 Dec 2023 08:39:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rA9B4-0006br-2A; Mon, 04 Dec 2023 08:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67623] [PATCH 1/3] gnu: gtk+: Require zlib in gdk-3.0.pc. References: <20231204133657.3448-1-jean@foundationdevices.com> In-Reply-To: <20231204133657.3448-1-jean@foundationdevices.com> Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Mon, 04 Dec 2023 13:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67623 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67623@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 67623-submit@debbugs.gnu.org id=B67623.170169719525376 (code B ref 67623); Mon, 04 Dec 2023 13:40:02 +0000 Received: (at 67623) by debbugs.gnu.org; 4 Dec 2023 13:39:55 +0000 Received: from localhost ([127.0.0.1]:33714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rA9Ax-0006bE-06 for submit@debbugs.gnu.org; Mon, 04 Dec 2023 08:39:55 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:53354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rA9Av-0006as-AE for 67623@debbugs.gnu.org; Mon, 04 Dec 2023 08:39:53 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40bd5eaa66cso28676865e9.2 for <67623@debbugs.gnu.org>; Mon, 04 Dec 2023 05:39:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1701697177; x=1702301977; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=X9xUSSWSvwdxws2zN3klNNXbPsjkW03L8Q4nxyPzcoY=; b=IADH7GfQyebrPeLlR/laDk7IbV8HUDFYv2ZsD0tI1jhbJ902+js49fWFF+mW4TodjH xcFD7rfSgZmdPiMoDV5OQ/mOE2DSAOZ7p6JXWkvya9//2ml4nNhgpl/FtFxatx3qQEnX ahbe5GaRGE0B+s89dpGI5t85zrxVmPLSa2DRmHXfK/cZ8TP3BitE9zE2nI1ie+O8irVm iY8j6vHng45LLgtX89qNWAKvpcwb3c+t2kHqJqJ8y6Q0PIL/IUIGplvQ7CS3Nxd/KMJ/ DEfM1WqoOLhyZu6M53DRi7krSXwAwmyaT2t4VDfoDzQVdLhokKxZ3acbMIZWoQfv6nfT aBuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701697177; x=1702301977; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=X9xUSSWSvwdxws2zN3klNNXbPsjkW03L8Q4nxyPzcoY=; b=tn7m+TS6B69S+lru9prLPrIdDT2K1Y3qxsQZfBouXqvDSnWo63s1KSi2TLBbM2DBLB VF43hzpA9syD1eghy3DL7iqVoKEhi3nfMc+dIDIRQZZIBSKnjw2hSbPelL+DJS33u9tO hsUjwGSycU+vCR/AMEzOcXOeurNgv3qIuQJxh1PLpLKst/dk9wMYert1+evmZbpaV+lk hLnxeiqmfZkIM4W0i2u9zhNEVbwzLPZKrRNK3fWiPtuBdTz1JOYWu9hiFqsj6/PYqmtn 7whBB9OuARTw+ypzOV4RFF/FUjIJF1jEqp96WXPQeTtRDV/qbBf0uXyY8NVxPQX9+GJS LIsA== X-Gm-Message-State: AOJu0YwD/CD3UEveoBqzNJ2Au4jpBoO6O2jtjooMqIpqQBnOotXiVM7N 8r2Dv3/r8W7YyRiGTfN7uo73w8ePQ1XzZcdPoUQ= X-Google-Smtp-Source: AGHT+IHkRAtfI7saN+YfWbyAMnu2PzF7+Mo0TCMkxmhKcT4kvXH6QeszPL5BmOPRTiF1v7uc/Up9Ug== X-Received: by 2002:a05:600c:220f:b0:40b:5e59:ccb4 with SMTP id z15-20020a05600c220f00b0040b5e59ccb4mr1549646wml.149.1701697176810; Mon, 04 Dec 2023 05:39:36 -0800 (PST) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id p6-20020a05600c468600b0040c0902dc22sm5475849wmo.31.2023.12.04.05.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 05:39:36 -0800 (PST) Date: Mon, 4 Dec 2023 14:39:31 +0100 Message-ID: <20231204133934.3890-1-jean@foundationdevices.com> X-Mailer: git-send-email 2.41.0 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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ 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/gtk.scm (gtk+) : Add zlib. * gnu/packages/gtk.scm (gtk+) : Add 'add-zlib-to-gdk-3.0.pc phase. Change-Id: I5efadebded159e0bd495ec07020b431413bd6e10 --- gnu/packages/gtk.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 47d4c1808f..752c9f456d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1032,7 +1032,9 @@ (define-public gtk+ mesa pango wayland - wayland-protocols)) + wayland-protocols + ;; When broadway backend is enabled gdk-3.0 requires zlib. + zlib)) (inputs (list colord-minimal ;to prevent a cycle with inkscape cups @@ -1087,6 +1089,15 @@ (define-public gtk+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file (assoc-ref glib-or-gtk:%standard-phases 'generate-gdk-pixbuf-loaders-cache-file)) + (add-after 'unpack 'add-zlib-to-gdk-3.0.pc + (lambda _ + ;; When -Dbroadway_backend=true zlib is added as a dependency to + ;; gdk-3.0 but isn't done correctly and can cause pkg-config to + ;; not add the correct -L...-zlib/lib flag. + (substitute* "meson.build" + (("pc_gdk_extra_libs += \\['-lz'\\]") "") + (("^gdk_packages \\+= cairo_packages" all) + (string-append all "\ngdk_packages += ' zlib'\n"))))) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server.