From patchwork Thu Feb 22 16:29:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60900 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 AC4C227BBEA; Thu, 22 Feb 2024 16:31:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 7A99C27BBE9 for ; Thu, 22 Feb 2024 16:31:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBz4-0005y9-5c; Thu, 22 Feb 2024 11:31:42 -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 1rdBz2-0005xg-3d for guix-patches@gnu.org; Thu, 22 Feb 2024 11:31:40 -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 1rdBz1-0008C0-RY for guix-patches@gnu.org; Thu, 22 Feb 2024 11:31:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBzO-0004LM-9a for guix-patches@gnu.org; Thu, 22 Feb 2024 11:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 01/20] gnu: Add atf. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861949916632 (code B ref 68813); Thu, 22 Feb 2024 16:32:02 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:31:39 +0000 Received: from localhost ([127.0.0.1]:39771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdByz-0004K7-Sz for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:31:38 -0500 Received: from mail-oi1-f177.google.com ([209.85.167.177]:52404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdByw-0004Jd-EG for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:31:36 -0500 Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3c02adddb8eso1556144b6e.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708619405; x=1709224205; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JIKwmj2v9XD5SSFxEBwHR1TQXaUCfRhjWhYlnCXkN2s=; b=KB6pItiStlbqS4KjmoQfSrSLVlal+rNvQSj4qAdWL2pudQJgTz/5NnxeqJLP7CJO5l z4Vw6+KNB1nzuT1wsGnZsMsvUALjMHZaXfD/kAlTF0bwwFwSTUFWoya/EXduw5JvPz40 v35X3u07fjJdIhzCrcLCAhtWMvWf5gRuO7wIRtsX5kmOp07X4PQJ9qaJKF/ZsfbGBnmg WgUyosZ2V4bh84GGaLB3akcR5ViooTfw7aigNgzCrcTfrV3NLtiYGuy360oZkRMAVjKd SE1sKColNqHVcy9sBYlB553a3C7jfo5CC8yVeIgTJi8/KrOxW4IfrErFISqMfGiCSjKV aFSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708619405; x=1709224205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JIKwmj2v9XD5SSFxEBwHR1TQXaUCfRhjWhYlnCXkN2s=; b=F2GAYA8szGOMrCzaW8Cno7qsf53CSZlnHas9RiT7ZuOqDDCVSVqqOnC2e6a+cngz8M RRpKGnWkz1tEj/l3NZlJUSSc8ipaskt2JTnzPMBXRlx06nWveERZb3jD3Y/zupfY4SLf nafW6kq4U/e+wwPwPvfSwi7rsS2N3SgwqZkt6GCYIiGVowpD8cPxxC4Ffx0ggP6YgS80 VKl8t0BNnLFA/qg+XcWkEtrNrGcEexiW7prhD8MPmf4dS5uASmbAl4T0H0SYjONZRGZS a/1llB5rgLyvxxmJ92zCNbAHR76CYglz3AOewHflmMXsiws/7F/aehzKXQe3UvZVMhaE WMBA== X-Gm-Message-State: AOJu0YyDP++53Kzt2o+585Kq+2yqbQZWdLcXPnzyQZ3+zwC96DML8zYj jyitLUXVrMOJwxWE6Yd/iThgCkZimnXqUIjUYb2o5/DvoNxcb2fTBbs2+21F X-Google-Smtp-Source: AGHT+IEvXQgcd6J8JG9NI5aYaO9AvXi9QGFfxNakYMsITlqbyq8LjblxHMKryM5uph3Ss6UkWA5nMQ== X-Received: by 2002:a05:6808:1907:b0:3c0:408f:2098 with SMTP id bf7-20020a056808190700b003c0408f2098mr30191277oib.24.1708619405425; Thu, 22 Feb 2024 08:30:05 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id pd4-20020a056214490400b0068c968c3b33sm132141qvb.20.2024.02.22.08.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:30:05 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:29:57 -0500 Message-ID: <704c6dbd83706ec0c978998cd3853e1969246573.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/check.scm (atf): New variable. * gnu/packages/patches/atf-execute-with-shell.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I37a57069380309382bc0ff24977a1fd165985f5e --- gnu/local.mk | 1 + gnu/packages/check.scm | 40 ++++++++++++++++++- .../patches/atf-execute-with-shell.patch | 39 ++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/atf-execute-with-shell.patch diff --git a/gnu/local.mk b/gnu/local.mk index 62368f3511..34cdf6564d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -935,6 +935,7 @@ dist_patch_DATA = \ %D%/packages/patches/asli-use-system-libs.patch \ %D%/packages/patches/aspell-CVE-2019-25051.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ + %D%/packages/patches/atf-execute-with-shell.patch \ %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4f593cde8d..3920c5dace 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour -;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022, 2023 David Elsing @@ -111,6 +111,44 @@ (define-module (gnu packages check) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define-public atf + (package + (name "atf") + (version "0.21") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freebsd/atf") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jwzz6g9jdi5f8v10y0wf3hq73vxyv5qqhkh832ddsj36gn8rlcz")) + (patches (search-patches "atf-execute-with-shell.patch")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list (string-append "ATF_SHELL=" + #$(this-package-input "bash-minimal") + "/bin/sh")))) + (native-inputs (list autoconf automake libtool)) + (inputs (list bash-minimal)) + (home-page "https://github.com/freebsd/atf") + (synopsis "C/C++ Automated Testing Framework libraries") + (description "ATF, or Automated Testing Framework, is a collection of +libraries to write test programs in C, C++ and POSIX shell. + +The ATF libraries offer a simple API. The API is orthogonal through the +various bindings, allowing developers to quickly learn how to write test +programs in different languages. + +ATF-based test programs offer a consistent end-user command-line interface to +allow both humans and automation to run the tests. + +ATF-based test programs rely on an execution engine to be run and this +execution engine is not shipped with ATF. Kyua is the engine of choice.") + (license (list license:bsd-2 license:bsd-3)))) + (define-public pict (package (name "pict") diff --git a/gnu/packages/patches/atf-execute-with-shell.patch b/gnu/packages/patches/atf-execute-with-shell.patch new file mode 100644 index 0000000000..bde4fb336a --- /dev/null +++ b/gnu/packages/patches/atf-execute-with-shell.patch @@ -0,0 +1,39 @@ +Submitted here: https://github.com/freebsd/atf/pull/57 + +From 098b66269b1cf1d944b8b214ceb7ce9febde3682 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Mon, 29 Jan 2024 22:35:49 -0500 +Subject: [PATCH] Fix use after free in execute_with_shell. + +The temporary string returned by atf::env::get would be used outside +its statement, which is invalid and cause undefined behavior. Copy it +to a local variable to avoid the issue. + +Fixes: https://github.com/freebsd/atf/issues/26 +Fixes: https://github.com/freebsd/kyua/issues/223 + +Reported-by: Ruslan Bukin +--- + atf-sh/atf-check.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp +index 41f0b13..9d6f7a8 100644 +--- a/atf-sh/atf-check.cpp ++++ b/atf-sh/atf-check.cpp +@@ -436,7 +436,9 @@ execute_with_shell(char* const* argv) + const std::string cmd = flatten_argv(argv); + + const char* sh_argv[4]; +- sh_argv[0] = atf::env::get("ATF_SHELL", ATF_SHELL).c_str(); ++ const std::string shell = atf::env::get("ATF_SHELL", ATF_SHELL); ++ ++ sh_argv[0] = shell.c_str(); + sh_argv[1] = "-c"; + sh_argv[2] = cmd.c_str(); + sh_argv[3] = NULL; + +base-commit: 18eb8168b70a0f934b4824b6391b55ac0b2f4fdf +-- +2.41.0 + From patchwork Thu Feb 22 16:10:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60898 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 4407827BBE9; Thu, 22 Feb 2024 16:23:54 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 A092727BBE2 for ; Thu, 22 Feb 2024 16:23:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBrK-0000XG-VN; Thu, 22 Feb 2024 11:23:42 -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 1rdBrI-0000Wv-QS for guix-patches@gnu.org; Thu, 22 Feb 2024 11:23:40 -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 1rdBrH-0006XP-Eo for guix-patches@gnu.org; Thu, 22 Feb 2024 11:23:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBre-0003uM-CB for guix-patches@gnu.org; Thu, 22 Feb 2024 11:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 02/20] gnu: Add lutok. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861898514866 (code B ref 68813); Thu, 22 Feb 2024 16:24:02 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:23:05 +0000 Received: from localhost ([127.0.0.1]:39147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBqi-0003rg-Qv for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:23:05 -0500 Received: from mail-pg1-f170.google.com ([209.85.215.170]:46200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBqd-0003qp-Dq for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:23:03 -0500 Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5cddfe0cb64so6121228a12.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:22:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618890; x=1709223690; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KQcb3qk9yyHSGEZsj9x1VeSjLLDsZ/vcXdrJlhZ/OYM=; b=RahNI3yEHQCNb8syr5oBTUtZgvynWxGd6pt+Hvp29PbZgOuLZrdfizpjL2/cB/OJWl ZTBxObyl/ejGXvJmqK1nV7KvQvR0OQ7LU7MCNmNMAGZQJLVl9bufXi640T137i6WerND MgIrwrNwvc4oXC28XFhnb5rMV8/+Y46PabzA8th0gL2VrSMcrVNOoilWbZEptxIIKaZE imcpkMgl4HcAs5wm663h5bVfJWX6A33NAMGG6lqKspJT36V3pCboaSNtmz/ibiFAWmv8 JzWj0ZjHD98r8cfpGpmQysn0UB7OQPZM9nrMBAob2PIuWsGuyQJ8AQ1OpPGVooDqLZkH XggQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618890; x=1709223690; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KQcb3qk9yyHSGEZsj9x1VeSjLLDsZ/vcXdrJlhZ/OYM=; b=OAzxnCPSDjbGosuin5fDhWflTCczOyjs4c0HnIWhyJt+9ofeI4xzBujaw14eCcE+fZ jim384/+WHBoQDHdwkZzw1Gb/9SqocY0bOo2llTZUtmADecdPRGY0Lbpj6mnqFwxQcQp b+E5SCbDZVpDIpsZ/5V09E6+uoIKCB/Y5X4P98DcHOsjJy1mNNzEMP+8o6TLA7EXcBmo Tt+gTdGhaGM0htLNBvVgTCRbA8f1WxjylJ9BQfkX44p1QhmaP/vNYP6nzwbCZtc5+qjs 3ilTWnbJJ0UHD3s3e5RjZitgeL4IVbfUuahSB7jVXN3e5r32vjDuYB5fs97Ei1cqr8cq cyiA== X-Gm-Message-State: AOJu0YzGKIaoHQTmX9a9yVmijMA+8GPnUa/zbjbkfr61gnbAzyRmBePj fcmNPhFxIXs8yqLBpHQbODdT1vB8S/mhkUK3TXccGDbIftlATEGmcqfDz26d X-Google-Smtp-Source: AGHT+IG/oTvPuhu4XPybs9WisX10r6RV/e0VRiJ1/N2Lq2R5VnTA4b/zd6wQATw94Bv1pu9uIai0Aw== X-Received: by 2002:a05:6214:da1:b0:68f:5dca:4889 with SMTP id h1-20020a0562140da100b0068f5dca4889mr17689516qvh.15.1708618475306; Thu, 22 Feb 2024 08:14:35 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:35 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:01 -0500 Message-ID: <87acb345dd391c487368583bd6fa2a47cefb40df.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/lua.scm (lutok): New variable. Change-Id: I595b26c601c8ca8c997c86e8f8eb17fbe363a038 --- gnu/packages/lua.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 1cde6bd66c..07c803d27e 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Leo Nikkilä ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Valter Nazianzeno +;;; Copyright © 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,9 +49,11 @@ (define-module (gnu packages lua) #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) + #:use-module (gnu packages check) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages gperf) @@ -898,6 +901,44 @@ (define-public lua5.2-bitop (define-public lua5.1-bitop (make-lua-bitop "lua5.1-bitop" lua-5.1)) +(define-public lutok + (package + (name "lutok") + (version "0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freebsd/lutok") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a2vc2wy5hasw69h1mz768ywx6c4ccl9jzzd4ixddwba3z3ha03b")))) + (build-system gnu-build-system) + ;; Disable the test suite to avoid a circular dependency on kyua. + (arguments (list #:tests? #f)) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list atf)) + (propagated-inputs (list lua-5.2)) ;included in c_gate.hpp + (home-page "https://github.com/freebsd/lutok") + (synopsis "Lightweight C++ API for Lua") + (description "Lutok is a lightweight C++ API library for Lua. + +Lutok provides thin C++ wrappers around the Lua C API to ease the interaction +between C++ and Lua. These wrappers make intensive use of @acronym{RAII, +Resource Acquisition is Initialization} to prevent resource leakage, expose +C++-friendly data types, report errors by means of exceptions and ensure that +the Lua stack is always left untouched in the face of errors. The library +also provides a small subset of miscellaneous utility functions built on top +of the wrappers. + +Lutok focuses on providing a clean and safe C++ interface; the drawback is +that it is not suitable for performance-critical environments. In order to +implement error-safe C++ wrappers on top of a Lua C binary library, Lutok adds +several layers or abstraction and error checking that go against the original +spirit of the Lua C API and thus degrade performance.") + (license license:bsd-3))) + (define-public selene (package (name "selene") From patchwork Thu Feb 22 16:10:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60886 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 E4C7427BBEC; Thu, 22 Feb 2024 16:17:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 DF68F27BBE2 for ; Thu, 22 Feb 2024 16:17:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkg-0003Ug-4E; Thu, 22 Feb 2024 11:16:50 -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 1rdBkW-0003LN-5A for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:40 -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 1rdBkV-0004ZT-TQ for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBks-0003Tg-PS for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 03/20] gnu: Add kyua. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861857113041 (code B ref 68813); Thu, 22 Feb 2024 16:17:02 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:11 +0000 Received: from localhost ([127.0.0.1]:38565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk2-0003OB-HH for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:11 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:58645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBjy-0003N9-17 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:07 -0500 Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-68fbfd245adso3329616d6.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618477; x=1709223277; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OIGkM4k6bQnhb3U9o4twTgoADWKW+SOV6rzgTX+h860=; b=IA2ZVuDnS72dxNH0nFdA6bsamalPy488hb2LIH5ltf/WJhTy8ozvnT0sMhLeo5rUwj tekfmngtuMOK2pu31jjGrg4URGnferBlgZ0qozcW90+RELMOUzqY+pL83RXxaVklTR2Z Ytb4UvRVg5NnenEUNisL0v+D88G7Qaod+osgF0ddrPRxTxWFqV03mIUv4uxhsMJ9+Oh7 8JiJZWGBsUR3DidPlTH7DMzb+XfuKNNgAyCycP8kymIJgMpgNjLhFLplJ8W1edETQeLG xlB7P773RhoTJ7pm8OMMXDLCaM7ZFVAX9no1pAsis6iWf5cE9aG5941l8nZaKjNQgz9L Q2fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618477; x=1709223277; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OIGkM4k6bQnhb3U9o4twTgoADWKW+SOV6rzgTX+h860=; b=sf0prr1MGu7mYBUhMKytxqIyAjUIO44xpXow2Lu375kCkkDAi4x06rCDmQg4V74AaX fOxosqiLq2PdIJUoegOK3St/uXwzPzxmlWeNYnkyYL+BTVqf9XKrLF0WgHfo4E35oUwb KpBZ9dN0E7/C50S2rIkGDLPAHz7NcOg3cOg/m6qCjr3XNhXTRVCd9++A2i79Hcmr5BNy Kba8D41VFum5Mvr4Tyjp4MbO6vo5fXBLHlb/uYUixd6mIjiBqlVdimtceH8qLk+dd/0+ OaTwKhlWXmXa0Uip1eadLeoMo9UCutlB1A27IdTJRjPocwX4kHpWjvRLqARV5SubS31A HUag== X-Gm-Message-State: AOJu0Yz8IJIVE+vCLI3J3p++SJZytICul30Wu7nz0f3mid9kqL8ZLQ3i 2mAvRr25aLAySQ1kpw5SZE6YyxowspniUuI7FW+/KqGapIkgwg8OoHxvqi7e X-Google-Smtp-Source: AGHT+IGJhZjoCWYnYQHWpm6y7GYqE/fzFaGN4gE6XsC1lYVvmmG3hpUNdoUVtj4nre84iQIqPSrs6A== X-Received: by 2002:a0c:cb01:0:b0:68f:b5db:2951 with SMTP id o1-20020a0ccb01000000b0068fb5db2951mr3283232qvk.22.1708618477089; Thu, 22 Feb 2024 08:14:37 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:36 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:02 -0500 Message-ID: <2fe294e931f31bec87dacd55995a57f58880b829.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/check.scm (kyua): New variable. Change-Id: Ic3a74a27c05b099bef6acfb4e0c96d2ee3defc31 --- gnu/packages/check.scm | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 3920c5dace..a7e8ca7aa1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -72,8 +72,10 @@ (define-module (gnu packages check) #:use-module (gnu packages bash) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages gdb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages lua) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) @@ -88,6 +90,7 @@ (define-module (gnu packages check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-science) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages xml) @@ -901,6 +904,73 @@ (define-public ftest "This package provides a simple and limited unit-test framework for C++.") (license license:boost1.0)))) +(define-public kyua + (package + (name "kyua") + (version "0.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freebsd/kyua") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jzdal9smhmivj18683a5gy8jd2p1dbni7kcpaxq4g9jgjdidcrq")))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* '("Makefile.am" + "utils/process/isolation_test.cpp" + "utils/stacktrace_test.cpp" + "integration/utils.sh" + "integration/cmd_test_test.sh") + (("/bin/sh") + ;; The 'local-kyua' generated script in Makefile.am is used + ;; to run the built kyua binary for tests. + (which "sh"))))) + (add-after 'unpack 'fix-to_absolute-test + ;; This test checks for the existence of /bin and /bin/ls. + (lambda _ + (substitute* "utils/fs/path_test.cpp" + (("chdir\\(\"/bin\")") + (format #f "chdir(~s)" (dirname (which "ls")))) + (("\"/bin/ls\"") + (string-append "\"" (which "ls") "\""))))) + (add-before 'check 'prepare-for-tests + (lambda _ + ;; The test suite expects HOME to be writable. + (setenv "HOME" "/tmp") + ;; Generate the autom4te-generated testsuite script, which + ;; contains a '/bin/sh' shebang. + (invoke "make" "bootstrap/testsuite") + (substitute* "bootstrap/testsuite" + (("/bin/sh") + (which "sh"))))) + (add-after 'unpack 'disable-problematic-tests + (lambda _ + ;; The stacktrace tests expect core files to be dumped to the + ;; current directory, which doesn't happen with our kernel + ;; configuration (see: + ;; https://github.com/freebsd/kyua/issues/214). + (substitute* "utils/Kyuafile" + ((".*atf_test_program.*stacktrace_test.*") + ""))))))) + (native-inputs (list autoconf automake gdb pkg-config)) + (inputs (list atf lutok sqlite)) + (home-page "https://github.com/freebsd/kyua") + (synopsis "Testing framework for infrastructure software") + (description "Kyua is a testing framework for infrastructure software. +Kyua is lightweight and simple, and integrates well with various build systems +and continuous integration frameworks. Kyua features an expressive test suite +definition language, a safe runtime engine for test suites and a powerful +report generation engine.") + (license license:bsd-3))) + (define-public python-gixy ;; The 0.1.20 release is missing some important fixes. ;; XXX: Commit 'e9008dcbd11f43ccac109b0cf2bf98a94e76b449' breaks tests From patchwork Thu Feb 22 16:10:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60897 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 33ECC27BBE9; Thu, 22 Feb 2024 16:18: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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 304EA27BBEA for ; Thu, 22 Feb 2024 16:18:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBku-0003m0-Fa; Thu, 22 Feb 2024 11:17:04 -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 1rdBkX-0003M5-LJ for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:41 -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 1rdBkX-0004a0-C3 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkt-0003Tp-UL for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 04/20] gnu: pkgconf: Enable test suite. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861857213049 (code B ref 68813); Thu, 22 Feb 2024 16:17:03 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:12 +0000 Received: from localhost ([127.0.0.1]:38567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk3-0003OI-C8 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:11 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:46300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBjz-0003NT-PR for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:08 -0500 Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-68f60070fa7so19534316d6.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618479; x=1709223279; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CYT0w+jtoLLKQYdRbBqkBttFM1z0ec91YNo/OndtLCo=; b=AY+F5dVuzgnJU8OSm4NzPsj8s8o9KZ8jR/rr27yU7OYi/q9FxOlmTXPltH3XYNxUEt ejU1HJcb3GaY4kRl8I8RX8IL2MwvrK7CG8M0drf4iNSKsUp9xjXlHztL8UFud+AgoEDl ECD60hpkf4M3ghnSiM+OzIPBX2u3Aqm2rpatMBjiQawnejFFU+AgV2RS/sDLEi4sfwtt xDiCAfsEeN/Zj9/C0mtsunuGUbayggW119EW4hIfuEQJAvJGdC29z0AMakfCkHIt/L8O XUGuZ6pAjQwH5OWyF/naN5pbOnxtkNeJ/YGG8Pm5luQELPXHbFvtGqCZwkfbbhi033Va PzWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618479; x=1709223279; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CYT0w+jtoLLKQYdRbBqkBttFM1z0ec91YNo/OndtLCo=; b=LMqhQNiQC4S84rouIxzxLtTHIVayCw+1/IA2Ie0+Tg8Nb2LwY6bjoq7gT+JdxxoPke dLZ2kC1K0cLzCA6fMQ8XV/v7WDiCpUbf5jiMoJxJq3NdV8ZshZ71meTcGWKjO1tEWg6s 99pSqj8OrYrASVEYL32QfB/R6FgL4nsFkng+TbExnovSIBTo0yeUrdV11kTIawxjfN18 mo1oYH9ASi2AZET0QMYxbXFzq0hWhL0U0PqtUVA2SFnm4WxDp5n0nxZg8UCsfut4ZxBp ZO65jqYXVqKrpqX5wS4rkuWeQe41FYTF8FjCHUM1jYj45khUgfNtv7tLMzzCvVVis4Iv ZPiA== X-Gm-Message-State: AOJu0Yw8qLMZ6x4yHnLDQe696EIHzjSaMUDaInv2+WsjX+aou3+Zhs7F d5PUVYogs+AztiY/8BMXQxq0OWvC/dQQyyKnIjBNZ2ugALn34MN7M1D6R/Xr X-Google-Smtp-Source: AGHT+IHc+L/Z5uxhgAK/IjqY1BmDv79Rt4ccqvJp9M5hh0N/KBidqjEVx40LecXJMX1ifQ9+g2t75Q== X-Received: by 2002:a05:6214:f6a:b0:68f:a21a:d60c with SMTP id iy10-20020a0562140f6a00b0068fa21ad60cmr7490071qvb.33.1708618478960; Thu, 22 Feb 2024 08:14:38 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:38 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:03 -0500 Message-ID: <9184870ae4465b341f7b4443a86f506275a26628.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/pkg-config.scm (pkgconf) [arguments]: Remove #:tests? argument. Add a set-HOME phase. [native-inputs]: Add atf and kyua. Change-Id: I28410d7486ab45cf1cbc6d306345fb85f0b9d7fc --- gnu/packages/pkg-config.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 06f0db960f..2f07bdab9d 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. @@ -29,6 +29,7 @@ (define-module (gnu packages pkg-config) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages bash) + #:use-module (gnu packages check) #:use-module (guix memoization) #:export (pkg-config)) @@ -181,7 +182,13 @@ (define-public pkgconf (base32 "0qbpczwrrsq2981mdv3iil26vq9ac8v1sfi9233jpiaixrhmhv96")))) (build-system gnu-build-system) - (arguments (list #:tests? #f)) ;TODO: package kyua + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-HOME + (lambda _ + ;; Kyua requires a writable HOME. + (setenv "HOME" "/tmp")))))) + (native-inputs (list atf kyua)) (home-page "http://pkgconf.org/") (synopsis "Package compiler and linker metadata toolkit") (description "@command{pkgconf} is a program which helps to configure From patchwork Thu Feb 22 16:10:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60884 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 0A97D27BBEC; Thu, 22 Feb 2024 16:17:05 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 E6AA027BBE9 for ; Thu, 22 Feb 2024 16:17:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkh-0003Un-5Y; Thu, 22 Feb 2024 11:16:51 -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 1rdBkY-0003Mm-Cr for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:43 -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 1rdBkY-0004aE-25 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBku-0003Tz-UF for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 05/20] gnu: Add pkgconf-as-pkg-config. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861857213056 (code B ref 68813); Thu, 22 Feb 2024 16:17:04 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:12 +0000 Received: from localhost ([127.0.0.1]:38569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk3-0003OQ-Sr for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:42085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk1-0003Na-6J for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:09 -0500 Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-68facd7ea4aso9373226d6.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618480; x=1709223280; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A41ItVnEtdHtAJoClJhGBadNihX2da0ujz7wkwwkb0U=; b=RV4uu6/zVh7NWMXpCUsoYNNf5deqHkzr3eVfG9Y+ko8FSBwflnum8/fSIjKThdXXkm HVKmtotSBy9ZeJktnQzD3fqADMEI7pjHxspelrg+dGornaaa52RV2X+lVLAFWDAnQ4Xo HkUEOwshapOTtJ6jKFuQ/EZHkkLUgeKBYPHWIygCoKwgJP369Sy8YQ2hGIRKXjWKODJE fBdcvczUQe3CEt4Xy7psHp9B8QCMBIs2uO4YEW7lMvJT0bSRlDW+sDN2nwXaU9KgUAkE By552x8ZrcpK1mYwD4b8yRdTmX7etBr5f9LW5xLeZBd/EaQHAwVJPj5lQDBI1YO/6A45 JOnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618480; x=1709223280; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A41ItVnEtdHtAJoClJhGBadNihX2da0ujz7wkwwkb0U=; b=Urs5MjFwiwzRVx06+Yw1uMIGEi+ud+uQijZ8rTtsAiUiSu4nvXKGpr5VN7b6+WLHte G8+KAvav5smXO4hPwGhJbyLb/hWUeg46LpCtIHiONBAZ9RBBzx5NfXvrsBXGfUfTDpWm lBi9x/pGExty9B98DFkkUKlmiNmRhczDbcikodIF2ts4cA6Q6eAYHElMr3c6Ng1OSxqx bAoXLsUkhkciYBRyvcEq+SglAGGvfyEYYKoeqg8Y81L8NaCjX9UxTghOBT23Y2mRbEGu so2mvcxmsRcSZwidOYw7/RPDkCs/598MR1GwXeLduCn1GHO2PoMLGMKGFm/xrdfNiDtu TXyg== X-Gm-Message-State: AOJu0Yz7NKlRNESlcv01H2zwrVI22Mn94Fg5sbyUadku7k9zGuA+dFbF zXkrGHiDdJ58ZarC/TzmC2qpq+WHcUSok6ykmMNR0h9UbrmjfY9p1FWC9/U5 X-Google-Smtp-Source: AGHT+IE/cO9iO4IZw0n1E5e0AN9jDpUfUyK8iwP19YgOBPDhEDOA1Ura1z1zPTdGq8BuBoJaAV7UHw== X-Received: by 2002:a0c:de0f:0:b0:68f:8c73:6ffd with SMTP id t15-20020a0cde0f000000b0068f8c736ffdmr4526310qvk.10.1708618480458; Thu, 22 Feb 2024 08:14:40 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:40 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:04 -0500 Message-ID: <5b85c4d9c68640a6db2d39865dbe9d0dffa4238f.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/pkg-config.scm (pkgconf-as-pkg-config): New variable. Change-Id: Ica85d2c248817fdf4756680cd94b0380e4a2b01f --- gnu/packages/pkg-config.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 2f07bdab9d..a5459dd2a8 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -198,3 +198,31 @@ (define-public pkgconf such as compilers and IDEs to discover and use libraries configured by pkgconf.") (license isc))) + +(define-public pkgconf-as-pkg-config + (package/inherit pkgconf + (name "pkgconf-as-pkg-config") + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key inputs #:allow-other-keys) + (let ((pkgconf (search-input-file inputs "bin/pkgconf"))) + (mkdir-p (string-append #$output "/bin")) + (symlink pkgconf (string-append #$output "/bin/pkg-config")) + + ;; Also make 'pkg.m4' available, some packages might expect it. + (mkdir-p (string-append #$output "/share")) + ;; XXX: Using '#$(this-package-input "pkgconf") here would + ;; create a cycle. + (symlink (string-append (dirname (dirname pkgconf)) + "/share/aclocal") + (string-append #$output "/share/aclocal")))))))) + (native-inputs '()) + (inputs (list pkgconf)) + (propagated-inputs '()))) From patchwork Thu Feb 22 16:10:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60902 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 04E8127BBE9; Thu, 22 Feb 2024 16:43:51 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 1163327BBE2 for ; Thu, 22 Feb 2024 16:43:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdCAg-0001sO-7A; Thu, 22 Feb 2024 11:43:42 -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 1rdCAe-0001rn-Nv for guix-patches@gnu.org; Thu, 22 Feb 2024 11:43:40 -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 1rdCAe-0002I6-DZ for guix-patches@gnu.org; Thu, 22 Feb 2024 11:43:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdCB0-0004tc-Ab for guix-patches@gnu.org; Thu, 22 Feb 2024 11:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 06/20] gnu: pkgconf: Add $PKG_CONFIG_PATH search path. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170862019718706 (code B ref 68813); Thu, 22 Feb 2024 16:44:02 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:43:17 +0000 Received: from localhost ([127.0.0.1]:40410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdCAG-0004rd-O0 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:43:17 -0500 Received: from mail-yb1-f173.google.com ([209.85.219.173]:44298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdCAF-0004rJ-8r for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:43:16 -0500 Received: by mail-yb1-f173.google.com with SMTP id 3f1490d57ef6-dcc84ae94c1so7647437276.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:42:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708620106; x=1709224906; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QhVMCyDMoG3jpLrwWM1Mop2FG5OnFY040VJcROAJzhg=; b=T+cN6uIqP7ihJetmrKT9v9OpOM3wHk5u36+MmHEcOJgDTeAKbGQdVK5FMEtGLh3Wrq cjN1dwPh37/snEwhBw0XudT16aTstphcu6xrFu/EhKGmfKYp7o5x7Wnq/uOxvLbQzYWy oix9IhPPwjbHIxqqHcJdMOnlanq41+UUgklKs94vRmxGmhwGEPbblprtsWlZ2A7yEFF1 7GuJVxPf6HdKWM+p9D6dRqqZqDPQKrQ9zlk0gGBcheiz7mgfiGj0BRAIHsuT58X0Wl81 fE+8jS3EL/HR2TM/0ypd1JN9Fklj4IQUnyKMmeMKyc13LIYVFRYCmlT1ObDVnNsK/PmU 5xXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708620106; x=1709224906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QhVMCyDMoG3jpLrwWM1Mop2FG5OnFY040VJcROAJzhg=; b=PEH5uBr+/NWnq8PAiB8B1ddZQG1FFjniBq/G9MVdgcMtIGFApqY23SUNJqgbHVMODs EXa2eeBkFKTssejZ5TN3FVg3yGjbCMZTGhv/WewWSSjL8bizIDZblOvGtobcIwhEale+ PVycYRn2w8VTdSxCc/2iAvi7vN0hduw/1MV2UCVHiARiFTMiSmv+r+JK+oQKaC7PZ6u9 XZOVIkWsjsWDx9mmtv4mZ9IqLyOTKI29eBDoKwchWMNp+pkyPt2K49awTm4FQFCR247P YCrCrzCfYjyf9kQchFHjgF7W8oVlCM7bHgtMl1QcUMUS44rtsU2BDYH5brWod1TPA9SQ PKng== X-Gm-Message-State: AOJu0YzOyES3eUZr6ATH+nVEEYIGp4SPUIhZbOs4EYbTxbwiQRyP/w6T AatHMwluDJSaGkM/RuyzcQX8xPCB06vI/NWeQbyDtfsYfxkbFFnclWt4LWjr X-Google-Smtp-Source: AGHT+IG5z1RwN6NVwTZGzllbikNYtOsc42OFk/WEaIjBhfC8+52Saoq6jtTN/MVhYo0dflFQUSdxTg== X-Received: by 2002:a05:6808:181f:b0:3c1:5377:78 with SMTP id bh31-20020a056808181f00b003c153770078mr15724897oib.23.1708618482085; Thu, 22 Feb 2024 08:14:42 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:41 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:05 -0500 Message-ID: <9f64af1ce96941910a837e4367440e528336bf5c.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/pkg-config.scm (%pkgconf) [native-search-paths]: Add $PKG_CONFIG_PATH. Change-Id: I6c5c20ca26a3cf21c16eb24747c250ba432a276d --- gnu/packages/pkg-config.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index a5459dd2a8..64a36b2126 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -189,6 +189,7 @@ (define-public pkgconf ;; Kyua requires a writable HOME. (setenv "HOME" "/tmp")))))) (native-inputs (list atf kyua)) + (native-search-paths (list $PKG_CONFIG_PATH)) (home-page "http://pkgconf.org/") (synopsis "Package compiler and linker metadata toolkit") (description "@command{pkgconf} is a program which helps to configure From patchwork Thu Feb 22 16:10:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60890 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 6E60227BBEA; Thu, 22 Feb 2024 16:17:38 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C765127BBE9 for ; Thu, 22 Feb 2024 16:17:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBl4-0003u0-CV; Thu, 22 Feb 2024 11:17:15 -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 1rdBkZ-0003PK-CD for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:44 -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 1rdBkY-0004ae-VZ for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkv-0003U9-SM for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 07/20] gnu: pkgconf: Add support for cross-compilation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861858413134 (code B ref 68813); Thu, 22 Feb 2024 16:17:05 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:24 +0000 Received: from localhost ([127.0.0.1]:38589 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkF-0003Pc-BI for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:24 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:48452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk4-0003Ns-UV for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:13 -0500 Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-78776c82564so206403285a.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618484; x=1709223284; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oHxl0m05rWVekFol++fgctAtmU2NKuMd8A9Mn4sQn7Y=; b=Jmq3VrIS4ZPhWg226+t7BlkcS/vFOK9sJu0QmnF5NiSewfLiyusUnCTD7wlNjQw8UP zp6yVB5/jONnO1YQUHykSIW0qGtvmi9rUjP1NqvH8oPY8VQPGdtKWI3MFfJt3J8ldK1D CGjvWuFjWbOHyMihvMSWOwowhZHgP1ZJYQH0gRB5TDOWdKKJK+6IbMlOSbm+r05W1BFY v4fqGhADAlOd2u+O8mqtnLxpnjwn7F3JK86JaO4qioQXu0ho6+ajS20S8S7JLzFykyYP q9bZMAiqdMlXMiro676xtQn0lOlFjO2E0c0ItUxCCoiZtU8aP74cpvv+6sM+CDSg+adu R19g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618484; x=1709223284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oHxl0m05rWVekFol++fgctAtmU2NKuMd8A9Mn4sQn7Y=; b=i9vuiOXWe6+L5NaX+zKWc++l3/m61mrU0tkRR7o3QoOfwFQDm6oEN8mmyu+D4M0Bz+ QuVOHJkERg9wETGZWdbsnIcLjLMAtmCYxeCAv3yn+7O+3IenMb2ctJfLO2S+EvHyJrjk Jrr90Ahxml4u45w3Od2y85MMnBGqr6I6zhsi28Z4heN0uo4KZ1ds4BWAXhB3qymFocdo HsCX4V2GOO2k/Ii6D28waJlfsdeNoyPaq9X+PkbG2LhT1rs2dAnnpmBTOfLPs2SeYIFV IyhaH9vKcws3Natp334zMaoOChsO+2Efq0v++Pzwyv8u6P1jKHN+1HAKZ7Ds9QKM7SF3 Gvjw== X-Gm-Message-State: AOJu0YwBrQ+a/RWTcShfQPKH5w9b7+ELwIWMKcstsRdu+A8ol8mrnzFj GhAe22Togvo+mZ6XuFdrSj85axHMt0SPbz308ClbqPSB3Bn2DOWiuUyTyufK X-Google-Smtp-Source: AGHT+IE1Ed29J2mBilFa+lBFGx8iY6sLBSW82xIwvaqXTgNn6z6Q0bjsG5kMJqdJ0J6hRoBjASxigA== X-Received: by 2002:a0c:f28f:0:b0:68f:6bce:8505 with SMTP id k15-20020a0cf28f000000b0068f6bce8505mr12217127qvl.41.1708618483818; Thu, 22 Feb 2024 08:14:43 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:43 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:06 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/pkg-config.scm: Reorganize module into sections. (cross-pkg-config): Refactor to accept a TARGET argument. (pkg-config-for-target): Likewise. (pkg-config): Apply pkg-config-for-target to the %pkg-config argument. (pkgconf): New variable, computed via pkg-config-for-target. (pkgconf-as-pkg-config): Likewise. (make-pkg-config-for-build): New procedure. (pkg-config-for-build): Express in terms of the above. (pkgconf-as-pkg-config-for-build): New variable. (%pkgconf): New variable, renamed from previous pkgconf. (%pkgconf-as-pkg-config): New variable, renamed from pkgconf-as-pkg-config. Change-Id: I932e924949c5129bdc328c279cdd214b383d043d --- gnu/packages/pkg-config.scm | 238 +++++++++++++++++++++--------------- 1 file changed, 142 insertions(+), 96 deletions(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 64a36b2126..e8d63be3d7 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -31,11 +31,18 @@ (define-module (gnu packages pkg-config) #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (guix memoization) - #:export (pkg-config)) + #:export (pkg-config + pkgconf + pkgconf-as-pkg-config)) -;; This is the "primitive" pkg-config package. People should use `pkg-config' -;; (see below) rather than `%pkg-config', but we export `%pkg-config' so that -;; `fold-packages' finds it. + +;;; +;;; "Primitive" pkg-config packages. +;;; + +;; The %-less variants defined below should be used instead; the %-prefixed +;; "primitive" packages are exported so that `fold-packages' can find them, +;; making them available for use via the Guix CLI. (define-public %pkg-config (package (name "pkg-config") @@ -82,95 +89,7 @@ (define-public %pkg-config it can be used for defining the location of documentation tools, for instance."))) -(define cross-pkg-config - (mlambda (target) - "Return a pkg-config for TARGET, essentially just a wrapper called -`TARGET-pkg-config', as `configure' scripts like it." - ;; See - ;; for details. - (package - (inherit %pkg-config) - (name (string-append (package-name %pkg-config) "-" target)) - (build-system trivial-build-system) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - - (let* ((in (assoc-ref %build-inputs "pkg-config")) - (out (assoc-ref %outputs "out")) - (bin (string-append out "/bin")) - (prog (string-append ,target "-pkg-config")) - (native (string-append in "/bin/pkg-config"))) - - (mkdir-p bin) - - ;; Create a `TARGET-pkg-config' -> `pkg-config' symlink. - ;; This satisfies the pkg.m4 macros, which use - ;; AC_PROG_TOOL to determine the `pkg-config' program - ;; name. - (symlink native (string-append bin "/" prog)) - - ;; Also make 'pkg.m4' available, some packages might - ;; expect it. - (mkdir-p (string-append out "/share")) - (symlink (string-append in "/share/aclocal") - (string-append out "/share/aclocal")) - #t)))) - (native-inputs `(("pkg-config" ,%pkg-config))) - - ;; Ignore native inputs, and set `PKG_CONFIG_PATH' for target inputs. - (native-search-paths '()) - (search-paths (package-native-search-paths %pkg-config))))) - -(define (pkg-config-for-target target) - "Return a pkg-config package for TARGET, which may be either #f for a native -build, or a GNU triplet." - (if target - (cross-pkg-config target) - %pkg-config)) - -;; This hack allows us to automatically choose the native or the cross -;; `pkg-config' depending on whether it's being used in a cross-build -;; environment or not. -(define-syntax pkg-config - (identifier-syntax (pkg-config-for-target (%current-target-system)))) - -;; This hack allows for using both "pkg-config" and "TARGET-pkg-config" -;; at the same time. Simply using '%pkg-config' and 'pkg-config' won't -;; work because they both use the "PKG_CONFIG_PATH" environment variable. -(define-public pkg-config-for-build - (package - (inherit (hidden-package %pkg-config)) - (name "pkg-config-for-build") - (version "0") - (source #f) - (build-system trivial-build-system) - (inputs - (list bash-minimal %pkg-config)) - (arguments - `(#:modules ((guix build utils)) - #:builder - ,#~(begin - (use-modules (guix build utils)) - (define where (string-append #$output "/bin/pkg-config")) - (mkdir-p (dirname where)) - (call-with-output-file where - (lambda (port) - (format port "#!~a -export PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH_FOR_BUILD\" -exec ~a \"$@\"" - (search-input-file %build-inputs "bin/bash") - (search-input-file %build-inputs "bin/pkg-config")))) - (chmod where #o500)))) - (native-search-paths - (map (lambda (original) - (search-path-specification - (inherit original) - (variable "PKG_CONFIG_PATH_FOR_BUILD"))) - (package-native-search-paths %pkg-config))))) - -(define-public pkgconf +(define-public %pkgconf (package (name "pkgconf") (version "2.1.0") @@ -200,8 +119,8 @@ (define-public pkgconf pkgconf.") (license isc))) -(define-public pkgconf-as-pkg-config - (package/inherit pkgconf +(define-public %pkgconf-as-pkg-config + (package/inherit %pkgconf (name "pkgconf-as-pkg-config") (build-system gnu-build-system) (arguments @@ -225,5 +144,132 @@ (define-public pkgconf-as-pkg-config "/share/aclocal") (string-append #$output "/share/aclocal")))))))) (native-inputs '()) - (inputs (list pkgconf)) + (inputs (list %pkgconf)) (propagated-inputs '()))) + + +;;; +;;; Tooling for generating pkg-config wrappers for cross-compiling. +;;; + +(define (make-cross-pkg-config pkg-config) + (mlambda (target) + "Return a procedure that evaluates to a PKG-CONFIG package for TARGET, +essentially just a wrapper called `TARGET-pkg-config', as `configure' scripts +like it." + ;; See + ;; for details. + (package + (inherit pkg-config) + (name (string-append (package-name pkg-config) "-" target)) + (build-system trivial-build-system) + (arguments + (list + #:builder (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (let* ((in #+pkg-config) + (out #$output) + (bin (string-append out "/bin")) + (prog (string-append #$target "-pkg-config")) + (native (string-append in "/bin/pkg-config"))) + + (mkdir-p bin) + + ;; Create a `TARGET-pkg-config' -> `pkg-config' symlink. + ;; This satisfies the pkg.m4 macros, which use + ;; AC_PROG_TOOL to determine the `pkg-config' program + ;; name. + (symlink native (string-append bin "/" prog)) + + ;; Also make 'pkg.m4' available, some packages might + ;; expect it. + (mkdir-p (string-append out "/share")) + (symlink (string-append in "/share/aclocal") + (string-append out "/share/aclocal"))))))) + + ;; Ignore native inputs, and set `PKG_CONFIG_PATH' for target inputs. + (native-search-paths '()) + (search-paths (package-native-search-paths pkg-config))))) + +(define (make-pkg-config-for-target pkg-config) + "Return a procedure that evaluates to a `pkg-config' package for TARGET +built from PKG-CONFIG. The target may be either #f for a native build, or a +GNU triplet." + (let ((cross-pkg-config (make-cross-pkg-config pkg-config))) + (lambda (target) + (if target + (cross-pkg-config target) + pkg-config)))) + +(define pkg-config-for-target + (make-pkg-config-for-target %pkg-config)) + +(define pkgconf-for-target + (make-pkg-config-for-target %pkgconf)) + +(define pkgconf-as-pkg-config-for-target + (make-pkg-config-for-target %pkgconf-as-pkg-config)) + + +;;; +;;; The final pkg-config package variables to use. +;;; + +;; These are a hacks for automatically choosing the native or the cross +;; `pkg-config' depending on whether it's being used in a cross-build +;; environment or not. +(define-syntax pkg-config + (identifier-syntax (pkg-config-for-target (%current-target-system)))) + +(define-syntax pkgconf + (identifier-syntax (pkgconf-for-target (%current-target-system)))) + +(define-syntax pkgconf-as-pkg-config + (identifier-syntax (pkgconf-as-pkg-config-for-target + (%current-target-system)))) + + +;;; +;;; pkg-config packages for native use (build-time only). +;;; +(define (make-pkg-config-for-build pkg-config) + "Return a `pkg-config' package from PKG-CONFIG for use by the builder when +cross-compiling, that honors a PKG_CONFIG_PATH_FOR_BUILD search path instead +of PKG_CONFIG_PATH, to avoid conflicting with the target `pkg-config'." + (package + (inherit (hidden-package pkg-config)) + (name "pkg-config-for-build") + (version "0") + (source #f) + (build-system trivial-build-system) + (inputs (list bash-minimal pkg-config)) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (define where (string-append #$output "/bin/pkg-config")) + (mkdir-p (dirname where)) + (call-with-output-file where + (lambda (port) + (format port "#!~a +export PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH_FOR_BUILD\" +exec ~a \"$@\"" + (search-input-file %build-inputs "bin/bash") + (search-input-file %build-inputs "bin/pkg-config")))) + (chmod where #o500)))) + (native-search-paths + (map (lambda (original) + (search-path-specification + (inherit original) + (variable "PKG_CONFIG_PATH_FOR_BUILD"))) + (package-native-search-paths pkg-config))))) + +(define-public pkg-config-for-build + (make-pkg-config-for-build %pkg-config)) + +(define-public pkgconf-as-pkg-config-for-build + (make-pkg-config-for-build %pkgconf-as-pkg-config)) From patchwork Thu Feb 22 16:10:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60895 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 0BA1E27BBE9; Thu, 22 Feb 2024 16:18:09 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 15BD427BBE2 for ; Thu, 22 Feb 2024 16:18:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkt-0003gT-IS; Thu, 22 Feb 2024 11:17:03 -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 1rdBka-0003PP-Hb for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:45 -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 1rdBka-0004bR-52; Thu, 22 Feb 2024 11:16:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkw-0003UI-F8; Thu, 22 Feb 2024 11:17:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 08/20] gnu: pkg-config: Alias to pkgconf-as-pkg-config. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861858513148 (code B ref 68813); Thu, 22 Feb 2024 16:17:06 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:25 +0000 Received: from localhost ([127.0.0.1]:38591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkG-0003Pk-H6 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:25 -0500 Received: from mail-qv1-f44.google.com ([209.85.219.44]:46363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk6-0003O1-9r for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:15 -0500 Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-68f41af71ebso56523856d6.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618485; x=1709223285; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wSVKz+rOx4S221MCHjST7bemk95nh9/2CnHpLd1O/9k=; b=XRn1Gtm4HT2F0ZZkNGiZ5jBJ5FzLP7zReeU61aPzIKLfwme3Z4EzcOxcvYQlrJHcxX vUXLuf7/RCYC3AvzK1pKT9FeuKnWKDMXTH+J/ua4eCfhIJFQXy/QLxE/AWM6k5flXtqa fAvxLnb+C3VPDHLUBUIGeU5CXjv+SxQjaxwZrES6DE9qqfcOxidvozCBVlpaUTIy+oqc dsSZRiIWRxHS+/4bB3qb8WptPKwhB8+dIwy0+l9sg37h/yTH0kN4/NDHa5yY0GAveVxy 8Dc6rtFGlleTvEzd+BYMzPGJoXMCgcuOfP+KufUcsvXokShq9Ai+mVauW7SpefgsVC12 k25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618485; x=1709223285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wSVKz+rOx4S221MCHjST7bemk95nh9/2CnHpLd1O/9k=; b=O4q7HxlOwNGV92570/+zYW4T0rc9DonKY/CzZS+4++DHLiVenAltw0KEXcWu46LFu7 ag+AYNMF7Ng+RSpvdM+is6OfmmGcrOLFFjWZA+fAZpMlLk0Q6Z/M/gi22VFhqFeN47kr 0n/MbnPSoP9/dIsKpoBa7uGskU2WoVNPyLSi8WCoNdtN6ciQGhWz6DgM2SX4MCqGfoJy WhlZ7jHE3T3D9zLeirHIQYLFLhFNhH5zmaXyGkTrV/OWALtbrOkbSeuqcot9N4hbpdj1 0mB4BnvSyKovR4LkH5joh5HZWs6dFGLyj+8Fo32EU+S5qC57VGwIpfk5TXmcp6LN6DvP vv+A== X-Gm-Message-State: AOJu0Yzd3yWobd000VxRaE3XTz9s6Z9CoE5eawsrOZmtjPJfwPd5nBUq kOyZS1Pz+J48p5LPATM8EK7P1D6GM80/SWsQR9+bbCqI2BhF9CDY8XIdasxD X-Google-Smtp-Source: AGHT+IFwMCEChw5f6y3uDXBDrTWGuxeussDaWgZA8fScYg92neeA4LwNyseXe4XFbCGBRIfaHGWGbg== X-Received: by 2002:a05:6214:626:b0:68f:52ee:f350 with SMTP id a6-20020a056214062600b0068f52eef350mr15858494qvx.13.1708618485584; Thu, 22 Feb 2024 08:14:45 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:45 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:07 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 This switches the default pkg-config implementation used in Guix to pkgconf. * gnu/packages/pkg-config.scm (pkg-config): Define as pkgconf-as-pkg-config. (%pkgconf-with-tests): Renamed from %pkgconf. (%pkgconf): New minimal variant to avoid circular dependencies for bootstrap sensitive packages. (%pkgconf-as-pkg-config): Delete now inherited hidden property. * gnu/packages/commencement.scm (make-gnu-make-final): Replace %pkg-config with %pkgconf-as-pkg-config. Change-Id: Id2b9f40f8f09babae9c6dfc47d1de071ce78e011 --- gnu/packages/commencement.scm | 13 ++++++------- gnu/packages/pkg-config.scm | 25 +++++++++++++++++++++---- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3e5e21ca03..e9474a797e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3346,13 +3346,13 @@ (define with-boot5 with-boot4) (define (make-gnu-make-final) "Compute the final GNU Make, which uses the final Guile." + ;; Avoid a circular dependency by creating a new bootstrap pkg-config + ;; variant. (let ((pkg-config (package - (inherit %pkg-config) ;the native pkg-config - (inputs `(("guile" ,guile-final) - ,@(%boot5-inputs))) - (arguments - `(#:implicit-inputs? #f - ,@(package-arguments %pkg-config)))))) + ;; Refer to %pkgconf-as-pkg-config instead of + ;; pkgconf-as-pkg-config to ensure native package is + ;; used. + (inherit (with-boot5 %pkgconf-as-pkg-config))))) (package (inherit (package-with-bootstrap-guile gnu-make)) (inputs `(("guile" ,guile-final) @@ -3362,7 +3362,6 @@ (define (make-gnu-make-final) `(#:implicit-inputs? #f ,@(package-arguments gnu-make)))))) - (define coreutils-final ;; The final Coreutils. Treat them specially because some packages, such as ;; Findutils, keep a reference to the Coreutils they were built with. diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index e8d63be3d7..934449aad2 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -31,7 +31,9 @@ (define-module (gnu packages pkg-config) #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (guix memoization) - #:export (pkg-config + #:use-module (srfi srfi-1) + #:export (old-pkg-config ;the original + pkg-config ;alias for pkgconf-as-pkg-config pkgconf pkgconf-as-pkg-config)) @@ -89,7 +91,9 @@ (define-public %pkg-config it can be used for defining the location of documentation tools, for instance."))) -(define-public %pkgconf +;;; This is the package exposed to the CLI, to ease updates via 'guix +;;; refresh'. +(define-public %pkgconf-with-tests (package (name "pkgconf") (version "2.1.0") @@ -119,6 +123,13 @@ (define-public %pkgconf pkgconf.") (license isc))) +;;; This is the minimal, untested variant used to avoid circular dependencies. +(define-public %pkgconf + (hidden-package + (package/inherit %pkgconf-with-tests + (arguments (list #:tests? #f)) + (native-inputs '())))) + (define-public %pkgconf-as-pkg-config (package/inherit %pkgconf (name "pkgconf-as-pkg-config") @@ -145,7 +156,8 @@ (define-public %pkgconf-as-pkg-config (string-append #$output "/share/aclocal")))))))) (native-inputs '()) (inputs (list %pkgconf)) - (propagated-inputs '()))) + (propagated-inputs '()) + (properties (alist-delete 'hidden? (package-properties %pkgconf))))) ;;; @@ -220,7 +232,7 @@ (define pkgconf-as-pkg-config-for-target ;; These are a hacks for automatically choosing the native or the cross ;; `pkg-config' depending on whether it's being used in a cross-build ;; environment or not. -(define-syntax pkg-config +(define-syntax old-pkg-config (identifier-syntax (pkg-config-for-target (%current-target-system)))) (define-syntax pkgconf @@ -230,6 +242,11 @@ (define-syntax pkgconf-as-pkg-config (identifier-syntax (pkgconf-as-pkg-config-for-target (%current-target-system)))) +;;; This alias is to ensure we use pkgconf instead of pkg-config across Guix, +;;; which includes welcome refinements such as proper handling of the +;;; Requires.private field. +(define pkg-config pkgconf-as-pkg-config) + ;;; ;;; pkg-config packages for native use (build-time only). From patchwork Thu Feb 22 16:10:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60901 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 F1FAF27BBEA; Thu, 22 Feb 2024 16:43:03 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 9EE4227BBE2 for ; Thu, 22 Feb 2024 16:43:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdC9g-0001UC-Me; Thu, 22 Feb 2024 11:42:40 -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 1rdC9f-0001TX-7J for guix-patches@gnu.org; Thu, 22 Feb 2024 11:42:39 -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 1rdC9e-00025i-UQ for guix-patches@gnu.org; Thu, 22 Feb 2024 11:42:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdCA1-0004qf-SO for guix-patches@gnu.org; Thu, 22 Feb 2024 11:43:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 09/20] gnu: pstoedit: Update to 4.00. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170862017318608 (code B ref 68813); Thu, 22 Feb 2024 16:43:01 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:42:53 +0000 Received: from localhost ([127.0.0.1]:40382 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdC9s-0004q1-IV for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:42:53 -0500 Received: from mail-oi1-f173.google.com ([209.85.167.173]:59611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdC9m-0004pS-BX for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:42:51 -0500 Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3bb9b28acb4so5312349b6e.2 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:42:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708620077; x=1709224877; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6SXEExoUrGZFk1X0oD69sCrCLo+bv7NnYuGt2Jj/q0E=; b=MukM4MwSq1rbgj1La3x2DDFU9tSgIkVmAKmzexe8zH3C/UFz+Dt/Q/r6EBypZ8OmPI wl+Gi7lyAhekLUfeDtC1o6hWn2CAknXKXmivQwCvvWt9uh3z2CNFu1MVoYSviCZ69T+M gInCvLrgNI0SQNe4gxlfkvrQpHp7kpbDE+1NGHZWm7LaB3S7VGPDmyZJtah5wnRVsD0s XErNbeLpuLxzg8AAVvyjig5qZXm7CFTfqtz4TZJEQmPxXL6bkANJQ82d3N7m2n/1Ufc6 XkwFY89tIXfTIHuaDeBTBcml8HbvC88uDVVyLvbHnhS2XB3JCkaI5OmPmVCH01yZz87T pK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708620077; x=1709224877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6SXEExoUrGZFk1X0oD69sCrCLo+bv7NnYuGt2Jj/q0E=; b=Ea91GAHMbUwVZ0y9ZUvEMdYb/AheuWIV+IIOA/fS5cgEtAk1TQxwH47kEH6ZTmmHo6 TlVkSIOA4lNaZXLrHUyUt4pkHcF/OMMqjaLWvcMMDg9lLAO4jycGkjdi9G0WvPzA6ceE RiHsbJHTeJOekpl9ihQLvrC5NyUYou03+gnyXT8JUFQ1uZEWWvB2EKDRMIXFhK/33pOZ eufDGQUG7eX9MKDSMYm862WD06JOsUscdpA0/EoqUjJ2x8A73PMBGxtn1rfad04QBO4S J3fndsVhj4W+aQKkzZJv1eCRuYsliVnjBXTxqzE0j+cP2J2ZN9Y2vUmCe/2dmSPtVUOu v0gQ== X-Gm-Message-State: AOJu0YydB1l/FHXwtnkAeGFkDx3xU8Mpx1q/CSydWiJlOrwgxogB3ea7 a20zvdMFSXFW1RhSeIz0Spnnyds0sp0/M3lET8wxWDaKePxWTsbO8vB3djwi X-Google-Smtp-Source: AGHT+IEX9bBLT/5wm558Y7Ol4+05kc5kTklCg5nTcngSnQcnVzpSdqr9seG4Arl5J+WxTuV8jqmEEw== X-Received: by 2002:a0c:ca0f:0:b0:68c:a83b:b1ba with SMTP id c15-20020a0cca0f000000b0068ca83bb1bamr22276027qvk.38.1708618487208; Thu, 22 Feb 2024 08:14:47 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:46 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:08 -0500 Message-ID: <0bd56daf4bc6f8dfb9616dad8b18f5e3a9f4f689.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/graphics.scm (pstoedit): Update to 4.00. [source]: Apply patches. [arguments]: New field. [inputs]: Remove labels. Add glib and pango. * gnu/packages/patches/pstoedit-fix-gcc12.patch: New file. * gnu/packages/patches/pstoedit-fix-plainC.patch: Likewise. * gnu/packages/patches/pstoedit-pkglibdir.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. Change-Id: Ia17dae0ebc3e08b573b02431b10cc689a72a07dd --- gnu/local.mk | 3 ++ gnu/packages/graphics.scm | 31 ++++++++---- gnu/packages/patches/pstoedit-fix-gcc12.patch | 12 +++++ .../patches/pstoedit-fix-plainC.patch | 47 +++++++++++++++++++ gnu/packages/patches/pstoedit-pkglibdir.patch | 19 ++++++++ 5 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/pstoedit-fix-gcc12.patch create mode 100644 gnu/packages/patches/pstoedit-fix-plainC.patch create mode 100644 gnu/packages/patches/pstoedit-pkglibdir.patch diff --git a/gnu/local.mk b/gnu/local.mk index 34cdf6564d..9db2e39c45 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1908,6 +1908,9 @@ dist_patch_DATA = \ %D%/packages/patches/psm-disable-memory-stats.patch \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ + %D%/packages/patches/pstoedit-fix-gcc12.patch \ + %D%/packages/patches/pstoedit-fix-plainC.patch \ + %D%/packages/patches/pstoedit-pkglibdir.patch \ %D%/packages/patches/pulseaudio-fix-mult-test.patch \ %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ %D%/packages/patches/pulseview-qt515-compat.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index e04834670d..17a388beea 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2021 Antoine Côté ;;; Copyright © 2021 Andy Tai @@ -976,23 +976,38 @@ (define-public python-booleanoperations (define-public pstoedit (package (name "pstoedit") - (version "3.77") + ;; Do not yet upgrade to 4.0.0, as its include file fails to compile for C + ;; project (see: https://github.com/reviczky/pstoedit/issues/2). + (version "4.00") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pstoedit/pstoedit/" version "/pstoedit-" version ".tar.gz")) (sha256 (base32 - "02av76j75g5sq3bg353yl6dlllda9ihmmk4c8hvgiscix816nv4s")))) + "1sk2mhrjgnlz4a1650p3qxrv6av6qc66ibmy48ckspx7mfp7snh7")) + (patches + (search-patches "pstoedit-fix-gcc12.patch" + "pstoedit-fix-plainC.patch" + "pstoedit-pkglibdir.patch")))) (build-system gnu-build-system) + (arguments + ;; Avoid keeping extraneous references to libtool exhaustively listed + ;; dependencies. + (list #:configure-flags #~(list "LDFLAGS=-Wl,--as-needed"))) (native-inputs (list pkg-config)) (inputs - `(("ghostscript" ,ghostscript) - ("imagemagick" ,imagemagick) - ("libplot" ,plotutils) - ("libjpeg" ,libjpeg-turbo) - ("zlib" ,zlib))) ;else libp2edrvmagick++.so fails to link + (list ghostscript + imagemagick + plotutils + libjpeg-turbo + libzip + ;; The following inputs are pulled in by libtool, from the + ;; imagemagick library files (.la), which records all its + ;; transitive dependencies. + glib + pango)) (home-page "http://www.pstoedit.net/") (synopsis "Converter for PostScript and PDF graphics") (description "The @code{pstoedit} utility allows translating graphics diff --git a/gnu/packages/patches/pstoedit-fix-gcc12.patch b/gnu/packages/patches/pstoedit-fix-gcc12.patch new file mode 100644 index 0000000000..4aeeaff818 --- /dev/null +++ b/gnu/packages/patches/pstoedit-fix-gcc12.patch @@ -0,0 +1,12 @@ +Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree + +--- a/src/drvpptx.orig.cpp 2021-08-29 16:25:45.000000000 +0200 ++++ b/src/drvpptx.cpp 2022-01-28 11:57:44.765756339 +0100 +@@ -65,6 +65,7 @@ + #define ZIP_EXTERN extern + + #include ++#include + + #ifdef _MSC_VER + // MS VC++ Windows diff --git a/gnu/packages/patches/pstoedit-fix-plainC.patch b/gnu/packages/patches/pstoedit-fix-plainC.patch new file mode 100644 index 0000000000..684c5043be --- /dev/null +++ b/gnu/packages/patches/pstoedit-fix-plainC.patch @@ -0,0 +1,47 @@ +Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree + +diff --git a/src/pstoedit.cpp b/src/pstoedit.cpp +index a718f37..ac0df37 100755 +--- a/src/pstoedit.cpp ++++ b/src/pstoedit.cpp +@@ -327,6 +327,11 @@ extern FILE *yyin; // used by lexer + // otherwise we could declare it locally where it is used + + ++extern "C" DLLEXPORT void loadpstoeditplugins_plainC(const char *progname, int verbose) ++{ ++ return loadpstoeditplugins(progname, cerr, (bool) verbose); ++} ++ + static void usage(ostream & outstream, bool forTeX, bool withdetails, bool withcategories ) + { + if (withcategories) { +diff --git a/src/pstoedit.h b/src/pstoedit.h +index 294b3c2..74ebf2a 100755 +--- a/src/pstoedit.h ++++ b/src/pstoedit.h +@@ -100,8 +100,13 @@ void clearPstoeditDriverInfo_plainC(struct DriverDescription_S * ptr); + + #ifdef __cplusplus + extern "C" DLLEXPORT +-#endif + void loadpstoeditplugins(const char* progname, std::ostream & errstream, bool verbose); ++#endif ++ ++#ifdef __cplusplus ++extern "C" DLLEXPORT ++#endif ++void loadpstoeditplugins_plainC(const char* progname, int verbose); + + #ifdef __cplusplus + extern "C" DLLEXPORT +--- a/src/pstoedit.orig.h 2023-07-22 19:27:43.691166652 +0200 ++++ b/src/pstoedit.h 2023-07-22 19:31:18.897952130 +0200 +@@ -37,6 +37,7 @@ + #endif + + #include "pstoedll.h" ++#include + + typedef int (*execute_interpreter_function)(int argc, const char * const argv[]); + diff --git a/gnu/packages/patches/pstoedit-pkglibdir.patch b/gnu/packages/patches/pstoedit-pkglibdir.patch new file mode 100644 index 0000000000..0734913593 --- /dev/null +++ b/gnu/packages/patches/pstoedit-pkglibdir.patch @@ -0,0 +1,19 @@ +Retrieved from Fedora: https://src.fedoraproject.org/rpms/pstoedit/tree + +--- a/config/pstoedit.pc.orig.in 2018-04-16 14:26:28.000000000 +0200 ++++ b/config/pstoedit.pc.in 2020-10-05 14:37:16.750980762 +0200 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/pstoedit + + Name: pstoedit + Description: converts PostScript(TM) and PDF files to other vector graphic formats +@@ -8,4 +8,4 @@ + Version: @VERSION@.0 + Requires: + Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@ +-Cflags: -I@includedir@ ++Cflags: -I@includedir@/pstoedit From patchwork Thu Feb 22 16:10:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60896 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 C0EA727BBEA; Thu, 22 Feb 2024 16:18:11 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 4B14527BBE2 for ; Thu, 22 Feb 2024 16:18:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBl7-00046M-Ao; Thu, 22 Feb 2024 11:17:17 -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 1rdBka-0003PQ-Hk for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:45 -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 1rdBka-0004bS-5C for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkx-0003UO-2H for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 10/20] gnu: autotrace: Update to 0.31.10. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861858613174 (code B ref 68813); Thu, 22 Feb 2024 16:17:07 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:26 +0000 Received: from localhost ([127.0.0.1]:38596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkH-0003Q1-G0 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:26 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:59502) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk9-0003OX-Bc for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:17 -0500 Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-6869e87c8d8so36211276d6.2 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618489; x=1709223289; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fZjRuOj1YDVCzg5ZPOnzBSE5zjztW/dX2Pthbdkw3PA=; b=TaiX2DQgJGkpo/JWASjlnjPTZFUrgm5uIBo4efvITFw21cQqhjOoPv786xfHcz/oUG LwuN5b7X3n0FKbznNNYjahHqOWvd4Uh2n6h0uQC1EmlX0QZvK7qDvEAjU6iHB829ZSRS U8ZxF/Ll/+Cj51JgPvwrpgJdg6cH9aWUPb9u1YalVNMa8MSCZynM21waD2BmkNUXVsTf QSGus4PYjA7aaZJIZB8ICCyzNb6xh0vC+yj3Rh1K32q+gUfnn08IWR4BXWRnrRSUMn44 WCptxN4V/UoMTFwpoDq7vR/435O4FvM81P3ekCu/MHPzdMl7JlPmbZYR19lAL9nv7lRx d4Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618489; x=1709223289; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fZjRuOj1YDVCzg5ZPOnzBSE5zjztW/dX2Pthbdkw3PA=; b=v7bhiBlmGr53/11Jl8HIJpCPx26VQhmLIzOIlih2HeS0O66RQk8GQ43vjUNkT9Fzsk 7tVEINZoI6CLk25e57OkdumAPGZK2ZdUpBorbbmvJkqPp9uvIrhe3WA4rjgQ7jwJs+L9 ijkDFFDjZdyXrUjtTVjpn9jB8m39Xu/xqt21wpsPTNS7d1qwvy8m6dGQkCIeGfFRR+mO KBPB9Fo4iSAaLp/W/8cDdNJyyWIR57upl/w3KROkX8QAhsQNYw1O5LEMh5cB2H4KsWND y+5YfRPjS1rM2BD5otzx3HnTBH44mNOxafdlurWUzTY5cjiVWEzjqOWi9XiXPlyNKzUa NLlg== X-Gm-Message-State: AOJu0YyXgTd2ozoqOqpF2xgbPyFDGNgKgvrRVpWCCWZePGyQjTmWxhco B1kpCalHl+o0YdTJRJI8rWD1Ig+nJW3lzFk21ASj5UxzcJfX8czF96L5iNsd X-Google-Smtp-Source: AGHT+IHKWCUBK0oLhNEf+DUnL7uzLiljX1ILBsZEZ4mui5sO0B5+v4cb4NapwNFiL0BHbWoDD22EOA== X-Received: by 2002:a0c:e086:0:b0:68f:5d17:8d4 with SMTP id l6-20020a0ce086000000b0068f5d1708d4mr12506902qvk.46.1708618488695; Thu, 22 Feb 2024 08:14:48 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:48 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:09 -0500 Message-ID: <800c0ecbf4bf3f264967bd0009a67fd7a16b1ef9.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/graphics.scm (autotrace): Update to 0.31.10. [inputs]: Add pango. Change-Id: I26abf2ee1a2c031062a2cdfa1ac4c02cd7474614 --- gnu/packages/graphics.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 17a388beea..bc7bdc124c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -382,7 +382,7 @@ (define-public fox (define-public autotrace (package (name "autotrace") - (version "0.31.9") + (version "0.31.10") (source (origin (method git-fetch) (uri (git-reference @@ -391,7 +391,7 @@ (define-public autotrace (file-name (git-file-name name version)) (sha256 (base32 - "0fsg13pg72ac51l3fkzvyf7h9mzbvfxp9vfjfiwkyvx6hbm83apj")))) + "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~'("--disable-static") @@ -419,7 +419,11 @@ (define-public autotrace imagemagick libjpeg-turbo libpng - pstoedit)) + pstoedit + ;; pango is required because of libtool, from the imagemagick + ;; library files (.la), which records all its transitive + ;; dependencies. + pango)) (home-page "https://github.com/autotrace/autotrace") (synopsis "Bitmap to vector graphics converter") (description "AutoTrace is a utility for converting bitmap into vector From patchwork Thu Feb 22 16:10:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60889 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 342C427BBEA; Thu, 22 Feb 2024 16:17:35 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 AE04927BBE2 for ; Thu, 22 Feb 2024 16:17:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBko-0003gO-Qh; Thu, 22 Feb 2024 11:16:58 -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 1rdBkb-0003PU-0Y for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:46 -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 1rdBka-0004bz-Nf for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:44 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkx-0003Ua-LS for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 11/20] gnu: autotrace: Remove libtool archives. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861858713186 (code B ref 68813); Thu, 22 Feb 2024 16:17:07 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:27 +0000 Received: from localhost ([127.0.0.1]:38598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkI-0003QX-Nf for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:27 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:58628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkA-0003Oh-US for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:20 -0500 Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-42dd9dfe170so29992011cf.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618490; x=1709223290; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kOYeOhlmXgYmQKj3B/XaHrfcBpTwwNKJXDdDIwMmj94=; b=gPoQ0ESsZX02L6WRtBelqdVPH6bto0AW58QhpaamUHc61nM8TEuwRDJNkpv1H2wHvj j4rWtdSzAkZQtyo4RSLhq9IT5Hn2IuvsPMHgda8KGN0JGuUrB9o3maM5NI7ePBSH+bg1 2vFSfi9Rzw8UBPp8zGYEj3QdNYS9xPzoWpKL2Q+Jqy57f0hLyRI6lfreSG5Glr0Pwbya tucp5wue89J6HSr1/ESXpiLrClZS4WXEplYdenJyeB9FO8qXvrG5lGHILvhkmzvlcsqP v8XwIldYyH7U6LoNTA/qOgJX/HxGRSjse6u0uYzn+0aquJmkPxJ5QuZDT7FofAa9uYwI p8sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618490; x=1709223290; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kOYeOhlmXgYmQKj3B/XaHrfcBpTwwNKJXDdDIwMmj94=; b=NJyHwNyEUeaN5Vl+baNa+r9Ds5bnYDXlykwGcs1Z7/EiSDES+IfMSwMP5oi9PQfXm7 XhtzWmveBE36YlvzbOvc5N6BvbUP1+hDhSN5Bg4ceyWh9D2MAl6j9AEZwTphpFszMS3+ BMkMRjt+OkC00VzDhAd8asyQLmJZcTCaXHJ9BaQCFj3G3KPrlV/hX8sIp8LAMJhZzIeT xX76x29KnQwh1osz+Ev6uf6gvr9qUT/HvyReh2Oh9S6ScBVnJDMyYydeahuWyQ8yxfjn rMMyzYCj3CoOee03cdxxTzXaD+Eu5otkodtc+Rlu+qAS6SsszvIdejAYa7ykVdxBS7iA W/ZA== X-Gm-Message-State: AOJu0YzPTgboNN8AKKk9wZcfxhEjxkCd6aBgMY7m6StylUuxm7eMlXDl 2uTG6BZWoMflrngf/lh/aH81v56Hplcos3QiT1YPrZhfWFTPUI0YYsXzuSxu X-Google-Smtp-Source: AGHT+IHNjorfcUEKbkqw+nIZZniQlNQ9jgtNkUb5atTfHY5hIZMiNgUfoBYcMKT5YfPduCNMUDMrZQ== X-Received: by 2002:a0c:e086:0:b0:68f:5d17:8d4 with SMTP id l6-20020a0ce086000000b0068f5d1708d4mr12507002qvk.46.1708618490294; Thu, 22 Feb 2024 08:14:50 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:50 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:10 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/graphics.scm (autotrace) [arguments] : Add remove-libtool-archives phase. Change-Id: Icd8dcf86592231e958db1ebe723e3ec6f902e0bd --- gnu/packages/graphics.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bc7bdc124c..fa33dce747 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -405,7 +405,16 @@ (define-public autotrace ;; or IMAGEMAGICK_; fix that. (substitute* "autotrace.pc.in" (("@MAGICK_(LIBS|CFLAGS)@" _ var) - (string-append "@IMAGEMAGICK_" var "@")))))))) + (string-append "@IMAGEMAGICK_" var "@"))))) + (add-after 'install 'remove-libtool-archives + ;; Libtool archives lists the whole transitive dependencies, + ;; which is unnecessary unless producing static archives and + ;; leads to overlinking, e.g. causing the build of inkscape + ;; to fail due to looking for a transitive pstoedit library. + (lambda _ + (for-each delete-file + (find-files (string-append #$output "/lib") + "\\.la$"))))))) (native-inputs (list which autoconf From patchwork Thu Feb 22 16:10:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60887 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 34E7427BBE9; Thu, 22 Feb 2024 16:17:20 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 AA16527BBEA for ; Thu, 22 Feb 2024 16:17:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBko-0003gP-Rm; Thu, 22 Feb 2024 11:16:59 -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 1rdBkb-0003Pf-N4 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:47 -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 1rdBkb-0004cH-DT for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBky-0003Ul-9h for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 12/20] gnu: autotrace: Fix pkg-config file. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861858913204 (code B ref 68813); Thu, 22 Feb 2024 16:17:08 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:29 +0000 Received: from localhost ([127.0.0.1]:38602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkJ-0003Qd-5V for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:28 -0500 Received: from mail-qv1-f54.google.com ([209.85.219.54]:60837) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkC-0003Oz-N6 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:21 -0500 Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-68f4bad3cb3so23025166d6.1 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618492; x=1709223292; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PHI3UplwEgcgDK9sHAW5OxIkaWenlwpOiTtlgk7IbWc=; b=az1/Cr0FBwFoFlBEuRSulyXmNqQTbVkxZPt/LuqlsJk9H8Zy87/yJi0KEUFgZTVzYo 4mvkkioyngEMCzuQpuJYtV0JWowhp2UAjYS8NCgEew+H0y4nuf4mixN4cuot76qYdemv T1A80z1xWwxqjZTHI+J8XhbIdopc0lw+m5fme5f4E7ev5wHvP7DMybZjguensaB180Oo E+Hlzl9DPtGz9sZwbYKyvrrHc00ASeJnW+I633BDIcjnVI10Hc9gldDLOFB9UgjgEVaP ba9JvfWWaUDEFan/1RVWExsIUj4hZQYFCFZtPbIbLsRwbskz6UD34PZQSvdiyjz+vMAB 8BSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618492; x=1709223292; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PHI3UplwEgcgDK9sHAW5OxIkaWenlwpOiTtlgk7IbWc=; b=X+i/C0ahtvUyofEMFpL1yJTgQvLK+J/bn4uzwbNExwT7RLr01jlHx1lYApEwkUBcQM FpzU9r4bNIFPhIUZJI7wgiHVUfBnYW80clfnBN8yU0ybo53F74dCwnpi/OhQptzDy9Cp 9Igql0Lm1WZlwTTQ1czhn7GW6uMuZhyU3F8GE4r+lUxmhB0odaZIQDDZXqsiA82OJ05l utfJt6WJzoFV0ECqWGSSgXH8BBBgDjw8bePslzuXwqsKs1KLdmUfgrctkrYHvKhXooJq 4Wtvg15y1SnpLwi8ifhYyj70iwx2KScsDvY4eGPb6VCdyl2SW8VP5czItewxCKjGMRkF rgMw== X-Gm-Message-State: AOJu0YzlMBzdBiLGBbxxpOecj0yk2gCST5sDZYUC1QV7VRM+r7gnnnVm wy3DEL2wYEEAbxQDVQ3Jvao7/p4Odxy52BBFM3QBSQ6xxvWJHyZEf7Ps3i4m X-Google-Smtp-Source: AGHT+IFcYsMsWrEaIDm7d1obKrLwV3wGdwSFH/WmCkeGCfspDxE00jrVOVpXNn9ulQzva5FYfTEE2g== X-Received: by 2002:a0c:e314:0:b0:68f:19a7:dd91 with SMTP id s20-20020a0ce314000000b0068f19a7dd91mr23751977qvl.2.1708618492042; Thu, 22 Feb 2024 08:14:52 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:51 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:11 -0500 Message-ID: <3e8e430a00b87e5980b15b128a5dec144d16c120.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/autotrace-pkg-config.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/graphics.scm (autotrace) [source]: Apply it. Change-Id: Id2086a5e1e1faa48d16ee8faae6960aaf7602321 --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 3 +- .../patches/autotrace-pkg-config.patch | 123 ++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/autotrace-pkg-config.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9db2e39c45..c072d5af85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -956,6 +956,7 @@ dist_patch_DATA = \ %D%/packages/patches/audiofile-hurd.patch \ %D%/packages/patches/audiofile-function-signature.patch \ %D%/packages/patches/automake-skip-amhello-tests.patch \ + %D%/packages/patches/autotrace-pkg-config.patch \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index fa33dce747..01cd55f33b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -391,7 +391,8 @@ (define-public autotrace (file-name (git-file-name name version)) (sha256 (base32 - "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x")))) + "0ai91c567c5z560s4zjgjclgca1pm61h8cb8c8q84wg3xvkhmc9x")) + (patches (search-patches "autotrace-pkg-config.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags #~'("--disable-static") diff --git a/gnu/packages/patches/autotrace-pkg-config.patch b/gnu/packages/patches/autotrace-pkg-config.patch new file mode 100644 index 0000000000..eef1008bf2 --- /dev/null +++ b/gnu/packages/patches/autotrace-pkg-config.patch @@ -0,0 +1,123 @@ +Submitted upstream: https://github.com/autotrace/autotrace/pull/128 + +diff --git a/Makefile.am b/Makefile.am +index ea6eadd..cd9de37 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -127,7 +127,18 @@ autotraceinclude_HEADERS=\ + src/exception.h \ + src/color.h + +-libautotrace_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++libautotrace_la_LDFLAGS = \ ++ -version-info \ ++ $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ $(GRAPHICSMAGICK_LIBS) \ ++ $(IMAGEMAGICK_LIBS) \ ++ $(LIBPNG_LIBS) \ ++ $(LIBSWF_LIBS) \ ++ $(LIBPSTOEDIT_LIBS) \ ++ $(GLIB2_LIBS) \ ++ $(POPT_LIBS) \ ++ $(INTLLIBS) \ ++ -lm + + # + # noinst_HEADERS: headers shared between lib and bin. +@@ -143,17 +154,7 @@ autotrace_SOURCES=\ + + AM_CPPFLAGS = $(GRAPHICSMAGICK_CFLAGS) $(IMAGEMAGICK_CFLAGS) $(LIBPSTOEDIT_CFLAGS) $(LIBSWF_CFLAGS) $(GLIB2_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\" + +-autotrace_LDADD = \ +- libautotrace.la \ +- $(GRAPHICSMAGICK_LIBS) \ +- $(IMAGEMAGICK_LIBS) \ +- $(LIBPNG_LIBS) \ +- $(LIBSWF_LIBS) \ +- $(LIBPSTOEDIT_LIBS) \ +- $(GLIB2_LIBS) \ +- $(POPT_LIBS) \ +- $(INTLLIBS) \ +- -lm ++autotrace_LDADD = libautotrace.la + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA= autotrace.pc +diff --git a/autotrace.pc.in b/autotrace.pc.in +index 4c2e581..c70808e 100644 +--- a/autotrace.pc.in ++++ b/autotrace.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: Autotrace + Description: a utility that converts bitmap to vector graphics + Version: @VERSION@ +-Requires: +-Libs: -L@libdir@ -lautotrace @LIBPNG_LIBS@ @MAGICK_LIBS@ @LIBSWF_LIBS@ @LIBPSTOEDIT_LIBS@ @GLIB2_LIBS@ +-Cflags: -I@includedir@ @MAGICK_CFLAGS@ @LIBPSTOEDIT_CFLAGS@ @GLIB2_CFLAGS@ ++Requires.private: glib-2.0 >= 2.0 gmodule-2.0 >= 2.0 gthread-2.0 >= 2.0 gobject-2.0 >= 2.0 @REQUIRES_PRIVATE@ ++Libs: -L@libdir@ -lautotrace ++Cflags: -I@includedir@ +diff --git a/configure.ac b/configure.ac +index 43b6fea..e6cf262 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -85,7 +85,8 @@ else + if test "x${with_magick}" = xGraphicsMagick; then + PKG_CHECK_MODULES([GRAPHICSMAGICK], + [GraphicsMagick >= 1.3.40], +- [HAVE_MAGICK=yes ++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}GraphicsMagick >= 1.3.40 " ++ HAVE_MAGICK=yes + HAVE_GRAPHICSMAGICK=yes + MAGICK_LIBRARY=GraphicsMagick + AC_DEFINE(HAVE_GRAPHICSMAGICK, 1, [GraphicsMagick library is available.]) +@@ -97,13 +98,15 @@ else + if test "x${with_magick}" = xImageMagick; then + PKG_CHECK_MODULES([IMAGEMAGICK7], + [ImageMagick >= 7.0.1], +- [HAVE_IMAGEMAGICK7=yes ++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 7.0.1 " ++ HAVE_IMAGEMAGICK7=yes + AC_DEFINE(HAVE_IMAGEMAGICK7, 1, [ImageMagick version 7 or higher is available.]) + ],[] + ) + PKG_CHECK_MODULES([IMAGEMAGICK], + [ImageMagick >= 5.2.1], +- [HAVE_MAGICK=yes ++ [REQUIRES_PRIVATE="${REQUIRES_PRIVATE}ImageMagick >= 5.2.1 " ++ HAVE_MAGICK=yes + HAVE_IMAGEMAGICK=yes + MAGICK_LIBRARY=ImageMagick + AC_DEFINE(HAVE_IMAGEMAGICK, 1, [ImageMagick library is available.]) +@@ -140,6 +143,7 @@ HAVE_LIBPNG=no + if test "x${with_png}" = xyes; then + PKG_CHECK_MODULES([LIBPNG],[libpng], + [ ++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libpng " + HAVE_LIBPNG=yes + AC_DEFINE(HAVE_LIBPNG,1,[PNG library is available or not]) + ], +@@ -165,6 +169,7 @@ if test "${swf_header_found}" = yes ; then + PKG_CHECK_MODULES([LIBSWF], + [libming], + [ ++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}libming " + HAVE_LIBSWF=yes + AC_DEFINE(HAVE_LIBSWF,1,[SWF library is available or not]) + ], +@@ -187,6 +192,7 @@ if test "x${with_pstoedit}" = xyes; then + PKG_CHECK_MODULES([LIBPSTOEDIT], + [pstoedit >= 3.32.0], + [ ++ REQUIRES_PRIVATE="${REQUIRES_PRIVATE}pstoedit >= 3.32.0 " + HAVE_LIBPSTOEDIT=yes + AC_DEFINE(HAVE_LIBPSTOEDIT,1,[pstoedit library is available or not]) + ], +@@ -210,6 +216,7 @@ fi + + dnl po/Makefile.in FIXME FIXME FIXME + AC_CONFIG_FILES([po/Makefile.in Makefile autotrace.pc]) ++AC_SUBST([REQUIRES_PRIVATE]) + AC_OUTPUT + + echo " From patchwork Thu Feb 22 16:10:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60892 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 F393927BBE2; Thu, 22 Feb 2024 16:17:50 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 337C627BBE9 for ; Thu, 22 Feb 2024 16:17:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBl2-0003nA-BY; Thu, 22 Feb 2024 11:17:12 -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 1rdBkd-0003S3-Fi for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:48 -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 1rdBkc-0004cg-52 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkz-0003Ut-1T for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 13/20] gnu: gd: Update to 2.3.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861860313263 (code B ref 68813); Thu, 22 Feb 2024 16:17:08 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:43 +0000 Received: from localhost ([127.0.0.1]:38621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkX-0003Rn-Vj for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:43 -0500 Received: from mail-qv1-f52.google.com ([209.85.219.52]:45429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkE-0003P3-S9 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:24 -0500 Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-68f51ba7043so35433836d6.3 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618494; x=1709223294; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=i7T1dpEiyBCPrgGwgBvGxMOvU4j50Cmi9bPIIAIzU18=; b=miWa1jPk8a1q+FjP+ti4wSr1vDgEZwd/bLjMyw8m55nLp1w1jRCGc3hCN+Jz8Npd+U mopLtHaEpvLKzHYg59if0M2zPWIZ5MMS0jGfN9nHAGG/dPX9r3Cs4sBA1UR3qNI0Zcf8 bOXapHZ5rAa5Ta7M/GCYSvW0hdHq5SemAHqrK2TklEWKKRxUtrEnqA3l1w0Zz7VraLcS fykWAW8vjj76kXjbMIGchSJNtPviVGAtF3Bnbj819H0+mfcasnLNqE4ke3FPw4Zwqu/Z AuChr9NdIeNX33+n9tOazaahD/iyTGx0J4PTMyrA7Gn/aKcgLDu4G/oYb3qFwI2Pd2aH 8nVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618494; x=1709223294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i7T1dpEiyBCPrgGwgBvGxMOvU4j50Cmi9bPIIAIzU18=; b=V3gLAg3Tx2A1LAZVOh6UZbhdRnykK0XO6JLhe246ilgexRWnFJjk5+qddeyqGTp/SQ TPWtmGEZwR5T3yVAhSIytIjP7hGS34lEcmY4UqncSkT3MpAF2XF8TPV8EAh7S2/46Hp2 o0qHgnIAgnTePcAlWPYvBjO3f9LsYSiBHFHiore04CxhgS5I/pJWpvTXe9jtfyd1FjWQ UryI8MEeSL3jjK6EiyCSpaonpYtTk7s0dsswaJbgJaJ44kb1daBSS5+/SFT6f+I4zM8V smLO9qI2oqcEjZuGfwMNyr38+0pJ3sKv80gV8Mfc65WqdDiaumHF8OJ8VXfkaQ7BOs1B rh5g== X-Gm-Message-State: AOJu0YxY/qaxYw/m0YGuZnoXYoP319agaaKph7p1lHCC9JOso/+Iq0SU S5Z8G75pRUC3yvx1d20uU9pMyC8vjYylE/ambLNdfeonh5x4OU53UhmUFUW2 X-Google-Smtp-Source: AGHT+IFsv+kwEqxdWzHIOi9zXN7q+jKXQUWHbOCVMLaDfPEIH4rx/h4mYwRp+L3JaYTOjrwKoCufnw== X-Received: by 2002:a05:6214:5086:b0:68f:4ff6:5fee with SMTP id kk6-20020a056214508600b0068f4ff65feemr14943836qvb.45.1708618493587; Thu, 22 Feb 2024 08:14:53 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:53 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:12 -0500 Message-ID: <9fbceb8f7b95fe102ced8ff3793008759bacaad8.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/gd.scm (gd): Update to 2.3.3. [source]: Remove obsolete gd-Revert-fix-303-gdlib.pc.patch patch. [arguments] Use gexps. : Remove disable-failing-test phase. Add remove-libtool-archives phase. * gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Change-Id: I8cddf29d123ca0b66cc0540666c875039e753482 --- gnu/local.mk | 1 - gnu/packages/gd.scm | 57 +++--- .../patches/gd-Revert-fix-303-gdlib.pc.patch | 179 ------------------ 3 files changed, 28 insertions(+), 209 deletions(-) delete mode 100644 gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch diff --git a/gnu/local.mk b/gnu/local.mk index c072d5af85..94b4620c02 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1294,7 +1294,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcolor3-update-libportal-usage.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ - %D%/packages/patches/gd-Revert-fix-303-gdlib.pc.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/gdm-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 149b82468c..21ad1579ec 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2021 Efraim Flashner ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,38 +44,36 @@ (define-public gd ;; Note: With libgd.org now pointing to github.com, genuine old ;; tarballs are no longer available. Notably, versions 2.0.x are ;; missing. - (version "2.3.2") + (version "2.3.3") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/libgd/libgd/releases/download/gd-" - version "/libgd-" version ".tar.xz")) - (sha256 - (base32 - "1yypywkh8vphcy4qqpf51kxpb0a3r7rjqk3fc61rpn70hiq092j7")) - (patches - (search-patches "gd-fix-tests-on-i686.patch" - "gd-brect-bounds.patch" - ;; Drop when - ;; https://github.com/libgd/libgd/issues/691 - ;; is solved. - "gd-Revert-fix-303-gdlib.pc.patch")))) + (method url-fetch) + (uri (string-append + "https://github.com/libgd/libgd/releases/download/gd-" + version "/libgd-" version ".tar.xz")) + (sha256 + (base32 + "0qas3q9xz3wgw06dm2fj0i189rain6n60z1vyq50d5h7wbn25s1z")) + (patches + (search-patches "gd-fix-tests-on-i686.patch" + "gd-brect-bounds.patch")))) (build-system gnu-build-system) (arguments - ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding - ;; issues on aarch64 and other architectures. - `(#:make-flags '("CFLAGS=-ffp-contract=off") - #:configure-flags '("--disable-static") - #:phases - (modify-phases %standard-phases - ;; This test is known to fail on most architectures: - ;; https://github.com/libgd/libgd/issues/359 - ;; TODO Replace this substitution with an upstream bug fix. - (add-after 'unpack 'disable-failing-test - (lambda _ - (substitute* "tests/gdimagegrayscale/basic.c" - (("return gdNumFailures\\(\\)") - "return 0"))))))) + ;; As recommended by github.com/libgd/libgd/issues/278 to fix rounding + ;; issues on aarch64 and other architectures. + (list #:make-flags #~(list "CFLAGS=-ffp-contract=off") + #:configure-flags #~(list "--disable-static") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-libtool-archives + ;; Libtool archives lists the whole transitive dependencies, + ;; which is unnecessary unless producing static archives and + ;; leads to overlinking, e.g. causing the configure script of + ;; texlive-bin to fail due to looking for a transitive jpeg + ;; library. + (lambda _ + (for-each delete-file + (find-files (string-append #$output "/lib") + "\\.la$"))))))) (native-inputs (list pkg-config)) (inputs diff --git a/gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch b/gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch deleted file mode 100644 index 6329b129d3..0000000000 --- a/gnu/packages/patches/gd-Revert-fix-303-gdlib.pc.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 9b31dfda73ee2d1b56b3f0dcfd3246c2faa592fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?L=C3=A9o=20Le=20Bouter?= -Date: Sun, 28 Mar 2021 19:47:25 +0200 -Subject: [PATCH] Revert "fix #303: gdlib.pc: use Requires instead of Libs - (#537)" - -This reverts commit 28ecfe77c817aff8ce56422d3e4e8533a281bc76. ---- - CMakeLists.txt | 12 ------------ - config/gdlib.pc.cmake | 4 +--- - config/gdlib.pc.in | 4 +--- - configure.ac | 11 +---------- - src/CMakeLists.txt | 6 ------ - 5 files changed, 3 insertions(+), 34 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57cd95d..6bd0c73 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,8 +53,6 @@ SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY - "Single Directory for all static libraries." - ) - --SET(PKG_REQUIRES_PRIVATES "") -- - if (USE_EXT_GD) - message("Using GD at: ${USE_EXT_GD}") - INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR}) -@@ -170,13 +168,11 @@ else (USE_EXT_GD) - INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS}) - SET(HAVE_FT2BUILD_H 1) - SET(HAVE_LIBFREETYPE 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES freetype2) - ENDIF(FREETYPE_FOUND) - - IF(ZLIB_FOUND) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) - SET(HAVE_LIBZ 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES zlib) - ENDIF(ZLIB_FOUND) - - IF(WEBP_FOUND) -@@ -192,7 +188,6 @@ else (USE_EXT_GD) - IF(PNG_FOUND) - INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) - SET(HAVE_LIBPNG 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES libpng) - ENDIF(PNG_FOUND) - - IF(ICONV_FOUND) -@@ -209,25 +204,21 @@ else (USE_EXT_GD) - IF(XPM_FOUND) - INCLUDE_DIRECTORIES(${XPM_INCLUDE_DIR}) - SET(HAVE_LIBXPM 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES xpm) - ENDIF(XPM_FOUND) - - IF(JPEG_FOUND) - INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) - SET(HAVE_LIBJPEG 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES libjpeg) - ENDIF(JPEG_FOUND) - - IF(TIFF_FOUND) - INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) - SET(HAVE_LIBTIFF 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES libtiff-4) - ENDIF(TIFF_FOUND) - - IF(FONTCONFIG_FOUND) - INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR}) - SET(HAVE_LIBFONTCONFIG 1) -- LIST(APPEND PKG_REQUIRES_PRIVATES fontconfig) - ELSE (FONTCONFIG_FOUND) - SET(FONTCONFIG_LIBRARY "") - SET(FONTCONFIG_INCLUDE_DIR "") -@@ -236,11 +227,8 @@ else (USE_EXT_GD) - - IF(RAQM_FOUND) - INCLUDE_DIRECTORIES(${RAQM_INCLUDE_DIR}) -- SET(HAVE_RAQM 1) -- LIST(APPEND PKG_REQUIRES_PRIVAES raqm) - ENDIF(RAQM_FOUND) - -- string(REPLACE ";" ", " PKG_REQUIRES_PRIVATES "${PKG_REQUIRES_PRIVATES}") - SET(HAVE_CONFIG_H 1) - - ADD_DEFINITIONS(-DHAVE_CONFIG_H) -diff --git a/config/gdlib.pc.cmake b/config/gdlib.pc.cmake -index 5fc8af4..d1a0dda 100644 ---- a/config/gdlib.pc.cmake -+++ b/config/gdlib.pc.cmake -@@ -6,8 +6,6 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ - Name: gd - Description: GD graphics library - Version: @GDLIB_VERSION@ --Requires: --Requires.private: @PKG_REQUIRES_PRIVATES@ - Cflags: -I${includedir} --Libs.private: @LIBS_PRIVATES@ -+Libs.private: @LIBGD_DEP_LIBS@ - Libs: -L${libdir} -lgd -diff --git a/config/gdlib.pc.in b/config/gdlib.pc.in -index d6bc375..b980a60 100644 ---- a/config/gdlib.pc.in -+++ b/config/gdlib.pc.in -@@ -6,8 +6,6 @@ includedir=@includedir@ - Name: gd - Description: GD graphics library - Version: @VERSION@ --Requires: --Requires.private: @PKG_REQUIRES_PRIVATES@ - Cflags: -I${includedir} --Libs.private: @LIBS_PRIVATES@ @LIBICONV@ -+Libs.private: @LIBS@ @LIBICONV@ - Libs: -L${libdir} -lgd -diff --git a/configure.ac b/configure.ac -index 535db68..329c99c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,9 +33,6 @@ AC_SUBST(GDLIB_LT_CURRENT) - AC_SUBST(GDLIB_LT_REVISION) - AC_SUBST(GDLIB_LT_AGE) - --AC_SUBST(LIBS_PRIVATES) --AC_SUBST(PKG_REQUIRES_PRIVATES) -- - AM_INIT_AUTOMAKE([1.11 foreign dist-xz -Wall -Werror subdir-objects]) - AC_CONFIG_HEADERS([src/config.h:src/config.hin]) - -@@ -133,7 +130,6 @@ m4_define([GD_LIB_CHECK], [dnl - AC_MSG_RESULT([$gd_with_lib]) - - gd_found_lib=no -- gd_require_pkg_name="" - if test "$gd_with_lib" != "no"; then - save_CPPFLAGS=$CPPFLAGS - save_LDFLAGS=$LDFLAGS -@@ -165,11 +161,6 @@ m4_define([GD_LIB_CHECK], [dnl - $1][_CFLAGS="$gd_lib_cflags $][$1][_CFLAGS" - AS_VAR_APPEND([LIBS], [" $][$1][_LIBS"]) - AS_VAR_APPEND([CPPFLAGS], [" $][$1][_CFLAGS"]) -- if test -z "$gd_require_pkg_name"; then -- AS_VAR_APPEND([LIBS_PRIVATES], [" $][$1][_LIBS"]) -- else -- AS_VAR_APPEND([PKG_REQUIRES_PRIVATES], [" $gd_require_pkg_name"]) -- fi - elif test "$gd_with_lib" = "yes"; then - AC_MSG_ERROR([$3 requested but not found]) - else -@@ -189,7 +180,7 @@ dnl $4 - pkg-config module to look for - dnl $5 - fallback test for the feature - m4_define([GD_LIB_PKG_CHECK], [dnl - GD_LIB_CHECK([$1], [$2], [$3], [dnl -- PKG_CHECK_MODULES([$1], [$4], [gd_found_lib=yes gd_require_pkg_name="$4"], [$5]) -+ PKG_CHECK_MODULES([$1], [$4], [gd_found_lib=yes], [$5]) - ]) - ]) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 509c422..49adbd6 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -142,12 +142,6 @@ if (BUILD_STATIC_LIBS) - target_link_libraries(${GD_LIB_STATIC} ${LIBGD_DEP_LIBS}) - endif() - --SET(LIBS_PRIVATES -- ${ICONV_LIBRARIES} -- ${LIQ_LIBRARIES} -- ${WEBP_LIBRARIES} --) -- - set(GD_PROGRAMS gdcmpgif) - - if (PNG_FOUND) --- -2.31.1 - From patchwork Thu Feb 22 16:10:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60891 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 F29B727BBEA; Thu, 22 Feb 2024 16:17:40 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 99CA127BBE2 for ; Thu, 22 Feb 2024 16:17:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkn-0003ZB-5R; Thu, 22 Feb 2024 11:16:57 -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 1rdBkc-0003QR-US for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:48 -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 1rdBkc-0004cp-K5 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBkz-0003V0-Gq for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 14/20] gnu: lib2geom: Update to 1.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861860413273 (code B ref 68813); Thu, 22 Feb 2024 16:17:09 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:44 +0000 Received: from localhost ([127.0.0.1]:38625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkZ-0003Rr-AX for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:44 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:55623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkF-0003PF-Ol for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:25 -0500 Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-6861538916cso11415956d6.3 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618495; x=1709223295; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DdwC8u6ZQ1hE3ywBHxykRLUKWJE9l73IOpD/fW+k+24=; b=l+fHiecSV2CWj0cHrfzbzO7UfLhlJYHFSQu+8M29XxTLrkJ0A9f55AN5dGzBk7roVa vDEuWNHwLEPZjfjYQTcypKWn6o9LWh/zFDwnZmKdPN6jxYa5xYdeF+qLVG2wLuYgCo1P r3oYBGnuGkMUCbgyobOdZCbjmTFRlIO1lLIJ0ICuWqPH2JkddbmIx1I4BZDFtMBsK4y6 Ct78R1XpveXbbPItN1jHuwn8QP4xHLCZPwA+9kygTGorrB4/BF0/lYljFgzZ1eumdIyv e0XBpnBSHb79LB8txIK1txaRHX0QHfhq0LISUxhoSCr4y1i55RJlWRg1s+IKk7ZNce2O 2kEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618495; x=1709223295; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DdwC8u6ZQ1hE3ywBHxykRLUKWJE9l73IOpD/fW+k+24=; b=hPUd5EnseA+n0IFB/CDggZ6y+O4RUHGHrN7jfLZDU6B9UY2jPpUTjUVkwLnx2YtCAn UnKSTQ4COBp9Y7W1vRwwFBes6eZmEl9WcGvxV2mVjmziHe85tBJqm5DKyBOYfj4dTJBD XTlbH5ETIWNi1EeQsKDK+x4JwZ3XKYqsXirEB5x9c12SyjHR7rWMSFS4t2YVo4dBQ1IF 3LkdU9qMdiVhD4XW2oqYgm2CxWICl92F3IgxMYSN0hKbwMThZn31LJIiNHoUk/75McL2 QFoa8Fvf7l+OMiRUWUhj7CJTBkOpDawdpdOBC1eajKx8GJ7+5uyCHR604hGZ/Fk1MAPL SLcA== X-Gm-Message-State: AOJu0Yz5s2DLi5Oi3IrqKp/lmPK8FYHLgLZbU/g1Mrj95+4gVU7KIZwr EWRZSlrmLVgz+sopxn2HFkazHN2K+D1Aj3g83NaYu0TLoPHj6VnXq5K//xbr X-Google-Smtp-Source: AGHT+IHCe3nMEiDZCobJM4M73FXWOOfYul8mczEtywnQBylXCePGN6/4Ij2GzOBivFdaxoPQIbmlJw== X-Received: by 2002:a05:6214:f08:b0:68f:67a9:a9f7 with SMTP id gw8-20020a0562140f0800b0068f67a9a9f7mr16136365qvb.33.1708618495152; Thu, 22 Feb 2024 08:14:55 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:54 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:13 -0500 Message-ID: <8e60efd2ad00fc0dc4b441eb3e8ad565a4745d53.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/graphics.scm (lib2geom): Update to 1.3. Change-Id: Icac0c5674e39709ac85880ad7b22149b8fe30806 --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 01cd55f33b..003a24d65b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -895,7 +895,7 @@ (define-public ilmbase (define-public lib2geom (package (name "lib2geom") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -904,7 +904,7 @@ (define-public lib2geom (file-name (git-file-name name version)) (sha256 (base32 - "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8")))) + "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn")))) (build-system cmake-build-system) (arguments `(#:imported-modules ((guix build python-build-system) From patchwork Thu Feb 22 16:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60894 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 4D45527BBEB; Thu, 22 Feb 2024 16:18:07 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 1A81627BBE2 for ; Thu, 22 Feb 2024 16:18:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBku-0003lX-0C; Thu, 22 Feb 2024 11:17:04 -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 1rdBkd-0003ST-Kt for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:48 -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 1rdBkd-0004d0-Bu for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBl0-0003V9-6z for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 15/20] gnu: inkscape: Truly enable ImageMagic support. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861860613286 (code B ref 68813); Thu, 22 Feb 2024 16:17:10 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:46 +0000 Received: from localhost ([127.0.0.1]:38631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBka-0003S1-It for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:46 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:56359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkH-0003PL-95 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:26 -0500 Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-6818f3cf00aso47036686d6.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618496; x=1709223296; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uqhKrfghrKFKeAPIwPqfhX5W1KOpu//vx30v+NamM0Q=; b=A3y9T7x3eWmhEtUptgnDgCtynB8zBAtePbce8OjWGStGmxMCKBvQx/DL9uu1RKjWUk k3WH4kBFf9OQik2gLDHj+lvmp/aDiZPlfJ+M0OBd9F+5Ptmcah/+RxNl6mOi9JcrtaH8 guxSV7U/E5v/UkZBak7ZqcCGNmoEmgcDDg3joERoS1+xGbse/GiOJXJw8lSMz7LuxslW i3+DZf7DAJ9kV8p8a4zhp1AmVvZh7VEggGcC1YG89PlvQfW4/Ejwv6zQc3fqOM4H0Uiy Nsxn5JNzFwH6ygu8sbzxCwhPnr9ICtcB+Y9m+h1cPha1nQgx2mQg3rql6FYoW+mnU25D F2AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618496; x=1709223296; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uqhKrfghrKFKeAPIwPqfhX5W1KOpu//vx30v+NamM0Q=; b=k3HMyHnzryG3PQ7k+qHtXPCwJtb9ZA8VPHA/T/RRtvTh065LHV1UuHdRmrA/ZmKOmj d8KsIXqhV2xdCocXr/DdZawGGtXCr9B+dSBEQ046g+R0daBgUzMZrgIDuBiTsqPWrZZw RHbzyzYMN0NvzkhidO49dKIygsYzC4KKQf2l8QjO4J1iC8hcgbWOLQ0t1Oe6amHIbXWV URDo0c1FV1igQFvsxtJ3icjcVvFdsMo5IAywSKYwXzzDoumfcal3gbRUMULCD7H0Ez0q yeD6U7PGZDWYDk2+i2E4txPCZIWBtg/zeRUZkl+X6QKRHEH1nwKhakVsE0qzdx0h7LcJ qcpg== X-Gm-Message-State: AOJu0YzPik0WJrthRuCQ+dF48RE8Ci4/8tiEACe2AiKLq8up0khY+oAr LZlYgt4KLXLd/PhN8qz+NOp37wSC6C633g1vON7GocKEYnzUqZfAL+YGuFag X-Google-Smtp-Source: AGHT+IHgdnDuOwRdvGRw1ctJKykv3aJRo/TVpCSH3+cj4YvDh/EsWobTy59HTs1xYEK8B7how8U1Yg== X-Received: by 2002:a05:6214:242f:b0:68f:74a5:ec7c with SMTP id gy15-20020a056214242f00b0068f74a5ec7cmr14529533qvb.5.1708618496689; Thu, 22 Feb 2024 08:14:56 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:56 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:14 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 This was commented out for testing and erroneously committed in commit b4a6b1ba93844d7373c58237cb0b742352dec954 ("gnu: inkscape/stable: Build stable variant without imagemagick support."). * gnu/packages/inkscape.scm (inkscape) [configure-flags]: Delete inherited "-DWITH_IMAGE_MAGICK=OFF" flag. Change-Id: I6d616a5bfc40c9ebef65aceb711c6541a523bad8 --- gnu/packages/inkscape.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index bf87ebc8a2..db871dc904 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -305,9 +305,9 @@ (define-public inkscape (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments inkscape/stable) - ;; ((#:configure-flags flags ''()) - ;; ;; Enable ImageMagick support. - ;; #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags)) + ((#:configure-flags flags ''()) + ;; Enable ImageMagick support. + #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags)) ((#:phases phases) #~(modify-phases #$phases (replace 'wrap-program From patchwork Thu Feb 22 16:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60885 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 16C5727BBE9; Thu, 22 Feb 2024 16:17:06 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 E489227BBE2 for ; Thu, 22 Feb 2024 16:17:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkh-0003Uo-61; Thu, 22 Feb 2024 11:16: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 1rdBkf-0003Tm-4T for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:49 -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 1rdBke-0004dE-5y for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBl1-0003VK-2c for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 16/20] gnu: lib2geom: Use gexps and remove input labels. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861860913302 (code B ref 68813); Thu, 22 Feb 2024 16:17:10 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:49 +0000 Received: from localhost ([127.0.0.1]:38638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkc-0003SF-C5 for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:48 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:58391) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkJ-0003PY-1m for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:28 -0500 Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-68facd7ea4bso7466876d6.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618498; x=1709223298; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jDr4k9aswOJCFpyZhxBqY+EiZezwSTzS6IdcNWkn6EI=; b=hNn2Mm44MVb9dNa64O5cBWPbT4yLwfIlJ8NRZKBPQe1DU37dbCL+OO01vdqYyy9xBF dBg+67A4LEmbtqIB6kJrHbZLZychgA4irucR3XbIhKAvGFCQueRMrFPtWWzM4jimKq2r s9mRl0pjSu27xSlXZJgEDK0NUSlfyewu+i87W6OGFlnjMpbjl20aHB89B+oudlQAptaN edlKQoCjVZqcV4F+ATI2lzPhxHJD2hCT/HXpsFi86IIxyUPfVwTwzEw2CnEZwtJ/nQKy JrFCnIatfuKCA+8+ct4aVQetJdIDJ0pfmCLV/90mzhiBjz9fmZZu99JiCK5C1Egob4Cf wVUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618498; x=1709223298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jDr4k9aswOJCFpyZhxBqY+EiZezwSTzS6IdcNWkn6EI=; b=j9XMoF42hDnDGPb+hAnV1Ok6F0QwwGHi3ejX6nfRvnFq9PWe0kTNcUw+jUw20YWfuV QUr8433qLyBOmk+0JhpOeGpRbMiBp81A20W+W0HwuSIWa0Vt8R6HEgi1YqZv3ss3CMB4 gyfLZZNbIKw8muiZ7TNKvItKnuUtXVc5VSwRAvXeN4rqrcX/EKAcnJlJhMhbIM6eO5GX Ws4UQhDH2Sut33o4mFMIq8cP3QUZsdUIb7raTRahkXgYEiEpryES31ejoedIY7qVEiBJ gDRhlbIcdnrzd+KO1NdnlEa7c4ckt/jKn91QwhLqp5Pf8L48Fzw6+igsziFgwVV/2vzi MEjw== X-Gm-Message-State: AOJu0YxMRY9/9dV3tT3hTyN3C+gIYRXuFsTXIs+5HbkedTF8b36LCxAX nYbFj6W9yN4Sega1iZ6nNhBkybBuXjL1Jop7WMXrR47u/l4nSTVnVKKW5B6z X-Google-Smtp-Source: AGHT+IFSdFIMP8tbKGxiX8VST1d8rQrcvLoozn+7OUmMQ7SNdSsiguBBLZxtz0R4y7zNgyyISMVCtg== X-Received: by 2002:a0c:f2d0:0:b0:68e:fb17:e14b with SMTP id c16-20020a0cf2d0000000b0068efb17e14bmr19237493qvm.1.1708618498372; Thu, 22 Feb 2024 08:14:58 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:58 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:15 -0500 Message-ID: <1c789f89d47494d62e828652d286adff19299e1c.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/graphics.scm (lib2geom) [arguments]: Use gexps. Add #:modules argument. [native-inputs, inputs, propagated-inputs]: Remove labels. Change-Id: Ia61ff5e8aa1f64231c98b1fb7f31a49513ede7f8 --- gnu/packages/graphics.scm | 75 +++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 42 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 003a24d65b..a565000180 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -907,49 +907,40 @@ (define-public lib2geom "1ypcn0yxk9ny7qg8s8h3px2wpimhfgkwk7x1548ky12iqmdjjmcn")))) (build-system cmake-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) + (list + #:imported-modules `((guix build python-build-system) ,@%cmake-build-system-modules) - #:configure-flags '("-D2GEOM_BUILD_SHARED=ON" - "-D2GEOM_BOOST_PYTHON=ON" - ;; Compiling the Cython bindings fail (see: - ;; https://gitlab.com/inkscape/lib2geom/issues/21). - "-D2GEOM_CYTHON_BINDINGS=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-python-lib-install-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((python-version (@ (guix build python-build-system) - python-version)) - (python-maj-min-version (python-version - (assoc-ref inputs "python"))) - (site-package (string-append - (assoc-ref outputs "out") - "/lib/python" python-maj-min-version - "/site-packages"))) - (substitute* '("src/cython/CMakeLists.txt" - "src/py2geom/CMakeLists.txt") - (("PYTHON_LIB_INSTALL \"[^\"]*\"") - (format #f "PYTHON_LIB_INSTALL ~s" site-package)))))) - ,@(if (target-x86-32?) - `((add-after 'unpack 'skip-faulty-test - (lambda _ - ;; This test fails on i686 when comparing floating point - ;; values, probably due to excess precision. However, - ;; '-fexcess-precision' is not implemented for C++ in - ;; GCC 10 so just skip it. - (substitute* "tests/CMakeLists.txt" - (("bezier-test") ""))))) - '())))) - (native-inputs `(("python" ,python-wrapper) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config))) - (inputs `(("cairo" ,cairo) - ("pycairo" ,python-pycairo) - ("double-conversion" ,double-conversion) - ("glib" ,glib) - ("gsl" ,gsl))) - (propagated-inputs - (list boost)) ;referred to in 2geom/pathvector.h. + #:modules '((guix build cmake-build-system) + (guix build utils) + ((guix build python-build-system) #:prefix python:)) + #:configure-flags + #~(list "-D2GEOM_BUILD_SHARED=ON" + "-D2GEOM_BOOST_PYTHON=ON" + ;; Compiling the Cython bindings fail (see: + ;; https://gitlab.com/inkscape/lib2geom/issues/21). + "-D2GEOM_CYTHON_BINDINGS=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-python-lib-install-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* '("src/cython/CMakeLists.txt" + "src/py2geom/CMakeLists.txt") + (("PYTHON_LIB_INSTALL \"[^\"]*\"") + (format #f "PYTHON_LIB_INSTALL ~s" + (python:site-packages inputs outputs)))))) + #$@(if (target-x86-32?) + #~((add-after 'unpack 'skip-faulty-test + (lambda _ + ;; This test fails on i686 when comparing floating point + ;; values, probably due to excess precision. However, + ;; '-fexcess-precision' is not implemented for C++ in + ;; GCC 10 so just skip it. + (substitute* "tests/CMakeLists.txt" + (("bezier-test") ""))))) + #~())))) + (native-inputs (list python-wrapper googletest pkg-config)) + (inputs (list cairo python-pycairo double-conversion glib gsl)) + (propagated-inputs (list boost)) ;included in 2geom/pathvector.h (home-page "https://gitlab.com/inkscape/lib2geom/") (synopsis "C++ 2D graphics library") (description "2geom is a C++ library of mathematics for paths, curves, From patchwork Thu Feb 22 16:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60888 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 3014B27BBE9; Thu, 22 Feb 2024 16:17:21 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 EE76B27BBE2 for ; Thu, 22 Feb 2024 16:17:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBl5-0003to-2W; Thu, 22 Feb 2024 11:17:16 -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 1rdBkf-0003To-54 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:49 -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 1rdBke-0004dH-MU for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBl1-0003VV-KV for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 17/20] gnu: inkscape: Update to 1.3.2. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861861113315 (code B ref 68813); Thu, 22 Feb 2024 16:17:11 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:51 +0000 Received: from localhost ([127.0.0.1]:38641 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBke-0003SV-RB for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:50 -0500 Received: from mail-qv1-f46.google.com ([209.85.219.46]:61450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkL-0003Pe-5C for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:30 -0500 Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-68fcb96fbc9so2115876d6.2 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618500; x=1709223300; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x8RKPHvjt6fz/4Aa43vwxPhb2dd7gfDH8LZbok0sFhs=; b=mPjuQYtFWtvMJWHPgIhXUaR9r2mWpctd8dDttavKUBzHaTP2PY5CrIF+unRL1Ctnd9 sQW/oK97o5NTHhgbWUM932DNyfPLRO99xC8w0VzeAXv6B+7qC/us1/f+rJOB3PIe2zxP LHkCkXwE5b2t8pJ4q8VYhYKA5WbeC3qJf72aAQMegI7BEQ59IM6TfiGEt35ZTg0vNiK+ xXKmzxxuDBGsQ6puwJTqZeAxJ31HvTj+ILxdiBRkAAKfCboUtDzLnilckzzM6+Pjy9Pa C8Gb99v+74Odhi8CeMKGioF3xi0aaMDAvS99DuXiwaXl64Tykim2o6Cu4ntbi3mhH27A Vmug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618500; x=1709223300; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x8RKPHvjt6fz/4Aa43vwxPhb2dd7gfDH8LZbok0sFhs=; b=t+DegTzJcJxFFj8bpCCEl84FCRPQvVXDb3ZaE8682BQHS0+6U7eHSqZpxL5bSldkHT h/LqJMR1O26JMiPPoO/hnrv9lgVxJ1LUfadCfNgYIEdKhh2HmprH4hcLofQ0fUvgDY8k DEcZmuNyZHnh3rWZOp/I6YJL3iZGhT/JbRSSuwziMJ6LSsdeI/i7x0owWUPxKII7mcov Tj/drSiAVFjb8Cnxv3d+13HEE03teChaOH+TrM/0zL8jsRsZCIWxdyzDMFK011UXn25y o/Prn5ml6Giw2/wkpL+vIQZ5d6RO+k6Ep0R+m/l1m0Xpmp0jEp5jXpjhSVmGQdApDzQW kLIA== X-Gm-Message-State: AOJu0YzVk2TPGCiaA7RPzCayrtL7hlaYDaeJVve+x3N29TXMGngFGHr6 Ks2W4rFGuBNYP5xToB8yFHbtoJLxpqUvJGbwXzmJMBoApSEbeMT9hxFPI9m7 X-Google-Smtp-Source: AGHT+IG8K99oaaI427S+LoEdQsZdbUS6qN7V/WSSdX+w/eQy7n3hcjd2vlq6dCwafLpDBUOXDfAbgg== X-Received: by 2002:a05:6214:2b94:b0:68f:2e7f:1d24 with SMTP id kr20-20020a0562142b9400b0068f2e7f1d24mr29369498qvb.60.1708618500128; Thu, 22 Feb 2024 08:15:00 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:59 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:16 -0500 Message-ID: <62f3e2a9e18e12ddeca121cc7c1c29cca2609624.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/inkscape.scm (inkscape/stable): Update to 1.3.2. Remove patches. [configure-flags]: Add CMAKE_CXX_FLAGS flag. [phases] Remove obsolete patch-icon-cache-generator, disable-latex-export-tests and disable-vertical-glyph-tests phases. Add disable-problematic-tests phase. Override check phase to disable a few test failures caused by the lack of imagemagick. [inputs]: Add gspell and readline. Remove aspell and gtkspell3. (inkscape): Update to 1.3.2. [phases]: Reset the check phase to the original. * gnu/packages/patches/inkscape-poppler-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. Change-Id: I391fb42db8d93a9cdc83e6fd62ca90f7458b5c49 --- gnu/local.mk | 1 - gnu/packages/inkscape.scm | 94 +++++++++++-------- .../patches/inkscape-poppler-compat.patch | 45 --------- 3 files changed, 55 insertions(+), 85 deletions(-) delete mode 100644 gnu/packages/patches/inkscape-poppler-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 94b4620c02..28dd075f37 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1475,7 +1475,6 @@ dist_patch_DATA = \ %D%/packages/patches/idris-test-ffi008.patch \ %D%/packages/patches/igraph-fix-varargs-integer-size.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ - %D%/packages/patches/inkscape-poppler-compat.patch \ %D%/packages/patches/instead-use-games-path.patch \ %D%/packages/patches/intltool-perl-compatibility.patch \ %D%/packages/patches/irrlicht-use-system-libs.patch \ diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index db871dc904..1e674add9e 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -32,7 +32,7 @@ (define-module (gnu packages inkscape) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (gnu packages) - #:use-module (gnu packages aspell) + #:use-module (gnu packages algebra) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) @@ -51,6 +51,7 @@ (define-module (gnu packages inkscape) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages readline) #:use-module (gnu packages xml) #:use-module (gnu packages ghostscript) #:use-module (gnu packages fontutils) @@ -65,16 +66,15 @@ (define-public inkscape/stable (hidden-package (package (name "inkscape") - (version "1.2.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append "https://media.inkscape.org/dl/" "resources/file/" "inkscape-" version ".tar.xz")) - (patches (search-patches "inkscape-poppler-compat.patch")) (sha256 - (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")) + (base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv")) (modules '((guix build utils) (ice-9 format))) (snippet @@ -168,38 +168,18 @@ (define-public inkscape/stable (guix build utils)) ;; Disable imagemagick support in the stable variant, to reduce the ;; number of dependents of the 'imagemagick' package. - #:configure-flags #~(list "-DWITH_IMAGE_MAGICK=OFF") + #:configure-flags + #~(list "-DWITH_IMAGE_MAGICK=OFF" + ;; TODO: Remove after next release, since the problematic + ;; libsoup/soup.h include is no longer used. + (string-append "-DCMAKE_CXX_FLAGS=-I" + (search-input-directory %build-inputs + "/include/libsoup-2.4"))) #:phases #~(modify-phases %standard-phases (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 'patch-icon-cache-generator - (lambda _ - (substitute* "share/icons/application/CMakeLists.txt" - (("gtk-update-icon-cache") "true")))) - (add-after 'unpack 'disable-latex-export-tests - ;; FIXME: For some reason the test.pdf_tex file generated by the - ;; "--export-latex" lacks "some text" in its content when run in - ;; the build environment. Skip the related tests. - (lambda _ - (substitute* "testfiles/cli_tests/CMakeLists.txt" - (("add_cli_test\\(export-latex") - "message(TEST_DISABLED: export-latex")))) - (add-after 'unpack 'disable-vertical-glyph-tests - (lambda _ - ;; FIXME: These tests fail with newer Pango and Harfbuzz: - ;; https://gitlab.com/inkscape/inkscape/-/issues/2917 - ;; https://gitlab.com/inkscape/inkscape/-/issues/3554 - ;; Simply providing older versions don't work, as we need - ;; the full GTK stack; we could use package-input-rewriting - ;; but then have to also downgrade pangomm and disable tests - ;; in librsvg and GTK+. Just ignore for now. - (substitute* "testfiles/rendering_tests/CMakeLists.txt" - (("test-glyph-y-pos") "") - (("text-glyphs-combining") "") - (("text-glyphs-vertical") "") - (("test-rtl-vertical") "")))) #$@(if (or (target-aarch64?) (target-ppc64le?) (target-riscv64?)) @@ -227,7 +207,38 @@ (define-public inkscape/stable ;; as the "share/inkscape/ui/units.xml" file. (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check)) + ;; Use ctest directly so that we can easily exclude problematic + ;; tests. + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + ;; The following tests fails, perhaps due to building without + ;; ImageMagick (see: + ;; https://gitlab.com/inkscape/inbox/-/issues/10005). + (let ((job-count (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (skipped-tests + (list "cli_export-type-caseinsensitive_check_output" + "cli_export-type_xaml_check_output" + "cli_export-height_export-use-hints_check_output" + "cli_export-plain-svg_check_output" + "cli_export-use-hints_export-id_check_output" + "cli_export-extension_svg_check_output" + "cli_export-extension_ps_check_output" + "cli_export-extension_eps_check_output" + "cli_export-extension_pdf_check_output" + "cli_export-plain-extension-svg_check_output" + ;; These fail non-deterministically (see: + ;; https://gitlab.com/inkscape/inbox/-/issues/10005). + "cli_export-ps-level_3_check_output" + "cli_export-ps-level_3_content_check_output" + "cli_export-ps-level_2_content_check_output" + "cli_export-ps-level_2_check_output"))) + (invoke "make" "-j" job-count "tests") + (invoke "ctest" "-j" job-count + "--output-on-error" + "-E" (string-append + "(" (string-join skipped-tests "|") ")")))))) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap @@ -243,14 +254,13 @@ (define-public inkscape/stable `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) (inputs - (list aspell - autotrace + (list autotrace bash-minimal gdl-minimal gtkmm-3 gtk+ - gtkspell3 gsl + gspell poppler lib2geom libjpeg-turbo @@ -273,9 +283,11 @@ (define-public inkscape/stable python-scour python-pyserial python-numpy - python-lxml)) + python-lxml + readline)) (native-inputs - (list gettext-minimal + (list bc + gettext-minimal imagemagick/stable ;for tests `(,glib "bin") googletest @@ -292,7 +304,7 @@ (define-public inkscape (package (inherit inkscape/stable) (name "inkscape") - (version "1.2.1") + (version "1.3.2") (source (origin (inherit (package-source inkscape/stable)) @@ -301,7 +313,7 @@ (define-public inkscape "resources/file/" "inkscape-" version ".tar.xz")) (sha256 - (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) + (base32 "0sq81smxwypgnp7r3wgza8w25dsz9qa8ga79sc85xzj3qi6q9lfv")))) (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments inkscape/stable) @@ -310,6 +322,10 @@ (define-public inkscape #~(delete "-DWITH_IMAGE_MAGICK=OFF" #$flags)) ((#:phases phases) #~(modify-phases #$phases + (replace 'check + ;; Re-instate the tests disabled in inskcape/stable, now that + ;; their ImageMagick requirement is satisfied. + (assoc-ref %standard-phases 'check)) (replace 'wrap-program ;; Ensure Python is available at runtime. (lambda _ diff --git a/gnu/packages/patches/inkscape-poppler-compat.patch b/gnu/packages/patches/inkscape-poppler-compat.patch deleted file mode 100644 index cb7d1c8eb3..0000000000 --- a/gnu/packages/patches/inkscape-poppler-compat.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix build with Poppler 22.9.0. - -Taken from upstream: - - https://gitlab.com/inkscape/inkscape/-/commit/fb00794923d19cfbb2ca4adca3ae8971553a06be - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index cca1e840966c7940a1af472025535042b07e3e0f..80d64c9b866d5d3dd095636a9a02571b89061af1 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) - _POPPLER_FREE(obj); - } - } -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ state->setLineDash(std::vector (dash, dash + length), args[1].getNum()); -+#else - state->setLineDash(dash, length, args[1].getNum()); -+#endif - builder->updateStyle(state); - } - -diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp -index 12f71dd9214b95dbad6fdf7642a96cdd57f2c64a..9fc56fe63c2feee986ad1ff5018e679a0bacb665 100644 ---- a/src/extension/internal/pdfinput/svg-builder.cpp -+++ b/src/extension/internal/pdfinput/svg-builder.cpp -@@ -389,10 +389,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) { - sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str()); - - // Line dash -- double *dash_pattern; - int dash_length; - double dash_start; -+#if POPPLER_CHECK_VERSION(22, 9, 0) -+ const double *dash_pattern; -+ const std::vector &dash = state->getLineDash(&dash_start); -+ dash_pattern = dash.data(); -+ dash_length = dash.size(); -+#else -+ double *dash_pattern; - state->getLineDash(&dash_pattern, &dash_length, &dash_start); -+#endif - if ( dash_length > 0 ) { - Inkscape::CSSOStringStream os_array; - for ( int i = 0 ; i < dash_length ; i++ ) { From patchwork Thu Feb 22 16:10:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60903 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 C1A8D27BBEA; Thu, 22 Feb 2024 16:46:52 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C6A8A27BBE2 for ; Thu, 22 Feb 2024 16:46:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdCDa-0003w2-Mc; Thu, 22 Feb 2024 11:46:42 -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 1rdCDX-0003ji-SL for guix-patches@gnu.org; Thu, 22 Feb 2024 11:46:40 -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 1rdCDX-00033J-Hi for guix-patches@gnu.org; Thu, 22 Feb 2024 11:46:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdCDu-0007mU-FP for guix-patches@gnu.org; Thu, 22 Feb 2024 11:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 18/20] gnu: inkscape: Sort inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170862041029873 (code B ref 68813); Thu, 22 Feb 2024 16:47:02 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:46:50 +0000 Received: from localhost ([127.0.0.1]:40636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdCDh-0007lh-IA for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:46:50 -0500 Received: from mail-pj1-f42.google.com ([209.85.216.42]:50179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdCDc-0007lC-Rz for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:46:46 -0500 Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-29938dcb711so2789a91.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:46:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708620316; x=1709225116; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ut/7ttlnbQuObcHXzutqQN57oBMUTbBDyymzLVPa+yU=; b=ZSqdlvRjfiMZq8HCJKjGbTGvt3gwQukZjGHn1UiVYkVMYEeRuUirJhT0MRxz+JWRLS vAVEDtjot/zzpj9RRNLfxOsY88g65cfRYjP0KCuAiKBnZTzJaVSToPB1w9LNheKqJSgN iiQu+y/xGa5lT9yVgY67fafG0Bb3yxeBbycq8P8hvRxp3roZl3kFo6t7481i3ljC2/14 7yLea2aMgTL+vfQhNoO2Kqj3Q3nXkJqpNuX5gCGAGpUpNFhi07FUFXx8YDbLYJ2Fp2kC tjlH08ol/y33hTkgEGfw6jChLf8Wr3L8R6ZXv7fK7pUNRWclDERxUuSeXRu9LDBVGNcP z7eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708620316; x=1709225116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ut/7ttlnbQuObcHXzutqQN57oBMUTbBDyymzLVPa+yU=; b=tUkULenRkS4QOGm5EsNDtZ8GlcMxPFUOkYtkuU1yZFUF+5RSlI/gZFDJuVsWLyelmd CteNN72WosrJicxm/asUCu9/Py6dQ7gOi8EshXxVi1Jj3TiscRBj+j7eJSbW/mdtDSJb G28xsyyVpRp8T0A+nbcDcMaz1XMBqZsH2kYpX0uf5AaSM31dNUsPgmLq4zudsbP4a1dp YVQUN3cJYM5CdgnmObwNWfkhq8pvVPKn7vpZrJvh1K0CXKC8lnOpfO45O80MO7olTpYf FNDQedi2qlBJyssGJ+d9EM2LR/k3S0lIfRN52noHvM0A9qAmBJ85AK7TAcikw3tUC6uO 985g== X-Gm-Message-State: AOJu0Yx5aUaRJow83eU2qZQbQJtztJ5vfNtbTI/d4qH7rLy7JHzb8kGM Y5lnDIoMRJWBmSn2SkPBLRznoqghPO8spkRF5Li9R8+wS+xkK1JAUxhRyeKg X-Google-Smtp-Source: AGHT+IEtcdMBx9+XmgiP1iWSwLKMHhNkT1k3ychwg7IoAYhuLEoDf0OWvyAEn6nCT2zHGXH92Twhaw== X-Received: by 2002:a0c:b549:0:b0:68f:b7f6:c8f2 with SMTP id w9-20020a0cb549000000b0068fb7f6c8f2mr2285954qvd.0.1708618501998; Thu, 22 Feb 2024 08:15:01 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:15:01 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:17 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/inkscape.scm (inkscape/stable) [inputs]: Sort. [native-inputs]: Likewise. Change-Id: I64253e52bf157013e6c55361f7633cbd01dcb020 --- gnu/packages/inkscape.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 1e674add9e..5449bf8d92 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -254,43 +254,43 @@ (define-public inkscape/stable `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) (inputs - (list autotrace + (list (librsvg-for-system) ;for the pixbuf loader + autotrace bash-minimal + boost + freetype gdl-minimal - gtkmm-3 - gtk+ gsl gspell - poppler + gtk+ + gtkmm-3 + lcms lib2geom + libcdr + libgc libjpeg-turbo libpng - libxml2 - libxslt - libgc - (librsvg-for-system) ;for the pixbuf loader libsoup-minimal-2 - libcdr libvisio libwpd libwpg - freetype + libxml2 + libxslt + poppler popt potrace - lcms - boost - python-wrapper - python-scour - python-pyserial - python-numpy python-lxml + python-numpy + python-pyserial + python-scour + python-wrapper readline)) (native-inputs - (list bc + (list `(,glib "bin") + bc gettext-minimal - imagemagick/stable ;for tests - `(,glib "bin") googletest + imagemagick/stable ;for tests perl pkg-config)) (home-page "https://inkscape.org/") From patchwork Thu Feb 22 16:10:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60893 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 5CD6927BBEA; Thu, 22 Feb 2024 16:18:05 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 03F1F27BBE2 for ; Thu, 22 Feb 2024 16:18:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkt-0003lS-Rf; Thu, 22 Feb 2024 11:17:03 -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 1rdBkg-0003Ul-9j for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:50 -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 1rdBkf-0004dd-Cn for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBl2-0003Vh-4d for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 19/20] gnu: inkscape: Fix Python support. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861861213323 (code B ref 68813); Thu, 22 Feb 2024 16:17:12 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:52 +0000 Received: from localhost ([127.0.0.1]:38644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkg-0003Si-Qu for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:51 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:54316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBkO-0003Qa-5x for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:32 -0500 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-42db60ebcd7so12056071cf.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:16:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618503; x=1709223303; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0UC/aDD0rQtBx60znlCczrt84/ofATGjG+lfaPVCsK4=; b=fG7lL1J4rDPlIgFiKCFYi3rSwpBb8jcRKV/+SbqcAiFrtIZzmdeFxUVv+5LaiSqVjD N9gFG6cocP5sscAQIgolLH3LFZ8i6Pfjn3MDuy8rcVft4LDliTEjfrR1tO39D6jf0x0I 0ePWuJ6YKEbmAq8k69ovPxgU+uVfI1sZxFBA/3V10Gvjsi3No2UfkS/6xHMjzPVDR3Da oQZJQtwHOYCjnVePkd9Z5O6kgA52t8Pv8mAJdjlYmbLBXW57PtGTKHjQ6fMwtuYlLRv5 E8zrwHa7kBxIONajMHm2qRBn3Yfz+veVC7/GTGsiBmOHLq10CBUOg6DHKBxownSfyw7y aDZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618503; x=1709223303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0UC/aDD0rQtBx60znlCczrt84/ofATGjG+lfaPVCsK4=; b=nxopdKzttLEEp/3IMVPfGPSpQUTWTqktWNE24EIix+4P4c6r+RADaKTCaD8YHzG/IM CoKjaiHCrP+3v5E2A5QFzHTDZyRgM+RoPs6+tJ8ZJZ4w14iguB9QJuLCKLjtpaMSrHKP BCyue3E4ZIaThTHjY+W4dWXOhj+9+Cd/k3upiZlZK2RT0M/pVPfCuYUaL1xtOuGe8LlB 3Mut9ww9nO1sPLztuHSTxjPBnPVmFPRDHf5t3l8Rg8G+syxwc2w3qUhSsiAEQ7WQwgaq vWAZLnsNd63yINTXoP3cgteCwizbO4S+4K/aXQ27/PAlASeukM5vinsvIWLPES6UPxor gk9A== X-Gm-Message-State: AOJu0YyHGz5lVZr06P9GCgRAFHw2wH2e7jYuFB2kZSIzGbLFwgtVlICq Jk/zBYsZS2ZD3X/kTZCxJuJXw3LaFiydKXnm2//zqnaXOfJ0VaUsHAasgRfH X-Google-Smtp-Source: AGHT+IHyPD1g2KLSUOtgmb6Lu5BaQjHZQho+yP7RtoMpkyrbrxicB3VMzSCybhWqdzSJU2YavqHZ9A== X-Received: by 2002:a0c:cd08:0:b0:68f:2beb:889 with SMTP id b8-20020a0ccd08000000b0068f2beb0889mr18055727qvm.12.1708618503461; Thu, 22 Feb 2024 08:15:03 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:15:03 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:18 -0500 Message-ID: <1d93033bebd313b0962552127b226a246e5b2149.1708618218.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/inkscape.scm (inkscape/stable) [phases]: Wrap with PATH and GI_TYPELIB_PATH. [inputs]: Sort inputs. Add python-appdirs, python-cssselect, python-pygobject and python-requests. (inkscape) [inputs]: Do not append python-cssselect. Fixes: https://issues.guix.gnu.org/63938 Change-Id: I90a39a04a35dbcafe413726107d100c78d173fd0 --- gnu/packages/inkscape.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 5449bf8d92..aa33a0a4a3 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -245,14 +245,19 @@ (define-public inkscape/stable (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) (add-after 'install 'wrap-program ;; Ensure Python is available at runtime. - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (wrap-program (string-append #$output "/bin/inkscape") + `("PATH" prefix + (,(dirname (search-input-file inputs "bin/python")))) `("GUIX_PYTHONPATH" prefix (,(getenv "GUIX_PYTHONPATH"))) ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load ;; its own icons in pure environments. `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) + (,(getenv "GDK_PIXBUF_MODULE_FILE"))) + ;; Ensure GObject Introspection typelibs are found. + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list (librsvg-for-system) ;for the pixbuf loader autotrace @@ -279,9 +284,16 @@ (define-public inkscape/stable poppler popt potrace + ;; These Python dependencies are used by the Inkscape extension + ;; management system. To verify that it is working, visit the + ;; Extensions -> Manage Extensions... menu. + python-appdirs + python-cssselect python-lxml python-numpy + python-pygobject python-pyserial + python-requests python-scour python-wrapper readline)) @@ -337,8 +349,7 @@ (define-public inkscape `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs (modify-inputs (package-inputs inkscape/stable) - (append imagemagick ;for libMagickCore and libMagickWand - python-cssselect))) ;to render qrcode + (append imagemagick))) ;for libMagickCore and libMagickWand (native-inputs (modify-inputs (package-native-inputs inkscape/stable) ;; Only use 1 imagemagick across the package build. From patchwork Thu Feb 22 16:10:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60899 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 0CF7A27BBEA; Thu, 22 Feb 2024 16:24:51 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 71BC727BBE2 for ; Thu, 22 Feb 2024 16:24:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBsI-0000oX-Pr; Thu, 22 Feb 2024 11:24:42 -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 1rdBsG-0000nc-Sx for guix-patches@gnu.org; Thu, 22 Feb 2024 11:24:40 -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 1rdBsG-0006hH-JU for guix-patches@gnu.org; Thu, 22 Feb 2024 11:24:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBsb-0003xl-VV for guix-patches@gnu.org; Thu, 22 Feb 2024 11:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 20/20] Revert "gnu: mpv: Propagate most libraries." Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861907015131 (code B ref 68813); Thu, 22 Feb 2024 16:25:01 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:24:30 +0000 Received: from localhost ([127.0.0.1]:39238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBs5-0003vz-FV for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:24:29 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:59480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBs2-0003vY-N3 for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:24:27 -0500 Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1dc49afb495so8287195ad.2 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618978; x=1709223778; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jKv6IGT27RxVQp0/CDcpsaOb4Z2A3bPzBAUYjQUw4uE=; b=XHCa886LxCb/qHt5GpH0mx8eIk23kXGJZ89Dtb0ZJbGqM/khMJscDFYdc+EJf0j4Bi YWKkoxfORpuZs0JZGOR+lMcpa/aLwYbTmVnHZYtltIUio8tnNVgyndN8KVwKEKNTH8Mh zANmdvqGtkxG/JUoIM932vOWOCnS2WcYJyR2YeHCbAuSGl0eqoGhUa+FQ47seN6Utptm geCni6dnqywKzzLgS5We5Ciw/hM8QnoCfMzemqQRlA4vbKV/WNLojHiLlSfpfk34GlYk ZDHePr/pbNkfNWSOsRYQJ79yhAUcyyOCYdemVeKXg5w7tY/Q6WSiNYRQ1e5STK0rArPa 1Fbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618978; x=1709223778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jKv6IGT27RxVQp0/CDcpsaOb4Z2A3bPzBAUYjQUw4uE=; b=IpmN3J/5NtACxrMoo8vJSqTWL6qxq9+MPudE+aW3+YDfe3NwN4AW2sqWUk2s5rXwfZ pk/M1qQI0lqjWlbLi7FzfrtLcwjHODaoPdS5ZYnHEv2qPtUEm+rTB7MdWBrEdJ7M7b6N fM77Tp5wO+UM0a1t/CLm9CrguJBZuhTWbVWcZtE+LogL3CWICQ+XF13LrgP5UDOR6VnQ I5P4LZXm3BbsTm0nUb5DF/c2Tut7t4PHivkLoS4pizf01bXUhAAmSLqBFq2dMt9EEYKO Ilr21lVJftGCG73lUhmMxBxvwgMtNwvyVLU341NmVwMeocZjkEvNLKgzTsKsFW2eU2mw O23w== X-Gm-Message-State: AOJu0YyrlornRcKbelhlUS7k2qLuais14z+HBFN2nd0+IwCKQOfqVfw0 Z3T2JmP6+qW1KLwB/N1wpLZH3xl7npr0dhILieZb5iOt4KaBfOvTcYXstorV X-Google-Smtp-Source: AGHT+IGaBSgRehI5GBGqYMwL4daB/XgI8iIu6w8UYOGli+XfsF4iRqiFNHlh0lo/wtRN9Djgd+Egmg== X-Received: by 2002:a05:6808:13c9:b0:3c1:54ac:ab80 with SMTP id d9-20020a05680813c900b003c154acab80mr15049792oiw.47.1708618504950; Thu, 22 Feb 2024 08:15:04 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.15.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:15:04 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:19 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 This reverts commit f3fdb4e041cb5740ba0b38b9ad017571f8414d33. This is made possible by having replaced pkg-config with pkgconf, which more strictly interprets the private fields as purely for static compilation. Change-Id: I1c06623a4501bbcddfb80aa3cfd79a08409a08ae --- gnu/packages/video.scm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c70646eccd..0746413ed8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2641,43 +2641,31 @@ (define-public mpv "-Ddvdnav=enabled" "-Dbuild-date=false"))) (native-inputs - (list perl ;for zsh completion file - pkg-config - python-docutils - python-wrapper)) + (list perl ; for zsh completion file + pkg-config python-docutils python-wrapper)) ;; Missing features: libguess, V4L2. (inputs - (list enca - ladspa - lcms - libbs2b - mpg123 - rsound - vulkan-headers - vulkan-loader - yt-dlp)) - ;; XXX: These are propagated for the mpv pkg-config package, as they are - ;; listed in Requires.private and would break 'pkg-config --exists mpv' if - ;; unavailable. - (propagated-inputs (list alsa-lib + enca ffmpeg jack-1 + ladspa + lcms libass libbluray libcaca + libbs2b libcdio-paranoia - libdrm - libdvdnav libdvdread + libdvdnav libjpeg-turbo libplacebo libva libvdpau libx11 libxext - libxinerama libxkbcommon + libxinerama libxpresent libxrandr libxscrnsaver @@ -2685,10 +2673,15 @@ (define-public mpv ;; XXX: lua > 5.2 is not currently supported; see meson.build lua-5.2 mesa + mpg123 pulseaudio + rsound shaderc + vulkan-headers + vulkan-loader wayland wayland-protocols + yt-dlp zimg zlib)) (home-page "https://mpv.io/")