From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.163530745114096 (code B ref -1); Wed, 27 Oct 2021 04:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2021 04:04:11 +0000 Received: from localhost ([127.0.0.1]:48064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaAd-0003fG-AV for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:04:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:58290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaAY-0003f4-HS for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:04:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfaAY-0007aH-CB for guix-patches@gnu.org; Wed, 27 Oct 2021 00:04:06 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:42938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfaAW-0007ZA-OD for guix-patches@gnu.org; Wed, 27 Oct 2021 00:04:06 -0400 Received: by mail-qv1-xf33.google.com with SMTP id jk5so952038qvb.9 for ; Tue, 26 Oct 2021 21:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=vpsA89t/xvnngQoCMsvTj1AMqDTOxAw6g1DgHidtDiQ=; b=d+W1paRtdWHIZ3M/+atu6VZ+dg/zbgx1BjUfnizTOv3pGVB02pK0fTrNcoGsyvM9pJ 87eZBl5PTvxqdxc54FQyuGKJu78ZpC8tExh51K/xP/kyX5YNsxkUezxF20q/+jl+/T4v cvQBrD4XrQhHsMzrc7ZimwZcLdl6P0nbg7V4NHVEvETodSoOQ8tELsNpr1Ja4+UwGYJd KCfA13LT1/Vmbj9KvnuSFi4Islqwpg/rAgJKpHu+sJ+nP9gtxvaruTMLMXElKNGo54dt bhAh9phY9ubY1V/Xo59bLRHUmmzmfTQk2fb+aB38xdZhijbEr4wWNDZNX70+pb08nbGg GV7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=vpsA89t/xvnngQoCMsvTj1AMqDTOxAw6g1DgHidtDiQ=; b=QBarBy+KcYRFf/buOaIV0AIvVxQLnT9JzOdVV3cQwtSUYb2wdrpV5f6LAUjBSYQe4a wGQHD8yyxT5s5J1I+g742qAiFR+FLX0X5VFEHPAxmTdSczsiyto8SeD5o4ERRstbfDC8 b+aLDxVWtHkiZsXr7hmSkmOmNVNBex9ZZkCEMoZi58j1to7hunx+b4xTp6cr/4DeD5/f /N8QsHGpPEVHbVS9yQYIFNh8W0EiRGACPG/qz1iBA/xkn3PqensT3bMQaPlsAg6IC44w lkifLxmPASZ5PIV/THQk252Yvb+CgChcqDOVE7WFT2EMShpY1pHe3OJzJ145CwVHCzHQ F7Mg== X-Gm-Message-State: AOAM532JoZZfuVQuAWYTDeXx/F28HRjwUp1WopH+p4uJYLKXbGlzwnDI 1xHNdJlPjmbp7KIKpZ/Y+MYZOgS2vHk= X-Google-Smtp-Source: ABdhPJzJpK7kBdZmNk+S6ogmz7lYlQHjUgnK/w1jXbxRXLD6qGB/r5/3yJtVZS5a6EjfFDQHYI5JDA== X-Received: by 2002:a05:6214:1250:: with SMTP id q16mr7333904qvv.52.1635307443117; Tue, 26 Oct 2021 21:04:03 -0700 (PDT) Received: from hurd (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id w11sm13169697qta.50.2021.10.26.21.04.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:04:02 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:04:01 -0400 Message-ID: <87v91jcdvy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, I've experimented quite a bit with core-updates-frozen-batched-changes in the last weeks, and it seems to be in a decent shape, good enough to merge into core-updates-frozen, I think. I'd like to bring attention to some non-trivial changes that I included in the branch: 1. merging of the staging branch -- quite a few conflicts had to be resolved. 2. Replacement of inkscape@0.92 by inkscape@1.1, which required solving some dependency cycles. 3. Fix for https://issues.guix.gnu.org/50957 via a new search path specification on gdk-pixbuf and accompanying build phase and profile hook. I'll send the corresponding patches for review, which can also be consulted directly on the core-updates-frozen-batched-changes branch, which I've manually built on Berlin for things such as Rust and ungoogled-chromium. I'd like to merge it into core-updates-frozen by the beginning of November, unless there are problems you can spot :-). Thank you, Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 01/13] build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase. References: <87v91jcdvy.fsf@gmail.com> In-Reply-To: <87v91jcdvy.fsf@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531038319407 (code B ref 51428); Wed, 27 Oct 2021 04:54:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:03 +0000 Received: from localhost ([127.0.0.1]:48099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfavv-00052v-BH for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:03 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:37873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfavt-00052R-PH for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:02 -0400 Received: by mail-qv1-f50.google.com with SMTP id h11so976885qvk.4 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vC/g/xLr1mTfYLCLdAy6IbbiRpzaiWbeYpv4fWgwurU=; b=KOf+4RJ4bs4NLOmlPLDs5laY638Yzu3fwByRbLMcy0RW07wcNYzQxIJQiz55tu0zRE 210+Vs55qfr/EuUEPGqLBrvh7mTP0Sp9PHvgeCn0PTKNPgZ7o/4yMkCBpHgZrnU5JqXX Zg1qV4HWNkvzBqnRNhfA17CenOG34qoN4n0M3IGhwQabzrr8frWnKs9CGXw6q3SD01Rn 6p/B6Y78DDv/3xVxA3ozN8KhFM7HxyYa0ArEffMmVkS9R42oXYeOj3AejIEpqc9zQVQ7 MKF34/9oLe/VAQvVAyKXijUj6/i5/Pmnc3dxv48uot8dGxJQ/pItxD1f6Jg4HqieoHvO 7PZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vC/g/xLr1mTfYLCLdAy6IbbiRpzaiWbeYpv4fWgwurU=; b=JVs1McoPVzSWNgYkpgATnKJCTuNS3gLJ7a4yMTAS1cbV0BJqB5I/EfKAU7f+uxjNfw opK484UHpLarhzikJnouQB7mGgw9ZLtdtl0hM27BanylV7fwHKE+ir6+VcetA/frfpr8 05kMGI4EwQ8CLuGeRvVnGURHYIYLuC7TcQJuQMqHXBq3YMDsOBD7+jTPapiddbDt9SVi e/V+LTt0wQ04RMgVaORybV+P35NDrVNz/yXyBQFqCHT+PE+PIOeqgy3fMHw5ABzQxSIF XSbXUL2zWOiOAg3bEd8ceg8BYCYCEKxjzLQQwiKAaJFwoxpO4c6pFcHVH/qk07Ao/vEf gzRQ== X-Gm-Message-State: AOAM532Q1gwkEEOXgogIXaGIXwQvRoD8S5S/jenrBxJCOqyeOYTaCCEr HEwdOlix2/qlYRqyFZ+caNmjZfhAxlA= X-Google-Smtp-Source: ABdhPJyEFbHrzRdQ3FEBdrZRg+mjc8dGdTUPpl1qABYvsJg0mLVrm5d2Ql363GnnEdEeqlIk8lfNFg== X-Received: by 2002:a05:6214:21ac:: with SMTP id t12mr27386393qvc.18.1635310375849; Tue, 26 Oct 2021 21:52:55 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:52:55 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:32 -0400 Message-Id: <20211027045151.9889-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build/glib-or-gtk-build-system.scm (wrap-all-programs) : Precisely build the list of variable specifications, rather than relying on a bunch of conditionals. --- guix/build/glib-or-gtk-build-system.scm | 59 ++++++------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index 9f4cc09eeb..655f20cd12 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -169,52 +169,19 @@ (define handle-output (alist-cons output directory inputs))) (gio-mod-dirs (gio-module-directories (alist-cons output directory inputs))) - (data-env-var - (if (not (null? datadirs)) - `("XDG_DATA_DIRS" ":" prefix ,datadirs) - #f)) - (gtk-mod-env-var - (if (not (null? gtk-mod-dirs)) - `("GTK_PATH" ":" prefix ,gtk-mod-dirs) - #f)) - (gio-mod-env-var - (if (not (null? gio-mod-dirs)) - `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-dirs) - #f))) - (cond - ((and data-env-var gtk-mod-env-var gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var - gtk-mod-env-var - gio-mod-env-var) - bin-list)) - ((and data-env-var gtk-mod-env-var (not gio-mod-env-var)) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var - gtk-mod-env-var) - bin-list)) - ((and data-env-var (not gtk-mod-env-var) gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var - gio-mod-env-var) - bin-list)) - ((and (not data-env-var) gtk-mod-env-var gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - gio-mod-env-var - gtk-mod-env-var) - bin-list)) - ((and data-env-var (not gtk-mod-env-var) (not gio-mod-env-var)) - (for-each (cut wrap-program <> #:sh (sh) - data-env-var) - bin-list)) - ((and (not data-env-var) gtk-mod-env-var (not gio-mod-env-var)) - (for-each (cut wrap-program <> #:sh (sh) - gtk-mod-env-var) - bin-list)) - ((and (not data-env-var) (not gtk-mod-env-var) gio-mod-env-var) - (for-each (cut wrap-program <> #:sh (sh) - gio-mod-env-var) - bin-list)))))))) + (env-vars `(,@(if (not (null? datadirs)) + (list `("XDG_DATA_DIRS" ":" prefix ,datadirs)) + '()) + ,@(if (not (null? gtk-mod-dirs)) + (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs)) + '()) + ,@(if (not (null? gio-mod-dirs)) + (list `("GIO_EXTRA_MODULES" ":" + prefix ,gio-mod-dirs)) + '())))) + (for-each (lambda (program) + (apply wrap-program program #:sh (sh) env-vars)) + bin-list)))))) (for-each handle-output outputs) #t) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 02/13] build: glib-or-gtk-build-system: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039019447 (code B ref 51428); Wed, 27 Oct 2021 04:54:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:10 +0000 Received: from localhost ([127.0.0.1]:48104 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw1-00053U-LE for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:10 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:34723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfavz-00052u-Tb for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:08 -0400 Received: by mail-qt1-f172.google.com with SMTP id v17so1415518qtp.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kxTm2BuRUJT1AxbkTFJu84CZf7FvLInIyrARucv90wE=; b=GIc0cTJfHT4tRsFBEw9a6lUVmF7HotbDkjJE0ykY3dqRRJqKAYCHOxZV7QMyrYYeAn 2+bK9korHHd1rxx63jYTqXK9CpL6MCd07UF/1I9lQo8TVJ82XqX0//mJgpzdHa2lJbXV 5kMZbjn9Ah4rQqkwNY4YY6cTeTY4BsqXeNTbjaoF4r0DNertqioNkE845R9e2rZJ2GMb HjjcsOOu5TYTMCSXHAEhIO59F0ysjuRA/xpzB6vcMqhnZ5epv9QPBRmMTunTs1UDEEnm 35HVsaXcPdycOeouqnRT8k2p7dlnceS68pgV1XIYzKFZ66ZDLFp4v3r7umNoG2/DI+aU IfcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kxTm2BuRUJT1AxbkTFJu84CZf7FvLInIyrARucv90wE=; b=DlUr10dgQWScI4LxZ5YqsZDY5XhE5tIjkJwjg6wkYURPyEFdyLEqzP89RWB9FNsUk6 92VsEEWlPLy/rHeAyCgTFcHphDo6xcG+y/qwSr//nA6iVeLz3xgHZjVmwS8N5K6eJxlh rg1r3c4yJWzGqmaX2Z4VuEsi/RCNjrZeocqGeC1mzVpAqHCfDViukdiq0d+lKcyPydF8 OjjiNqTEAxwuczTTBfm5b0J6Dsdk7fqN+8oqqL4dQ+qxB/179fsi3ASlCpPP4kU8SzPG aS4fASEG53BMsGoXMknKvyFzOknrJ3DqzqOZs72Gm1+r+l2TCYs/BXMNqENso4CXtRy5 m/cw== X-Gm-Message-State: AOAM5323rP8RUzABS6NdsuVHXu7I44izltTarSnO5u5rdtwyPAQxWeFn k9RbjJcBg8Yq9VpGxHzDhEHdl/NfUwQ= X-Google-Smtp-Source: ABdhPJy3t/xZ6LfgCUaoIdxC0fSqAS9M6yICd+m31IdK2XGPwVo5nEtAh2b57iJhvYyH2Cc+o3MEIg== X-Received: by 2002:ac8:7fcf:: with SMTP id b15mr28861491qtk.363.1635310382123; Tue, 26 Oct 2021 21:53:02 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:01 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:33 -0400 Message-Id: <20211027045151.9889-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/build/glib-or-gtk-build-system.scm (gtk-module-directories) (wrap-all-programs): Fix indentation. --- guix/build/glib-or-gtk-build-system.scm | 58 ++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index 655f20cd12..c2f814eaeb 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -63,9 +63,9 @@ (define (gtk-module-directories inputs) "")) "3.0") ((string-match "gtk\\+-2" - (or (assoc-ref inputs "gtk+") - (assoc-ref inputs "source") - "")) + (or (assoc-ref inputs "gtk+") + (assoc-ref inputs "source") + "")) "2.0") (else "4.0"))) ; We default to version 4.0. @@ -156,32 +156,32 @@ (define %sh (delay (search-input-file inputs "bin/bash"))) (define (sh) (force %sh)) (define handle-output (match-lambda - ((output . directory) - (unless (member output glib-or-gtk-wrap-excluded-outputs) - (let* ((bindir (string-append directory "/bin")) - (libexecdir (string-append directory "/libexec")) - (bin-list (filter (negate wrapped-program?) - (append (find-files bindir ".*") - (find-files libexecdir ".*")))) - (datadirs (data-directories - (alist-cons output directory inputs))) - (gtk-mod-dirs (gtk-module-directories - (alist-cons output directory inputs))) - (gio-mod-dirs (gio-module-directories - (alist-cons output directory inputs))) - (env-vars `(,@(if (not (null? datadirs)) - (list `("XDG_DATA_DIRS" ":" prefix ,datadirs)) - '()) - ,@(if (not (null? gtk-mod-dirs)) - (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs)) - '()) - ,@(if (not (null? gio-mod-dirs)) - (list `("GIO_EXTRA_MODULES" ":" - prefix ,gio-mod-dirs)) - '())))) - (for-each (lambda (program) - (apply wrap-program program #:sh (sh) env-vars)) - bin-list)))))) + ((output . directory) + (unless (member output glib-or-gtk-wrap-excluded-outputs) + (let* ((bindir (string-append directory "/bin")) + (libexecdir (string-append directory "/libexec")) + (bin-list (filter (negate wrapped-program?) + (append (find-files bindir ".*") + (find-files libexecdir ".*")))) + (datadirs (data-directories + (alist-cons output directory inputs))) + (gtk-mod-dirs (gtk-module-directories + (alist-cons output directory inputs))) + (gio-mod-dirs (gio-module-directories + (alist-cons output directory inputs))) + (env-vars `(,@(if (not (null? datadirs)) + (list `("XDG_DATA_DIRS" ":" prefix ,datadirs)) + '()) + ,@(if (not (null? gtk-mod-dirs)) + (list `("GTK_PATH" ":" prefix ,gtk-mod-dirs)) + '()) + ,@(if (not (null? gio-mod-dirs)) + (list `("GIO_EXTRA_MODULES" ":" + prefix ,gio-mod-dirs)) + '())))) + (for-each (lambda (program) + (apply wrap-program program #:sh (sh) env-vars)) + bin-list)))))) (for-each handle-output outputs) #t) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 03/13] gnu: at-spi2-core: Reverse inheritance relationship with minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039319488 (code B ref 51428); Wed, 27 Oct 2021 04:54:03 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:13 +0000 Received: from localhost ([127.0.0.1]:48111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw5-000547-4s for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:13 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:43812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw0-00052x-Kj for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:09 -0400 Received: by mail-qv1-f49.google.com with SMTP id v10so1004715qvb.10 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IKN3eewjuw/TDAzq5d93MmHGVqu7Jki/Uo9SleCq+gg=; b=VP7fgOwfIQqJAJhhnIaUC+Ia8TPg3A0peYEpMSJdFJa+xTBtoZE88Se2vldFPAlJmD 7mTLGLzBQEeHJECvZ8yFSl+JxnKLtoc2s/wGBsYm8h4CICdJLuAARQIgSc1UOhq+riRU 0KMlcWHZ4W47Gp0c6c7jI7piP7ifjKxi//2UPryJEY2SzM+0iPCFPV1K1YSvPqrU9jeG KQOvUD/JqXxhmZfAIVmk1d0nyMoAumBMTkGYsWemQkadzOCaA+nhLSswYQ1yc/ekv+o4 0VlcO4NdZrcP2XRYS11tdig1rps/QNspGXB/0njpo43MfUnjts+ri2abUoXfbdI9vzeC MEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IKN3eewjuw/TDAzq5d93MmHGVqu7Jki/Uo9SleCq+gg=; b=Y+1rXlX7vWVqcLbb50Y/dJtpgF2cOJMcXzcNMpYgLJbdajpi4N8CRmu/klWW4IK6y2 uyH5HiTbHc2dQyRfJqJaX6TD03hFO90aE/Qv/cfDhjhuXdz1L3GtlvMN4TWvUlJjH2/f zvWfZOTdv3zHVGYttjWlkAy+MDtjp4dMj1cEVOME0JE90C7CMEfmc351SNxorPayD8uH Nk6kU75RJhEAZP+M+SH48IJcH+U77jjZ9SjzFTkomzll+8h/xXNNXoJpLYoGWtu4nUVF d8Qb6iffFTZnV8hauQqpsuUaYVkR0aAj26Bo+nIKyK/eMA965T75dIxuBbkPxowQvYJk xc6A== X-Gm-Message-State: AOAM5312b0fTONs0Kuc0jVy5222xsOE0JeNCOPTU/G7pph4cfgjzpZhl mBmrb/vNXemyqQ9u6jiPHK/ivN6834Y= X-Google-Smtp-Source: ABdhPJxizFuyWHcplucgGrfDEBxBKn9A0Z7cPRchOlMfYmFHri1kjEpN/E00WFTDPbBYbbQlibQTMQ== X-Received: by 2002:a05:6214:b61:: with SMTP id ey1mr26634429qvb.15.1635310382781; Tue, 26 Oct 2021 21:53:02 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:02 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:34 -0400 Message-Id: <20211027045151.9889-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Since the minimal variant is here to stay, this should make things easier to maintain. * gnu/packages/gtk.scm (at-spi2-core-minimal): Rewrite after removing inheritance, making it the base minimal package, with no documentation-related inputs or build phases. (at-spi2-core): Rewrite definition, inherit from the above minimal variant, adding the documentation-related inputs and build phases. --- gnu/packages/gtk.scm | 195 +++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 110 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5dfdaae7e4..c38fd3e907 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,122 +740,97 @@ (define-public gdk-pixbuf+svg loaders)))))))) (synopsis "Image loading library, with SVG support"))) -(define-public at-spi2-core - (package - (name "at-spi2-core") - (version "2.40.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1")))) - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - ;; Generating documentation requires running binaries for the host - ;; on the build machine. - (list ,(if (%current-target-system) - "-Ddocs=false" - "-Ddocs=true")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-documentation-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Ensure that the cross-references point to the "doc" output. - (substitute* "doc/libatspi/meson.build" - (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) - (add-before 'install 'prepare-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) - (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) - (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) - "docbook-xml") - "/xml/dtd/docbook"))) - (substitute* "doc/libatspi/libatspi-docs.sgml" - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t))) - ,@(if (%current-target-system) - '() - '((add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)))) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service - (string-append %output "/share")) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) - (delete 'check)))) - (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libx11" ,libx11) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) - (synopsis "Assistive Technology Service Provider Interface, core components") - (description - "The Assistive Technology Service Provider Interface, core components, +;;; A minimal variant used to prevent a cycle with Inkscape. +(define-public at-spi2-core-minimal + (hidden-package + (package + (name "at-spi2-core") + (version "2.40.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0a9l6cfxynjn6jcp29d72i75xbkrzs1l5kmqcwmfal801b9sg5j1")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'install 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service + (string-append %output "/share")) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") ; + (invoke "dbus-launch" "ninja" "test"))) + (delete 'check)))) + (inputs + `(("bash-minimal" ,bash-minimal))) + (propagated-inputs + ;; atspi-2.pc refers to all these. + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) + (synopsis "Assistive Technology Service Provider Interface, core components") + (description + "The Assistive Technology Service Provider Interface, core components, is part of the GNOME accessibility project.") - (license license:lgpl2.1+) - (home-page "https://wiki.gnome.org/Accessibility/"))) + (license license:lgpl2.1+) + (home-page "https://wiki.gnome.org/Accessibility/")))) -;;; A minimal variant used to prevent a cycle with Inkscape. -(define at-spi2-core-minimal - (package - (inherit at-spi2-core) - (name "at-spi2-core-minimal") - (outputs (delete "doc" (package-outputs at-spi2-core))) +(define-public at-spi2-core + (package/inherit at-spi2-core-minimal + (outputs (cons "doc" (package-outputs at-spi2-core-minimal))) (arguments - (substitute-keyword-arguments (package-arguments at-spi2-core) - ((#:configure-flags configure-flags) - `(delete "-Ddocs=true" ,configure-flags)) + (substitute-keyword-arguments (package-arguments at-spi2-core-minimal) + ((#:configure-flags flags ''()) + `(cons ,(if (%current-target-system) + "-Ddocs=false" + "-Ddocs=true") + ,flags)) ((#:phases phases) `(modify-phases ,phases - (delete 'set-documentation-path) - (delete 'prepare-doc-directory) - (delete 'move-documentation))))) + (add-after 'unpack 'set-documentation-path + (lambda* (#:key outputs #:allow-other-keys) + ;; Ensure that the cross-references point to the "doc" output. + (substitute* "doc/libatspi/meson.build" + (("docpath =.*") + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))))) + (add-before 'install 'prepare-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) + ,@(if (%current-target-system) + '() + '((add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))))))))))) (native-inputs - (alist-delete "gtk-doc" (package-native-inputs at-spi2-core))))) + (append `(("docbook-xml" ,docbook-xml-4.3) + ("gtk-doc" ,gtk-doc/stable) + ("libxml2" ,libxml2)) ;for XML_CATALOG_FILES + (package-native-inputs at-spi2-core-minimal))) + (properties (alist-delete 'hidden? + (package-properties at-spi2-core-minimal))))) (define-public at-spi2-atk (package -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 04/13] gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039419496 (code B ref 51428); Wed, 27 Oct 2021 04:54:03 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:14 +0000 Received: from localhost ([127.0.0.1]:48114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw5-00054G-Pl for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:39425) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw1-000534-JC for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:09 -0400 Received: by mail-qk1-f169.google.com with SMTP id bk35so1333701qkb.6 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ks6J2/Yq1F0ot2OUn9CqxDoKScc6gP5fd6tTG7/2UYQ=; b=H7Da/OWwVN1N29V90iz70nweH3hhOIHfSBPt1SJuoWZfk7GpQKgsfoRart/xkd4FGG p6OcwGlkkqLdZFww/0brUEox+D7G04EMPhFixFtqK9+TcWI65+93mUo5wzC13wneD/ii mtqq7/d0ytNxvqvR6kOdotcbzS6Fvs5JX1KmgasT7Ja1J5bWOlD79xhBhokivMWjaPOM NIPIE0vEs0B0S5XYgiNu3vAxcOW8EHA/fVTMCAPuoG0xoUxJVTHR8OCz4+ME6rTmFQ+Q PEh9lx/VdRck1YrtH2YUedbpVP3lAmp1iz8vI+6CkAl6BmkQu79loZPgP8u3UsuCu6mi 8atg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ks6J2/Yq1F0ot2OUn9CqxDoKScc6gP5fd6tTG7/2UYQ=; b=vEppPY48VAg9Tf1y29x/Z8McdYmENPZhkKW0j6oQX0VitclY6glSf5P/uVHMskf4sz D9U0N5LjRzAUwe+nkTd2+/H+Hk3tcq5EeUcmJr8UhkYjKmp3XnPeBwDibwjS8Hv8T0dg 3d3LQxl8MnJbsc/SQ7ioQNQys7bh9rcOfUQCoRm8VLjfWuLKdoQ55yIAp9ZX0OvZKjjz OGIytx4tMajXAjZX2uq2dM/SZD/vQ01zC5B51usXIVQLH0x2R81za/E0gSSPzkDuxsjl z/q4KervyqJurIeciAIzBdgBITVonuifVuKoTEvDhnLBWseRtljrIdJLULVXTHZssj0T P4iQ== X-Gm-Message-State: AOAM532TIr5TPoNAYjMY1y+M0ZSb61M9fsndI2dVizeW6ibn+Ecu1UTh YfWsFIG2yCIJnOl2Nt3tvRr/AkcssxQ= X-Google-Smtp-Source: ABdhPJxyJL1/C8BOdsK9/iuJCCtzSLclTllF2W5lJOw9OQruWb+KBdyChHwL6Co9cr548MNiu6/Saw== X-Received: by 2002:a05:620a:45a4:: with SMTP id bp36mr22923309qkb.51.1635310383524; Tue, 26 Oct 2021 21:53:03 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:03 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:35 -0400 Message-Id: <20211027045151.9889-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gtk.scm (at-spi2-atk) [propagated-inputs]: Replace at-spi2-core with at-spi2-core-minimal. --- gnu/packages/gtk.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c38fd3e907..b67af8c051 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -859,9 +859,7 @@ (define-public at-spi2-atk (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "meson" "test")))))) (propagated-inputs - ;; TODO: Replace by at-spi2-core-minimal in the next staging window, or - ;; when Inkscape 0.92 is upgraded to 1.0 to avoid a cycle. - `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc + `(("at-spi2-core" ,at-spi2-core-minimal))) ; required by atk-bridge-2.0.pc (inputs `(("atk" ,atk) ("glib" ,glib))) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 05/13] gnu: lsof: Disable the LTlock test. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039419509 (code B ref 51428); Wed, 27 Oct 2021 04:54:04 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:14 +0000 Received: from localhost ([127.0.0.1]:48116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00054P-2d for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:36359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw1-000536-VN for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:10 -0400 Received: by mail-qk1-f172.google.com with SMTP id i9so843718qki.3 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5i+ADNHXGzUaBr2zeUzoNlc3N1/RYBzUKFfqMjK1ojM=; b=UtBXdDcz7eulf+dOCmCUGEcbvt5TiHYlUDRS80jjMhfmEy7KWTYFZXcbVKQm9JjMxU 18xAFm6qP5EucsTgZrHng8UfY2m5BHWkAEanl+lzwiXtQMl75QNOxmzITxzGxaFSFlgP /bCMwzIMbjZp9mU8RQhX70eYrHvpd6lT5i+u+KfA6OFcGPTHTgDEn1Bn+tkyYZvdR31n M8AewOV5kGiEdfO3kXnH28u/9qUvVnWc33kUNbHIL4JBcGYbW7nyJPNqjubkLtA0no9D f/vDYeIfLqcbrH7PhxZ3cKoIL4XsTVzH1rO6ch4t0LQ5oPzVP9lYECYqIpJAsmA3gGoe fjYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5i+ADNHXGzUaBr2zeUzoNlc3N1/RYBzUKFfqMjK1ojM=; b=tKXXrPe2L+Qklk0I7V63YP69hVllzMaYk+SrZpt+UeGUqTSvmVXmWdqapOvArMsMuV Sj9vfZTsR7NGRw/HVvrX0kjVV7XqmIClcYCbbUYFrd9d7a3fc4VwEP4SazNoz6iOYWBu iyCMisPvIq039zI0pzjjE1kfEglR7rFUVqD7oDXsicuw+GBNrZ6+FTMDFzpezXUvRsS3 UaaFn7Tp53Jszc8DWuPnOTg/qvsfZz7OYrBW7YHV8AQVXBMyocFCJvNCkbteKnMOucsq rUDrSImeHChJc8DCFvFRiXAprA2jpHm5DUjPqERd4MljdD87cYrtU2ydsK7FnXOL7GUN mNzw== X-Gm-Message-State: AOAM532NMoibKJ4WvAeQwIsvNmjS1W9Opv278HKD/yIM9ie6NgBU1cQ/ VvbCrWZB6u3zKnkZtZLHIwL2pn813b8= X-Google-Smtp-Source: ABdhPJy2rbjJw+YMuL9+PgjQKzdZS1k71l3iuCsAWN/dn2l7pxxNgsQ3EPqOR7aV/ROmAQKE7mgxjw== X-Received: by 2002:a05:620a:28d5:: with SMTP id l21mr22477448qkp.98.1635310384301; Tue, 26 Oct 2021 21:53:04 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:03 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:36 -0400 Message-Id: <20211027045151.9889-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . * gnu/packages/lsof.scm (lsof)[phases]: Remove trailing #t. {disable-failing-tests}: Disable the LTlock test. --- gnu/packages/lsof.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index b317902ee7..7ded6ee726 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ludovic Courtès +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,26 +62,25 @@ (define-public lsof (string-append "GNU/" (utsname:sysname (uname)) " (GNU Guix)")) - (invoke "./Configure" "linux") - #t)) + (invoke "./Configure" "linux"))) (add-after 'configure 'patch-timestamps (lambda _ (substitute* "Makefile" - (("`date`") "`date --date=@1`")) - #t)) + (("`date`") "`date --date=@1`")))) (add-after 'build 'build-man-page (lambda _ (with-output-to-file "lsof.8" - (lambda _ (invoke "soelim" "Lsof.8"))) - #t)) + (lambda _ (invoke "soelim" "Lsof.8"))))) (add-before 'check 'disable-failing-tests (lambda _ (substitute* "tests/Makefile" ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. (("(STDTST=.*) LTsock" _ prefix) prefix) - ;; Fails without access to a remote NFS server. - (("(OPTTST=.*) LTnfs" _ prefix) prefix)) - #t)) + ;; LTnfs fails without access to a remote NFS server, and LTlock + ;; fails when run on a Btrfs file system (see: + ;; https://github.com/lsof-org/lsof/issues/152). + (("OPTTST=[[:space:]]*LTbigf LTdnlc LTlock LTnfs") + "OPTTST = LTbigf LTdnlc")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -90,14 +90,12 @@ (define-public lsof (invoke "./Add2TestDB") ;; The ‘standard’ tests suggest running ‘optional’ ones as well. - (invoke "make" "standard" "optional"))) - #t)) + (invoke "make" "standard" "optional"))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (install-file "lsof" (string-append out "/bin")) - (install-file "lsof.8" (string-append out "/share/man/man8"))) - #t))))) + (install-file "lsof.8" (string-append out "/share/man/man8")))))))) (synopsis "Display information about open files") (description "Lsof stands for LiSt Open Files, and it does just that. -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 06/13] gnu: lsof: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039519527 (code B ref 51428); Wed, 27 Oct 2021 04:54:04 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:15 +0000 Received: from localhost ([127.0.0.1]:48119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00054c-Ig for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:15 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:36763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw2-000538-Q4 for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:11 -0400 Received: by mail-qv1-f49.google.com with SMTP id d6so1041260qvb.3 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zauxzH5kS4BoyQbl5SksLJXNtW9Yo1b173H3GLBvV7M=; b=h9p3nY4flUwoujk6Q2kMVB7xeQA/r3d3Ud1iEJEhahtOg8GT6es+DdlL97o+Y31zkp T7gG0nPR/LB4ARz+n9kTFKmwVs9Gje+SfeXlSIGHawg+VlfesO2t1Vu69k9xw40CMFsM yBzgc57vrM0vIwSvJqtKDbmq+T4gG5tRz2A6MDJYj55xq4Li5mOUPYolx22XvykcDZGb iqJX+yX2SM2spiYuQr8hN+1zSDOIOb0CRWTTQDtvbgYuFpi1G9GtrkVmRxDwy73JrXXP GiZc2E5NH4hg8mf16Hvo1xEJo7xu1lze9Vj2VleAtrNBuRQDGpjFPnm5Q+Pea+Sohq9B 9z8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zauxzH5kS4BoyQbl5SksLJXNtW9Yo1b173H3GLBvV7M=; b=zIX100v3NKHTmktJd/c8dQT1j4diW5mLKIjI56g/zWyMzxWcZqZ5bGFX2fQ/Bj6JgI c12BiW1kviPN67DjuJSJS+KhBSM7pbuNNaH4dbeRY3h/G0p0W7jYEVa4vDDqrFGR6PNF UZGS5HOH6rfNSmNDp/X2ZlKOZWhyxJWnxt2wtqLKJUFP/xedV8HuHlULveybfDG9C1BT XhjSUEaKinnEpFp7LaPVRZcdJ2UAd4V3VkpFOsC7bXbIVeidVHj8GYAfKqqRXBklsBYM l6MX4samYq13kQ8msrh5tBvd6wg48C7vxSAXawKB/ZllsoVQ5C8pnIZFkYT8HbsuEmJG I3yA== X-Gm-Message-State: AOAM532LKAl1g7fqUHPdX4KpdJ8tmNxGesdhgYlArqLWZl7aKoIWG4LP COH28kfaAKMvUabZy5Y58vH190lKQTw= X-Google-Smtp-Source: ABdhPJwHEW9PWhzBTlzQn45tgKZBhmuHSKJB86diWzLmYpBIEQsYWql21SMl/NeD4fvSowZV6xFOtg== X-Received: by 2002:a0c:c610:: with SMTP id v16mr26897219qvi.36.1635310385199; Tue, 26 Oct 2021 21:53:05 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:04 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:37 -0400 Message-Id: <20211027045151.9889-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/lsof.scm (lsof): Fix indentation. --- gnu/packages/lsof.scm | 136 +++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index 7ded6ee726..04c1d80b52 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -32,76 +32,76 @@ (define-module (gnu packages lsof) (define-public lsof (package - (name "lsof") - (version "4.94.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lsof-org/lsof") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp")) - (patches (search-patches "lsof-fatal-test-failures.patch")))) - (build-system gnu-build-system) - (native-inputs - `(("groff" ,groff) ; for soelim - ("perl" ,perl))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (setenv "LSOF_CC" ,(cc-for-target)) - (setenv "LSOF_MAKE" "make") + (name "lsof") + (version "4.94.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lsof-org/lsof") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp")) + (patches (search-patches "lsof-fatal-test-failures.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("groff" ,groff) ; for soelim + ("perl" ,perl))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "LSOF_CC" ,(cc-for-target)) + (setenv "LSOF_MAKE" "make") - ;; By default, the makefile captures the output of 'uname -a'. - ;; Provide a fixed output instead to make builds reproducible. - (setenv "LSOF_SYSINFO" - (string-append "GNU/" (utsname:sysname (uname)) - " (GNU Guix)")) + ;; By default, the makefile captures the output of 'uname -a'. + ;; Provide a fixed output instead to make builds reproducible. + (setenv "LSOF_SYSINFO" + (string-append "GNU/" (utsname:sysname (uname)) + " (GNU Guix)")) - (invoke "./Configure" "linux"))) - (add-after 'configure 'patch-timestamps - (lambda _ - (substitute* "Makefile" - (("`date`") "`date --date=@1`")))) - (add-after 'build 'build-man-page - (lambda _ - (with-output-to-file "lsof.8" - (lambda _ (invoke "soelim" "Lsof.8"))))) - (add-before 'check 'disable-failing-tests - (lambda _ - (substitute* "tests/Makefile" - ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. - (("(STDTST=.*) LTsock" _ prefix) prefix) - ;; LTnfs fails without access to a remote NFS server, and LTlock - ;; fails when run on a Btrfs file system (see: - ;; https://github.com/lsof-org/lsof/issues/152). - (("OPTTST=[[:space:]]*LTbigf LTdnlc LTlock LTnfs") - "OPTTST = LTbigf LTdnlc")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "tests" - ;; Tests refuse to run on ‘unvalidated’ platforms. - (make-file-writable "TestDB") - (invoke "./Add2TestDB") + (invoke "./Configure" "linux"))) + (add-after 'configure 'patch-timestamps + (lambda _ + (substitute* "Makefile" + (("`date`") "`date --date=@1`")))) + (add-after 'build 'build-man-page + (lambda _ + (with-output-to-file "lsof.8" + (lambda _ (invoke "soelim" "Lsof.8"))))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "tests/Makefile" + ;; Fails with ‘ERROR!!! client gethostbyaddr() failure’. + (("(STDTST=.*) LTsock" _ prefix) prefix) + ;; LTnfs fails without access to a remote NFS server, and LTlock + ;; fails when run on a Btrfs file system (see: + ;; https://github.com/lsof-org/lsof/issues/152). + (("OPTTST=[[:space:]]*LTbigf LTdnlc LTlock LTnfs") + "OPTTST = LTbigf LTdnlc")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + ;; Tests refuse to run on ‘unvalidated’ platforms. + (make-file-writable "TestDB") + (invoke "./Add2TestDB") - ;; The ‘standard’ tests suggest running ‘optional’ ones as well. - (invoke "make" "standard" "optional"))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "lsof" (string-append out "/bin")) - (install-file "lsof.8" (string-append out "/share/man/man8")))))))) - (synopsis "Display information about open files") - (description - "Lsof stands for LiSt Open Files, and it does just that. + ;; The ‘standard’ tests suggest running ‘optional’ ones as well. + (invoke "make" "standard" "optional"))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "lsof" (string-append out "/bin")) + (install-file "lsof.8" (string-append out "/share/man/man8")))))))) + (synopsis "Display information about open files") + (description + "Lsof stands for LiSt Open Files, and it does just that. It lists information about files that are open by the processes running on the system.") - (license (license:fsf-free - "file://00FAQ" - "License inspired by zlib, see point 1.9 of 00FAQ in the distribution.")) - (home-page "https://people.freebsd.org/~abe/"))) + (license (license:fsf-free + "file://00FAQ" + "License inspired by zlib, see point 1.9 of 00FAQ in the distribution.")) + (home-page "https://people.freebsd.org/~abe/"))) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 07/13] gnu: json-glib-minimal: Introduce minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039619536 (code B ref 51428); Wed, 27 Oct 2021 04:54:04 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:16 +0000 Received: from localhost ([127.0.0.1]:48122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw7-00054r-6F for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:15 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:39436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw3-00053B-JN for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:12 -0400 Received: by mail-qk1-f179.google.com with SMTP id bk35so1333747qkb.6 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FZ6R87BZcE/KRoufl3MaSpjhxW1svflbiltZqUdzzi0=; b=UbeEobqnus9NjIyAfcAKr49tL8u9UcxUap6RhSRaRMwd8CojIlFQJOnGvhaYM7n+S/ sKfzlQQ3yi5yoI15QB2FTfJrTJhtBNcksc01H1BJ5kNE7PKSeNcMgiBJzQCYCxZR+SGx 7kqhYub33kiiM69Hhsk47KZAW0625OJhY2ZMilePTiWT+o40mdAlaT8QqCtmuJod4epX 6b97oq4YtSrRSJgJwKarsCgsJ9pP+hz5WCUPWRIk14Nz9yX+QXbbYeA4VoMVeEFCs6sd bhOKB6i64zTg7qO3Xg+en5pNBZCATJM60yMeq576/W6ewugLzOOTqX0t1XwVHZcqbeRv ITNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FZ6R87BZcE/KRoufl3MaSpjhxW1svflbiltZqUdzzi0=; b=c3yVd+IZDvzv98gP9UikMeHH588FUK22F5h5aEwZbXIayb0wtJkufgo2t2SNuqYjU0 0nU5gRrMyTFjeLOP6diprIC5UDu8/o3o9fi/VXSex8u7J+YLZF2DFcdxOV7Jr6g6TpsE U2h++uDwXiyyRBpxbNrlW7qZy4kDUWw2hM4whVxbY8eZtP7w8AbqD7rQfnRLpUTEx7Cn qfqywEUO76+zru0i6ANRjFrLiNEZVE5/95ZRRvCMzG8Mj/Kue6jLCxoxomjzdDD96UIx axjztzTS33IPMsGVjfJcWcWz3efGZw4a44mJUpBjxyR+w06kHLoukMeYOzs1oiiYJnCH 6Tjg== X-Gm-Message-State: AOAM533trqSV4UN9v5lgPG4PtV03y3JH8iK9AenUoBfq6Oo7qz/VX4my yFbe/rnOccH2pFsFpK06SfcxCx9NbDE= X-Google-Smtp-Source: ABdhPJxLCwRnyS94ajxiQAewh3O/2ePZp/41J/C/RRwD3ry074lD0+pmGAJ7kpIAwjXmEhS9LEhjyw== X-Received: by 2002:a05:620a:25c7:: with SMTP id y7mr14734702qko.437.1635310385836; Tue, 26 Oct 2021 21:53:05 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:05 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:38 -0400 Message-Id: <20211027045151.9889-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (json-glib-minimal): New variable. [source]: Adjust URI. [outputs]: Move doc output to... (json-glib)[outputs]: ... here. Rewrite in terms of json-glib-minimal. * gnu/packages/gtk.scm (gtk+): Use json-glib-minimal to break a cycle with Inkscape. --- gnu/packages/gnome.scm | 134 ++++++++++++++++++++--------------------- gnu/packages/gtk.scm | 2 +- 2 files changed, 66 insertions(+), 70 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9532717d89..fc486a4d1e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4590,86 +4590,27 @@ (define-public dconf configuration storage systems.") (license license:lgpl2.1+))) -(define-public json-glib +(define-public json-glib-minimal (package - (name "json-glib") + (name "json-glib-minimal") (version "1.6.2") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://gnome/sources/json-glib/" + (version-major+minor version) + "/json-glib-" version ".tar.xz")) (sha256 (base32 "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3")))) (build-system meson-build-system) - (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - (list - "-Ddocs=true" - "-Dman=true" - ,@(if (%current-target-system) - ;; If enabled, gtkdoc-scangobj will try to execute a - ;; cross-compiled binary. - '("-Dgtk_doc=disabled" - ;; Trying to build introspection data when cross-compiling - ;; causes errors during linking. - "-Dintrospection=disabled") - '())) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) - (with-directory-excursion "doc" - (substitute* (find-files "." "\\.xml$") - (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) - "docbook-xml") - "/xml/dtd/docbook/"))) - (substitute* "meson.build" - (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") - "/xml/xsl/docbook-xsl-1.79.2/")))) - #t)) - ;; When cross-compiling, there are no docs to move. - ,(if (%current-target-system) - '(add-after 'install 'stub-docs - (lambda* (#:key outputs #:allow-other-keys) - ;; The daemon doesn't like empty output paths. - (mkdir (assoc-ref outputs "doc")))) - '(add-after 'install 'move-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t))))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("docbook-xml" ,docbook-xml-4.3) - ("docbook-xsl" ,docbook-xsl) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config) - ("xsltproc" ,libxslt))) + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal + ("pkg-config" ,pkg-config))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") @@ -4679,6 +4620,61 @@ (define-public json-glib GLib and GObject, and integrates JSON with GLib data types.") (license license:lgpl2.1+))) +(define-public json-glib + (package/inherit json-glib-minimal + (name "json-glib") + (outputs (cons "doc" (package-outputs json-glib-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments json-glib-minimal) + ((#:configure-flags _) + `(list "-Ddocs=true" + "-Dman=true" + ,@(if (%current-target-system) + ;; If enabled, gtkdoc-scangobj will try to execute a + ;; cross-compiled binary. + '("-Dgtk_doc=disabled" + ;; Trying to build introspection data when cross-compiling + ;; causes errors during linking. + "-Dintrospection=disabled") + '()))) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-docbook + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (with-directory-excursion "doc" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.3/") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") + "/xml/dtd/docbook/"))) + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl/current/") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") + "/xml/xsl/docbook-xsl-1.79.2/")))))) + ;; When cross-compiling, there are no docs to move. + ,(if (%current-target-system) + '(add-after 'install 'stub-docs + (lambda* (#:key outputs #:allow-other-keys) + ;; The daemon doesn't like empty output paths. + (mkdir (assoc-ref outputs "doc")))) + '(add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")))))))))) + (native-inputs + (append + `(("docbook-xml" ,docbook-xml-4.3) + ("docbook-xsl" ,docbook-xsl) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("xsltproc" ,libxslt)) + (package-native-inputs json-glib-minimal))))) + (define-public libxklavier (package (name "libxklavier") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b67af8c051..1dd2c6c184 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1028,7 +1028,7 @@ (define-public gtk+ ("graphene" ,graphene) ("harfbuzz" ,harfbuzz) ("iso-codes" ,iso-codes) - ("json-glib" ,json-glib) + ("json-glib" ,json-glib-minimal) ("libxml2" ,libxml2) ("rest" ,rest))) (native-inputs -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 08/13] gnu: Add docbook-xsl-ns. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039619543 (code B ref 51428); Wed, 27 Oct 2021 04:54:05 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:16 +0000 Received: from localhost ([127.0.0.1]:48124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw7-000553-Qd for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:16 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:41809) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw4-00053E-79 for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:12 -0400 Received: by mail-qk1-f180.google.com with SMTP id r15so1328160qkp.8 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QvdsjXCb4TjZDSeSgrUMOH+pLZe0d5AfLZyvNS/E2NQ=; b=MVhQXnT7PtoUaG3Xq62+10imQD6cBY4fw4qQfg4/8uWYBFCjYo8Ssbty8ZfMze7+5S QC4GuTjbdmZ/o9JkyokizBQqtBRKwDzZWpYdB7lBnunCmgUsbk7KOb5Qtb43CRFdhIBo d9AKRhT3Ipgb9jxWJBJkAPui79H4O38X+kIQsLHcu/KLjg56pvyjWEWB4hQqQ0wWYAHD OvjVhLZXkne5zaHA785cVpgagO4F8aiTNwse529SP7lG+prz00lPntWtKCsxDq/HDLzN GxIVVNFAExaoS4sK3lBIJ3xyxGIh0LIXR911iEBSSVtxtK0qWW5YYKBj9xf46w2cFqdG eYGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QvdsjXCb4TjZDSeSgrUMOH+pLZe0d5AfLZyvNS/E2NQ=; b=LcML4kaoz4O/gfVA0L5TtSPne2L1MeKayxJV2B68EfeLPAM/pzp1IXoUK14XJNlw5k /cEB2ZecR1ccfTDdES9Y5InV9oEnNkhDhwrFLtq0t8nNN3USBju4KKFZhh46W12ebM1k o2u0LQaFyS/0GLwZxWM4oYBnaKx2ROfl2LjHcumEoyezsNEX6pP+ns5rkAIzJ2NVMSFW 7sAej43xqM/INuqLIIRYQ8aqpbIbn4p4saf3/FCmTN79kqA21CLnqCxnfjRdfl7V52/G GSBp+4n9GkutAVl5lQF4oN5RqzuEKg9Jk+tn6ywBiDCcGFdKFEGohLwqZV82j+jcyiU+ H+9A== X-Gm-Message-State: AOAM533mve+TSKYFbVUlBZlqiQ4pibsGOjy5vvTrXmB/keW3fqFz6XO4 FmlWnHduf1LAvxme9iLsfn5s61+4s9g= X-Google-Smtp-Source: ABdhPJxIWThHeaMHSQNsm8BSbOqqP28ppYcx8clQf7WCU95EkJrDkrDa4FDL2ElQ+ISNCEVCCuM4cw== X-Received: by 2002:a37:484:: with SMTP id 126mr1487204qke.197.1635310386530; Tue, 26 Oct 2021 21:53:06 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:06 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:39 -0400 Message-Id: <20211027045151.9889-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/docbook.scm (docbook-xsl-ns): New variable. --- gnu/packages/docbook.scm | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index ee12f7edeb..92ca706c56 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -41,6 +41,7 @@ (define-module (gnu packages docbook) #:use-module (guix packages) #:use-module (guix download) #:use-module ((guix build utils) #:select (alist-replace)) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system python)) @@ -229,6 +230,61 @@ (define name-version "This package provides XSL style sheets for DocBook.") (license (license:x11-style "" "See 'COPYING' file.")))) +(define-public docbook-xsl-ns + (package + (name "docbook-xsl-ns") + (version "1.79.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/docbook/" + name "/" version "/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "170ggf5dgjar65kkn5n33kvjr3pdinpj66nnxfx8b2avw0k91jin")))) + (build-system copy-build-system) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; XXX: The copy-build-system doesn't seem to allow installing to a + ;; different output. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (xml (string-append out "/xml/xsl/" ,name "-" ,version)) + (doc (string-append (assoc-ref %outputs "doc") + "/share/doc/" ,name "-" ,version)) + (select-rx (make-regexp + "(\\.xml$|\\.xsl$|\\.dtd$|\\.ent$)"))) + ;; Install catalog. + (install-file "catalog.xml" xml) + (install-file "VERSION.xsl" xml) + (substitute* (string-append xml "/catalog.xml") + (("rewritePrefix=\"./") + (string-append "rewritePrefix=\"file://" xml "/"))) + ;; Install style sheets. + (for-each (lambda (dir) + (for-each (lambda (f) + (install-file + f (string-append xml "/" (dirname f)))) + (find-files dir select-rx))) + '("assembly" "common" "eclipse" "epub" "epub3" "fo" + "highlighting" "html" "htmlhelp" "javahelp" "lib" + "manpages" "params" "profiling" "roundtrip" + "template" "website" + "xhtml" "xhtml-1_1" "xhtml5")) + ;; Install documentation. + (install-file "NEWS" doc) + (install-file "RELEASE-NOTES.html" doc) + (copy-recursively "slides" doc) + (copy-recursively "webhelp" doc))))))) + (home-page "https://docbook.org") + (synopsis "DocBook XSL namespaced style sheets for document authoring") + (description "This package provides the @emph{namespaced} XSL style sheets +for DocBook.") + (license (license:x11-style "" "See 'COPYING' file.")))) + (define-public docbook-dsssl (package (name "docbook-dsssl") -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 09/13] gnu: colord-minimal: Introduce minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531039719551 (code B ref 51428); Wed, 27 Oct 2021 04:54:05 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:17 +0000 Received: from localhost ([127.0.0.1]:48127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw8-00055F-B1 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:16 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:45908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw4-00053F-Oj for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:13 -0400 Received: by mail-qk1-f172.google.com with SMTP id bp7so1303289qkb.12 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zQ9XdS4bmHXvdiVpxDLtVT8bB5JCRDFAxF9IzsOb7uo=; b=hH1leeicbkxuMre5sGxxkOL7n1IhHM6hWwS8Bm4zbJFSiSwCuwvt+vSRezmtQ2aDvZ SP40WF6XDHYUFTFk7SSS3VauazOhMX7hc47Qf7sgDgkJQXqLk/9k/axNbX7fSCiwciyX x5Lyg6ds+pSEpn+f+KM1ytTSfCJ7jvNR9gdEepDBC/rv4ufpKkv58ZpW4D/ZW1InJ3Lk KmCI/L7Mj6X8Xvq8vZv/o/8KNK2/JHe2HDzMn4qptXJHxE7aF2AXh+mBrSWRCoJ0l5bJ xL8COGYEf+hKWH+yYTPHM4WKDpIvS3hc0oj9pDNyTZKmKj1OmRGxY9lDdtw0UxarhyyL xQpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zQ9XdS4bmHXvdiVpxDLtVT8bB5JCRDFAxF9IzsOb7uo=; b=A/bZ6qXj4Ve90yxwb9mQcesf0FuF2HBUCpbpSgLL2X/hN/U+PjwBOT5abFHZovXtty VYQBffk/FJ9WyKhR9nFiX79pGl1uq3WQ+HMNJH7Zq9lvlse4fXQ39vGt0urHpeSWFhK6 GnTV6W9gTIDHVhyyczGc7zR0eja0op5sLxsEMSMAdHRbVxnA8vjSb2KUQXDxY8gQnhWn wZyY+6EnG0pRjKTW/k503e7OS58ZDdXuY6y5GWHLUoln04AD6U9u1aX8WOuEzTXxCq+w EwUj/WGlCSANvxgBv8syBEu0vTJk+BsgMeXfCnvtFI+Cdguda2s0rYUKofcJda0UVfmr ur7Q== X-Gm-Message-State: AOAM533p9Hln+Pnv57EKX7qolRfpJrkl4DY3YugsiePWwnDZyaTD07Bh W4mPqRmBzmk4R9FL2juZbQYCc/On4mc= X-Google-Smtp-Source: ABdhPJx4qF1KhntMsl9nEf2T3U7C4C3Wht6Rq/h3/ldBJ1TfWlts7OkKMjM2kRKmFbIqiA/NKYKzAw== X-Received: by 2002:a05:620a:458d:: with SMTP id bp13mr22550852qkb.196.1635310387164; Tue, 26 Oct 2021 21:53:07 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:06 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:40 -0400 Message-Id: <20211027045151.9889-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (colord-minimal): New minimal variant that doesn't require Inkscape to be built (through gtk-doc). Remove trailing #t. [configure-flags]: Disable docs and manpage generation. Sort order. (colord): Rewrite in terms of colord-minimal. [configure-flags]: Enable manpages and bash completion. [phases]{fix-bash-completion-dir}: New phase. [native-inputs]: Add bash_completion, docbook-xsl-ns and libxml2. * gnu/packages/gtk.scm (gtk+)[inputs]{colord}: Use the colord-minimal variant to prevent a cycle with Inkscape. --- gnu/packages/gnome.scm | 65 +++++++++++++++++++++++++++++------------- gnu/packages/gtk.scm | 2 +- 2 files changed, 46 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fc486a4d1e..4b1adc2997 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5203,9 +5203,9 @@ (define-public gnome-terminal keyboard shortcuts.") (license license:gpl3+))) -(define-public colord +(define-public colord-minimal (package - (name "colord") + (name "colord-minimal") (version "1.4.5") (source (origin @@ -5216,33 +5216,27 @@ (define-public colord (base32 "05sydi6qqqx1rrqwnga1vbg9srkf89wdcfw5w4p4m7r37m2flx5p")))) (build-system meson-build-system) (arguments - '(;; FIXME: One test fails: + '( ;; FIXME: One test fails: ;; /colord/icc-store (in lib/colord/colord-self-test-private): ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got ;; application/x-zerosize #:tests? #f #:glib-or-gtk? #t - #:configure-flags (list "-Dlocalstatedir=/var" - ;; No dep on systemd. - "-Dsystemd=false" - ;; Wants to install to global completion dir; - ;; punt. + #:configure-flags (list "-Dargyllcms_sensor=false" ;requires spotread "-Dbash_completion=false" "-Ddaemon_user=colord" + "-Ddocs=false" + "-Dlocalstatedir=/var" + "-Dman=false" "-Dsane=true" - "-Dvapi=true" - ;; Requires spotread. - "-Dargyllcms_sensor=false" - ;; TODO: Requires docbook2x. - "-Dman=false") + "-Dsystemd=false") ;no systemd #:phases (modify-phases %standard-phases (add-before 'configure 'patch-build-system (lambda* (#:key outputs #:allow-other-keys) (substitute* "rules/meson.build" (("udev.get_pkgconfig_variable\\('udevdir'\\)") - (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))) - #t)) + (string-append "'" (assoc-ref outputs "out") "/lib/udev'"))))) (add-before 'configure 'set-sqlite3-file-name (lambda* (#:key inputs #:allow-other-keys) ;; "colormgr dump" works by invoking the "sqlite3" command. @@ -5250,13 +5244,10 @@ (define-public colord (let ((sqlite (assoc-ref inputs "sqlite"))) (substitute* "client/cd-util.c" (("\"sqlite3\"") - (string-append "\"" sqlite "/bin/sqlite3\""))) - #t)))))) + (string-append "\"" sqlite "/bin/sqlite3\""))))))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs @@ -5266,7 +5257,8 @@ (define-public colord ("udev" ,eudev))) (inputs `(("dbus-glib" ,dbus-glib) - ("gusb" ,gusb) + ("gobject-introspection" ,gobject-introspection) + ("gusb" ,gusb-minimal) ("libgudev" ,libgudev) ("libusb" ,libusb) ("polkit" ,polkit) @@ -5280,6 +5272,39 @@ (define-public colord output devices.") (license license:gpl2+))) +(define-public colord + (package/inherit colord-minimal + (name "colord") + (arguments + (substitute-keyword-arguments + (package-arguments colord-minimal) + ((#:configure-flags flags) + `(begin + (use-modules (srfi srfi-1)) + (append '("-Dbash_completion=true" + "-Ddocs=true" + "-Dman=true") + (fold delete ,flags '("-Dbash_completion=false" + "-Ddocs=false" + "-Dman=false"))))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-bash-completion-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "data/meson.build" + (("bash_completion.get_pkgconfig_variable\ +\\('completionsdir'\\)") + (string-append "'" (assoc-ref outputs "out") + "/etc/bash_completion.d'"))))))))) + (native-inputs + (append + `(("bash-completion" ,bash-completion) + ("docbook-xsl-ns" ,docbook-xsl-ns) + ("gtk-doc" ,gtk-doc/stable) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("libxslt" ,libxslt)) + (package-native-inputs colord-minimal))))) + (define-public geoclue (package (name "geoclue") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1dd2c6c184..a515bca5ac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1023,7 +1023,7 @@ (define-public gtk+ ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("colord" ,colord) + `(("colord" ,colord-minimal) ;to prevent a cycle with inkscape ("cups" ,cups) ("graphene" ,graphene) ("harfbuzz" ,harfbuzz) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 11/13] gnu: gusb-minimal: Introduce minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041519624 (code B ref 51428); Wed, 27 Oct 2021 04:54:06 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:35 +0000 Received: from localhost ([127.0.0.1]:48136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawR-00056Q-0M for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:35 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:40878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00053O-Bq for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: by mail-qk1-f182.google.com with SMTP id x123so1334060qke.7 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DlOkfqpT78Lx8CUoeOSaF9nkNuNVVl3iV24Tx7MA/9Q=; b=plYRIuCCvvZ0xY6gjUPDDBAzU5gW9bcDNgiPU0G0r0mX9aakgkkUgSEZwrkt6GEmxm GX/nN+cQKt7nH/bHHcE6ULtzlFWeg7n+q9CA2rKRpbSm+HbpcPogxrqFFHx0RT4J34ed QzChKwgeVKMcBbvL7XmjUMPyZxKRXGMXIqk+ZkgRNqG6b9tuM+pMbLFjyYvOmVJelsQL NPdprJnZe/xywyyrMyLfMeqwtHDTo0oXn+ZVT1gQ1X8a0twnPqHBJBQCHaEy3veMEAwX Y7JL0eyZls5b2ROIQHYuRyR+Wr2nJgw0AJrzxgK/2t40ihqZLBe+7gsHJBZRtxMrhMEG tEQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DlOkfqpT78Lx8CUoeOSaF9nkNuNVVl3iV24Tx7MA/9Q=; b=r8bv8JLb59wZNVTdEfdMD+a98o+5PjJs6iUZ2z/z40cEzXF/tjYPtl/gLBJqHgy3zj nmd9R75zxgWYGAMr87faAXtwOVF1SwHcGtXpnKZlO94YmjHPjDsArcwXbnC7fYVXYmpB F1q7Fcxsa0A9EOt+swQtZ+yBl3WZ8TR15uRPd2uNnTMZruv0/T074dwkaYH4v/o1W0R/ QSQJnJkW0+XlcEyQgWN7B4vRNN18kyy94b2iDvxr+ofNrJJ2HLd7/zn6huiTJv3M1Pio fvZACPPJynfEcVJ1WeziV3GCoPDtmFINSqUdoxzuxgSvTpOFkVg3lAgduCnWC86xDDrh TXYQ== X-Gm-Message-State: AOAM532S6WvhK9EemZMfZddBvJsHZ47wZjVcCx7a7dVDaZVb1IoEp9wc su24MGnv/GJizbY2rtkKancYk225wT4= X-Google-Smtp-Source: ABdhPJz1cRpqdv8jyYFFgz7IJkAmDQNDHUI8y9h38S1GDiY9alL1xVZd3U3Y1+L/gSDzs6nT5Kx9ww== X-Received: by 2002:a05:620a:2486:: with SMTP id i6mr22769999qkn.380.1635310388697; Tue, 26 Oct 2021 21:53:08 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:08 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:42 -0400 Message-Id: <20211027045151.9889-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is needed to prevent a dependency cycle between Inkscape and GTK+. * gnu/packages/gnome.scm (gusb-minimal): New variable. [configure-flags]: Disable docs. [native-inputs]: Remove gtk-doc. (gusb): Rewrite in terms of gusb-minimal. [configure-flags]: Enable docs. [native-inputs]: Add gtk-doc. --- gnu/packages/gnome.scm | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1c4f6a4c94..b79cf48199 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6587,38 +6587,38 @@ (define-public gvfs DAV, and others.") (license license:lgpl2.0+))) -(define-public gusb +(define-public gusb-minimal (package - (name "gusb") + (name "gusb-minimal") (version "0.3.5") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hughsie/libgusb") - (commit version))) + (url "https://github.com/hughsie/libgusb") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8")))) (build-system meson-build-system) + (arguments + `(#:tests? #f ;libusb fails to initialize. Wonder what that is. + #:configure-flags + (cons "-Ddocs=false" + (if ,(%current-target-system) + ;; Introspection data cannot currently be cross-compiled. + '("-Dintrospection=false" + ;; Requires introspection data. + "-Dvapi=false") + '())))) (native-inputs `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("gtk-doc" ,gtk-doc/stable))) + ("vala" ,vala))) (propagated-inputs ;; Both of these are required by gusb.pc. `(("glib" ,glib) ("libusb" ,libusb))) - (arguments - `(#:tests? #f ;libusb fails to initialize. Wonder what that is. - #:configure-flags - ,(if (%current-target-system) - ;; Introspection data cannot currently be cross-compiled. - ''("-Dintrospection=false" - ;; Requires introspection data. - "-Dvapi=false") - ''()))) (home-page "https://github.com/hughsie/libgusb") (synopsis "GLib binding for libusb1") (description @@ -6628,6 +6628,18 @@ (define-public gusb USB transfers with your high-level application or system daemon.") (license license:lgpl2.1+))) +(define-public gusb + (package/inherit gusb-minimal + (name "gusb") + (arguments + (substitute-keyword-arguments (package-arguments gusb-minimal) + ((#:configure-flags flags) + `(cons "-Ddocs=true" + (delete "-Ddocs=false" ,flags))))) + (native-inputs + (cons `("gtk-doc" ,gtk-doc/stable) + (package-native-inputs gusb-minimal))))) + (define-public simple-scan (package (name "simple-scan") -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 10/13] gnu: libcloudproviders-minimal: Introduce minimal variant. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041519632 (code B ref 51428); Wed, 27 Oct 2021 04:54:06 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:35 +0000 Received: from localhost ([127.0.0.1]:48138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawR-00056T-C0 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:35 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:34577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw5-00053M-Fm for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:14 -0400 Received: by mail-qk1-f179.google.com with SMTP id br18so1365322qkb.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DH4Nhj3QwgTJdgtKACB6SHk4GCnuUACTM7ehMsWHF3w=; b=RQPCMzm7s3Zs0aDAPzqGiZOx6WOtaEaH0rVmdXHhhlJCLyU8aAY/dOPGd67iZY/Akd RJm1DeX/u5gvVWoayG7Fu17zgQR/DNPzehsev55xMDzPHuHv6z6O18ENeqE/HW1+k+w0 xfR7n8TYEpM5LE/PdaRH37SqFsDaNvm+QJTc/YZI8JenLm2Lb4liKjC1FRXJA562VCdp aRTyiyxa7kbV145383AbtBTdIs+WkGAl89FQcHMB/eROUkrD3bBCckooQqGkDwEVDxMV LsRAqpNfisSUIuGZyGziSJA7P4YF1TeoRUBKD68HBsk7BaXp9pT4SKtjnXA9g6YlApGG eDaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DH4Nhj3QwgTJdgtKACB6SHk4GCnuUACTM7ehMsWHF3w=; b=xgowquDFHaAgjxjsRQdWI7mueKnfF2NctguPJjpSpMc3R/WxswPTzoGV0Hlue689u9 O5EV/AiZZJChi9cmNPFsUMguxgin81TA7Mh2bYc0gWxebE0FKHxbAcoGTxXTrOwFLl1w fYlMNp8WS64iizJ6PuHwzafW03UFTdMh+KmSYJyEw4HdGo0BWHSDfXdRFA9mPsQ92u/d ZtBh/RZ4ehVLSxb7QJJpFtLK6b8HVrDLYWWxeE4gck9Shuyx+q2wIeCdv77q6/DZQjku HRjffG/6J06n9czNfdbWUlnK8Ysv0a0KDboYFnl/p1DoXd50WoBy0j84UrmsiLUgSBok 0Xuw== X-Gm-Message-State: AOAM531KwE2p0lQZXa/XlgMNb1Rmdo6r8GyuFWI2ELKEjFVgu3cTeq9D 6VvxiVemuVgDii46UfMHKc3Ft+hjwbQ= X-Google-Smtp-Source: ABdhPJzJcUwvrACUZsu+EuIhP8epq5X94wdf3wlMRiOFgcSASq8Zl+xnjS7f6FAAjPEh/3N0ODy3TA== X-Received: by 2002:a05:620a:2490:: with SMTP id i16mr22912408qkn.112.1635310387818; Tue, 26 Oct 2021 21:53:07 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:07 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:41 -0400 Message-Id: <20211027045151.9889-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gnome.scm (libcloudproviders-minimal): New minimal variant that doesn't require Inkscape to be built (through gtk-doc). [source]: Adjust URI. [outputs]: Remove field. [configure-flags]: Disable introspection, docs and vala bindings. [phases]{move-doc}: Move phase to ... (libcloudproviders)[phases]: ... here. Rewrite in terms of libcloudproviders-minimal. The "doc" output is moved here. [configure-flags]: Clear inherited flags and enable doc. * gnu/packages/gtk.scm (gtk+)[inputs]{libcloudproviders}: Use the minimal variant to prevent a cycle with Inkscape. --- gnu/packages/gnome.scm | 60 +++++++++++++++++++++++++----------------- gnu/packages/gtk.scm | 2 +- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4b1adc2997..1c4f6a4c94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Jonathan Frederickson -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan @@ -338,41 +338,28 @@ (define-public brasero features to enable users to create their discs easily and quickly.") (license license:gpl2+))) -(define-public libcloudproviders +;;; Minimal variant, used to break a cycle with Inkscape. +(define-public libcloudproviders-minimal (package - (name "libcloudproviders") + (name "libcloudproviders-minimal") (version "0.3.1") (source (origin (method url-fetch) (uri - (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (string-append "mirror://gnome/sources/libcloudproviders/" + (version-major+minor version) + "/libcloudproviders-" version ".tar.xz")) (sha256 (base32 "0aars24myf6n8b8hm1n12hsgcm54097kpbpm4ba31zp1l4y22qs7")))) (build-system meson-build-system) - (outputs '("out" "doc")) (arguments - `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags - (list - "-Denable-gtk-doc=true") - #:phases - (modify-phases %standard-phases - (add-after 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + #:configure-flags (list "-Dintrospection=false" + "-Denable-gtk-doc=false" + "-Dvapigen=false"))) (native-inputs `(("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -386,6 +373,31 @@ (define-public libcloudproviders (home-page "https://csorianognome.wordpress.com/2015/07/07/cloud-providers/") (license license:lgpl3+))) +(define-public libcloudproviders + (package/inherit libcloudproviders-minimal + (name "libcloudproviders") + (version "0.3.1") + (outputs (cons "doc" (package-outputs libcloudproviders-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments libcloudproviders-minimal) + ((#:configure-flags _) + '("-Denable-gtk-doc=true")) ;false by default + ((#:phases phases '%standard-phases) + `(modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc"))))))))) + (native-inputs + (append + `(("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc/stable)) + (package-native-inputs libcloudproviders-minimal))))) + (define-public libgrss (package (name "libgrss") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a515bca5ac..e92c6b1398 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1005,7 +1005,7 @@ (define-public gtk+ gdk-pixbuf+svg gdk-pixbuf)) ("glib" ,glib) - ("libcloudproviders" ,libcloudproviders) + ("libcloudproviders" ,libcloudproviders-minimal) ("libepoxy" ,libepoxy) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 12/13] gnu: rest: Use libsoup-minimal. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041619639 (code B ref 51428); Wed, 27 Oct 2021 04:54:06 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:36 +0000 Received: from localhost ([127.0.0.1]:48140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawR-00056b-T2 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:36 -0400 Received: from mail-qk1-f172.google.com ([209.85.222.172]:38836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw6-00053V-Rl for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:15 -0400 Received: by mail-qk1-f172.google.com with SMTP id bi29so1342307qkb.5 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=admQPrrfTgIr59r/+zx6e2qjaRUpwHbg+YYXmtivA0I=; b=qhWUr3FiByFUDQyMUSw944PZkymmNil2lxRElL0VCeMLY1CgrMdTTLdJ27hKgR3iFc obDYznjxeWr2wFxK7WyFhXXet1+2Y1G20fq634Pk1wZixRlC06bEC2UOqqoVx3e1v4iu xEVHEdf8oJTZAjq8TgTFU+rTO0I/UE2l+lQv9AyVRAGYOrjNVUX+tBhA4mlJlegb7M7g JOJ4giGovm6mqC5L8PrJssZ8P29FCzZYbqdMhoC+i0uaY7wC/Rg8n506F0FJGmFSn8dZ U9bA8Ph/9UW2lKBnPg+NEoyBfQ52f3RVxYyPDiZw8viatvl++EeXqqu6GvsJZHAo2YoL FmAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=admQPrrfTgIr59r/+zx6e2qjaRUpwHbg+YYXmtivA0I=; b=Jbyrcydp4NvC9ouBDjRvImYUQRgIPwmF/huWlHee32WSKwgaRyeVD8YwXpIIMvXcRK oEqZLytvfCXVbtoTvzxqe2DxDFtdBh09fxV1GFmj10QafNa9Zp4GKhuzb3kYq7k94S2S knCdO3WO4TCp4+xC+cQp4ft2VF6GXe1Kz5M8P8ZCWIvE/U+//Kri7YmR2pYsOl45OENZ J1hZJd32aMGh3ltTEfHiJnqduxTn4UUZ2AfA44yxuFVVax9t2uSisqWnJPuTSnnMLoZX Z2g3sarfzp6hGaCdwHfuBali/yG+WqQLYiDXYtt6SwynpLbUz7EO8osYhwNrpZZNaag+ 3ipA== X-Gm-Message-State: AOAM533oKDSSD21TuQ7bA2zjZpBf0xg3dHYtSWVcfra8Fxv3JcqQoag4 Ofl8fYjEAOnr46mLpb/e+bp0sjjRI50= X-Google-Smtp-Source: ABdhPJySJZQhwx3J7ZEEzHVJTpAoI+DjhmrM74EsSHFe5GL2HMdBvp4s18/XC1YanSfxnJTsmAXIzg== X-Received: by 2002:a37:d48:: with SMTP id 69mr21378617qkn.457.1635310389310; Tue, 26 Oct 2021 21:53:09 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:09 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:43 -0400 Message-Id: <20211027045151.9889-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is needed to prevent a dependency cycle between Inkscape and GTK+. * gnu/packages/gnome.scm (rest)[propagated-inputs] {libsoup}: Use the minimal variant. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b79cf48199..804b3dfb7f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4826,7 +4826,7 @@ (define-public rest (propagated-inputs ;; rest-0.7.pc refers to all these. `(("glib" ,glib) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal) ("libxml2" ,libxml2))) (home-page "https://www.gtk.org/") (synopsis "RESTful web api query library") -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 13/13] gnu: inkscape: Remove the legacy 0.92 version. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041619649 (code B ref 51428); Wed, 27 Oct 2021 04:54:07 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:36 +0000 Received: from localhost ([127.0.0.1]:48142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawS-00056i-5g for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:36 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:45728) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw8-00053n-5J for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:17 -0400 Received: by mail-qt1-f180.google.com with SMTP id r2so130231qtw.12 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d1wel20SbxXhLLNn9Zpp1v7uw5Oz/RCSror7Tm/KR5Y=; b=oSUXbmd7iME9tdAeYPHRtG4Zd8Ye4NZMiG37fekAoCP05FU4+W1dC7Ri70oiybqM/e lYihJ6OSB4RFfXsNlpIlIzt58JcPaqCbFQzaJmBYwCExXHIoid4M+ukKJB0aB4RWQFwV +XFMydoGDjMc0AxC0U1BHluPs0C0yHuw6VIsu6QEJFGOaoywDrHdxhkVvtw6YCDkwkPK Xh6gC6/5r0ScHmtH7/lDXYU8l2FZF3+KuoFLxJFOQUuzJb/jDD6jNCphPrc+p2bfOg+3 pjBdybsYorvfmbepVNBfLLP7O702yCLR/mJyBc42/OJ4C9rNnihQlVEiXWlxLVnCf89U EuxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d1wel20SbxXhLLNn9Zpp1v7uw5Oz/RCSror7Tm/KR5Y=; b=kACM6Ae+0rccBBhMhV0IVUlaXQolXqEyQ+ckz5V/M5ebMasfc5m076DGBWlpQNXPBG rI71xqHWTDK1K1DAs1OiGUVdcSeQUk5VnYMtGMN9gpc7YdPsTBoNjOgAuyyy3NDUatmr UsQwi73dUC3rkzYST6NMJVnoy6vp8CLXDc0BXP+FRVOcdcjme2jXoiENS65XV201lsi0 zildlBLvXJ3MlgzEqUcEPBQzTfJ6o4XTL9/3g0jQsCZYD0CimVM+3LqivRy5GV+8allT AfRiLwq/k0/qJa9DMtVnRcr+8za73lp5xjo9+hdJXSjCvKeNANaAJIBA4/z61uwZ5ODa 8bHw== X-Gm-Message-State: AOAM533ZbsDQKsaxAQDfSWIHsHWv9oTDGv12hr8wJHZ0htz43W7yAVOr ci4pRViIOS9whNqP/ynz55ftsSNZkEs= X-Google-Smtp-Source: ABdhPJykxkswA9BajR8wvkm9ni+CySpL+RmKrHm/bms+Zjecq/GtfJ+RFHgqMwABTYRFgD/itA6wvw== X-Received: by 2002:ac8:614b:: with SMTP id d11mr29158919qtm.396.1635310390402; Tue, 26 Oct 2021 21:53:10 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:09 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:44 -0400 Message-Id: <20211027045151.9889-13-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) The older 0.92 Inkscape package was previously kept because of problems building lib2geom on the ARM architectures. As this no longer appears to be a problem (tested on the overdrive1 machine), finally replace the older Inkscape by the newer 1.1 release. * gnu/packages/inkscape.scm (inkscape-1.1): Delete variable, moving the package definition to... (inkscape): ... the now single inkscape variable. Remove trailing #t. [tests?]: Remove. [phases]{generate-gdk-pixbuf-loaders-cache-file}: Add phase. --- gnu/packages/inkscape.scm | 90 +++++---------------------------------- 1 file changed, 11 insertions(+), 79 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 1fd328eb1c..e891a707c1 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2020 Marius Bakke ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Ekaitz Zarraga ;;; @@ -53,71 +53,6 @@ (define-module (gnu packages inkscape) #:use-module (gnu packages pkg-config)) (define-public inkscape - (package - (name "inkscape") - (version "0.92.4") - (source (origin - (method url-fetch) - (uri (string-append "https://media.inkscape.org/dl/" - "resources/file/" - "inkscape-" version ".tar.bz2")) - (patches (search-patches "inkscape-poppler-0.76.patch")) - (sha256 - (base32 - "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p")))) - (build-system cmake-build-system) - (inputs - `(("aspell" ,aspell) - ("gtkmm" ,gtkmm-2) - ("gtk" ,gtk+-2) - ("gsl" ,gsl) - ("poppler" ,poppler) - ("libpng" ,libpng) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libgc" ,libgc) - ("freetype" ,freetype) - ("popt" ,popt) - ("potrace" ,potrace) - ("python" ,python-wrapper) - ("lcms" ,lcms) - ("boost" ,boost))) - (native-inputs - `(("intltool" ,intltool) - ("glib" ,glib "bin") - ("perl" ,perl) - ("pkg-config" ,pkg-config))) - ;; FIXME: tests require gmock - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-icon-cache-generator - (lambda _ - (substitute* "share/icons/application/CMakeLists.txt" - (("gtk-update-icon-cache") "true")) - #t)) - (add-after 'unpack 'adjust-for-new-poppler - (lambda _ - (substitute* (find-files "src/extension/internal/pdfinput") - ;; Needed for Poppler 0.82. - (("Unicode \\*u") "Unicode const *u") - ;; Needed for Poppler 0.83. - (("\\(GfxPath") "(const GfxPath") - (("GfxSubpath") "const GfxSubpath") - (("new GlobalParams\\(\\)") - "std::unique_ptr(new GlobalParams())") - (("new GlobalParams\\(poppler_datadir\\)") - "std::unique_ptr(new GlobalParams(poppler_datadir))")) - #t))))) - (home-page "https://inkscape.org/") - (synopsis "Vector graphics editor") - (description "Inkscape is a vector graphics editor. What sets Inkscape -apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard, -as the native format.") - (license license:gpl2+))) - -(define-public inkscape-1.1 (package (name "inkscape") (version "1.1") @@ -211,12 +146,10 @@ (define-public inkscape-1.1 ;; Lift the requirement on the double-conversion library, as ;; it is only needed by lib2geom, which is now unbundled. (substitute* "CMakeScripts/DefineDependsandFlags.cmake" - ((".*find_package\\(DoubleConversion.*") "")) - #t)))) + ((".*find_package\\(DoubleConversion.*") "")))))) (build-system cmake-build-system) (arguments - `(#:tests? #t - #:test-target "check" ;otherwise some test binaries are missing + `(#:test-target "check" ;otherwise some test binaries are missing #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) #:modules ((guix build cmake-build-system) @@ -224,11 +157,13 @@ (define-public inkscape-1.1 (guix build utils)) #: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")) - #t)) + (("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 @@ -236,14 +171,11 @@ (define-public inkscape-1.1 (lambda _ (substitute* "testfiles/cli_tests/CMakeLists.txt" (("add_cli_test\\(export-latex") - "message(TEST_DISABLED: export-latex")) - #t)) + "message(TEST_DISABLED: export-latex")))) (add-after 'unpack 'set-home ;; Mute Inkscape warnings during tests. (lambda _ - (setenv "HOME" (getcwd)) - (format #t "ARGS is set to: ~a" (getenv "ARGS")) - #t)) + (setenv "HOME" (getcwd)))) ;; Move the check phase after the install phase, as when run in the ;; tests, Inkscape relies on files that are not yet installed, such ;; as the "share/inkscape/ui/units.xml" file. @@ -259,8 +191,8 @@ (define-public inkscape-1.1 (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) - #t))))) + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH")))))))))) (inputs `(("aspell" ,aspell) ("autotrace" ,autotrace) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 14/20] gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041719656 (code B ref 51428); Wed, 27 Oct 2021 04:54:07 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:37 +0000 Received: from localhost ([127.0.0.1]:48144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawS-00056r-R8 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:37 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:42535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw8-00053u-Qt for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:17 -0400 Received: by mail-qk1-f171.google.com with SMTP id y10so1319605qkp.9 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pt2av54PseXsomEjvloGpkVk5wflk4NTxTnJvWPvOd0=; b=K83ZVu4Fl8omlf7o+CGa40nPJjeU9zn+SAFex7HmSZo3mdS98gIKApwbpJqxBuFhAy PogtHzAFhB/4U6Y2UfFykYw1rch2MzBVZJOS7+Rp6aguhD/wkyFlaqGvMrvy0Cd5lYpq FDXVyucDk7Bm4lwWEyKgGrHRk/A0+ciGjZBsjqoeSmnGOGFbrLfqraXvy2M9Fc2uZ0VR Zd8dtdR8NQbqp1uVCEtV1uKM/ixvux9qd0T257LbN1YF/pqBwwxBceQUBOJVjBKRnlup c31CXGzmp7RhaYY3f7aWCF2L87sFCcRX06FYIoidFKbnwbWhmi6qru5dRRh/rXdcD8aO PyYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pt2av54PseXsomEjvloGpkVk5wflk4NTxTnJvWPvOd0=; b=LDWfQS3Z3o0E2WpL9t+Em0rErYpMITzCRTbsblYPQIbhBU6iSDOrXzZsZGF6seLzFk myLS0GuXxm0U4OlUlOJHiS7lMUlppa8ytm/r3x4xksb/Ly65qw3zmS0yZzHkBCxFsrTw HLRpB+8P26EGwNzmpNnYULnJMXdtvH1bHOJIB4zUctGuZOzi3aWRnZ8X69XLqqaOwcdm bs8vx2Ha61aHQauKJl0saI86vqN8fSQjfIdkkzriob6w/1uhqseTxZ8rtbph3msfBy+g HTULRiJaP5nbbbPxV1eizPOrOTpApBuj71T9Zb3YIXAs3s+xE72jD64KzCqr/YqUqdc2 HADQ== X-Gm-Message-State: AOAM5332Cbt5huk7EIrzEnfdOQXIzMQVfs8gQp30QrwnGCUBCAVFTt6Y UZdz3iMsJ7SkNVbcVp12eI1RGarE0aw= X-Google-Smtp-Source: ABdhPJyiseC9MHJg3wVvFWwYgDb9H8nZ5To3upQv71F7tcevhwGTBkKfVk5Pf+GA4Hv768oW7wveOg== X-Received: by 2002:ae9:de07:: with SMTP id s7mr22402947qkf.47.1635310391188; Tue, 26 Oct 2021 21:53:11 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:10 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:45 -0400 Message-Id: <20211027045151.9889-14-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/chromium.scm (make-lld-wrapper): Delete procedure. (ungoogled-chromium)[native-inputs]: Replace its use by lld-as-ld-wrapper. --- gnu/packages/chromium.scm | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 534b9a4ad9..2d67182e22 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -460,31 +460,6 @@ (define opus+custom `(cons "--enable-custom-modes" ,flags)))))) -;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need -;; this trick to make it wrap 'lld'. -(define (make-lld-wrapper lld) - (define lld-as-ld - (computed-file "lld-ld" - #~(begin - (mkdir #$output) - (mkdir (string-append #$output "/bin")) - (symlink #$(file-append lld "/bin/lld") - (string-append #$output "/bin/ld"))))) - - ;; Create a wrapper for LLD that inserts appropriate -rpath entries. - (define lld-wrapper - (make-ld-wrapper "lld-wrapper" - #:binutils lld-as-ld)) - - ;; Clang looks for an 'ld.lld' executable, so we need to symlink it back. - (computed-file "lld-wrapped" - #~(begin - (mkdir #$output) - (mkdir (string-append #$output "/bin")) - (symlink #$(file-append lld-wrapper "/bin/ld") - (string-append #$output "/bin/lld")) - (symlink "lld" (string-append #$output "/bin/ld.lld"))))) - (define-public ungoogled-chromium (package (name "ungoogled-chromium") @@ -848,7 +823,7 @@ (define-public ungoogled-chromium ("clang" ,clang-12) ("gn" ,gn) ("gperf" ,gperf) - ("ld-wrapper" ,(make-lld-wrapper lld)) + ("ld-wrapper" ,lld-as-ld-wrapper) ("ninja" ,ninja) ("node" ,node-lts) ("pkg-config" ,pkg-config) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 15/20] gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041719663 (code B ref 51428); Wed, 27 Oct 2021 04:54:08 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:37 +0000 Received: from localhost ([127.0.0.1]:48146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawT-00056z-51 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:37 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:34737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaw9-000541-Hu for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:17 -0400 Received: by mail-qt1-f179.google.com with SMTP id v17so1415737qtp.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+C+mJ9mAsqwTdKlnBqS6GGZziBJfyv/4HNa6LGG3iZQ=; b=WRyyoWM2DgS0BTSg1pQGpEnQDCY/u86yjMiqCkRjSKiqEJ6yebAWiWMFOaCpQR4yMb lh1KtbezslHyCjk4ikiGFmovxctz+4Snn4hnVFTi3eGO4jbsmcpUaodFv60S1kLXPA4b X9TaSySHZYEpN4nBnA6g/Mo7awFLwD8WExnHheIIBHb3LC99voF4LEINOf9LaFtNJc4P O1nDyDqwYwqD8QstfrXpOK0oAQFxa6LsJgrN71svlgNg7RFbagAd/V1LAP+LysaJqhvx Xo22KS+84+fMQXWgFI7+2g2fzJlraLTv+7J8CGHItwj2EXvqsKAbED+w9ioxmahTeyWC V7tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+C+mJ9mAsqwTdKlnBqS6GGZziBJfyv/4HNa6LGG3iZQ=; b=o+VU83FLzKkxqEtWI8Tr+disVsj/3hYkYYmVi+1Y88hV9Ccn81K/2IZHHQWjn9SPng IV7ZNe1vkE7mGTYr35y45rL/7s1ikiNBTE4tfFkkabHdfQTtb4GzHTjPhqFWU4r4U/t7 oXzl1NTIoKYf+v4NVFL/SMC2wLCEjDS8HRSE0ww138DiGr/rj8lTw6xbUURpZywPmgOw ah4pdc6Hr5WetPGsjrtfIBoVXQZPZHxcA9L40N2yxRlKuKqHTerPabs6tI7kVxEE56aO JqRcjUh8uEwA/IBHixUoaBMAKG3qQTMNSqoepW7hlK2WD6eBXnwn9ROWgAB3KZ7sWizq RbJg== X-Gm-Message-State: AOAM532FDOqnwn3Oy6CiBl+jwJDgHAeTurvn8CP4bvBczGBVFswwNEhL 4o8Sqv9ZqjJ9ctbjckQlP2XrNzaAgxE= X-Google-Smtp-Source: ABdhPJzu4/aK3ULZZLeYMw4iqdQnmcSWBHxysc+TngqGpMjSzrIMOa/HI7mdRRoC7rr6Oq5PxsGnhw== X-Received: by 2002:a05:622a:1486:: with SMTP id t6mr30084799qtx.319.1635310391944; Tue, 26 Oct 2021 21:53:11 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:11 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:46 -0400 Message-Id: <20211027045151.9889-15-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/gtk.scm (gtk+)[arguments]: Import the (guix build glib-or-gtk-build-system) module and put it in scope. [phases]{generate-gdk-pixbuf-loaders-cache-file}: New phase. (gtk): Likewise. --- gnu/packages/gtk.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8f57f660c4..22106c1185 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1039,7 +1039,12 @@ (define-public gtk+ ("xorg-server" ,xorg-server-for-tests) ("xsltproc" ,libxslt))) (arguments - `(#:disallowed-references (,xorg-server-for-tests) + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules ((guix build utils) + (guix build gnu-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + #:disallowed-references (,xorg-server-for-tests) ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes ;; to "doc". #:configure-flags (list (string-append "--with-html-dir=" @@ -1055,6 +1060,9 @@ (define-public gtk+ "--enable-broadway-backend") #: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 'disable-failing-tests (lambda _ (substitute* "testsuite/gtk/Makefile.in" @@ -1119,7 +1127,12 @@ (define-public gtk (build-system meson-build-system) (outputs '("out" "bin" "doc")) (arguments - `(#:configure-flags + `(#:imported-modules ((guix build glib-or-gtk-build-system) + ,@%gnu-build-system-modules) + #:modules ((guix build utils) + (guix build gnu-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + #:configure-flags (list "-Dbroadway-backend=true" ;for broadway display-backend "-Dcloudproviders=enabled" ;for cloud-providers support @@ -1133,6 +1146,9 @@ (define-public gtk "-Dman-pages=true") #: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 (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) ;; Correct DTD resources of docbook. -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 16/20] build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041819671 (code B ref 51428); Wed, 27 Oct 2021 04:54:08 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:38 +0000 Received: from localhost ([127.0.0.1]:48148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawT-000576-GX for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:37 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:37757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawA-00054D-CW for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:19 -0400 Received: by mail-qk1-f177.google.com with SMTP id bl14so1350158qkb.4 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lcJyvTDuX1Mct9JWU1O38Y0Gv546sTduEy0txgkIzc8=; b=pH9Ft0HaaJO3gon2zGXmN3ryf8hPWBuLL1ywcdUHYOcfgwLPNadguStUaPBU3hAw1z HQ+ahH2uRR/5GKBiP/YdE+OSw+kCXSe8FuYXzBy/lOpkx1ynEgoyRj0BGFqS0s+1/wqG OrNsdyixyBv8vovrcGhNN/MOa2Q3h3qNohP14CjVyPTUiJGnU7OpyWV9GqvZ+pvAZICB Dzv0WmUpFDXjbvdYqe3IgnkaNTEP6vOYkDY0HIhuY4Lz+3UwUpGpcOtUaN1MU+ZyD2fM ubFsf6w/S2KBwn+OlVo6Hox6YwGmsds6vo4nNF+dIfLgYOBb6iE0aLGyvk+0cddYaFDG 4Ayw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lcJyvTDuX1Mct9JWU1O38Y0Gv546sTduEy0txgkIzc8=; b=XchTZT0Y9wQjOmc8P+tdyIyu9BAxbbsWPA35o19vQHA1guZ8xUCojmfsgIcdbSjCvO dLj/aNKf0RGzmmA7bLdO9XIr34hUMYAhmVwTmekUcP0o3sJotqn0VzaaVi9OTC3RS1my Iz1S34Q6QC8eSHKgHwPg22/7ex9mxESuxYAMkOzQDK5kh6fyCZmjfNzRa9magVRa6ufZ t4y2ba7Ptx1XVPDnyPbA2V9OgtXmD9VOthObM8Pepw5epmNVXy1Hvf5JaqZvYyTWwnAc DeXkqB3S7Lt+PFbehGyYgWglfl80tpU+2/F3pA+GR5qtmJWPWTkcf0Q0njhMvgTaCKx/ /oOg== X-Gm-Message-State: AOAM532h9pC4BdEL+bp21UuGRTXsAqYLc3qjlpuJojRrXmNX9O+s0TVI 3e7hwpSud758wWCyEsCwcMYlx+khdHM= X-Google-Smtp-Source: ABdhPJwUuN8usioYLtTm3ZmC139yeVWgxXRHKlsfnTpK6rUWoljPn2mGBBhL8w3VTpNHuWRtYeWNtw== X-Received: by 2002:a37:b045:: with SMTP id z66mr22883336qke.271.1635310392631; Tue, 26 Oct 2021 21:53:12 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:12 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:47 -0400 Message-Id: <20211027045151.9889-16-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Adding a profile hook to do so covers most use cases, but it is still necessary to have the gdk-pixbuf loaders cache file computed at build time, as software may expect to find loaders support at that time. * guix/build/glib-or-gtk-build-system.scm: Delete trailing #t. (%gdk-pixbuf-loaders-cache-file-prefix): New variable. (generate-gdk-pixbuf-loaders-cache): New procedure. (generate-gdk-pixbuf-loaders-cache-file): Add procedure... (%standard-phases): ... and register it as a build phase. --- guix/build-system/glib-or-gtk.scm | 5 ++- guix/build/glib-or-gtk-build-system.scm | 55 +++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 0c88f039d2..aa9703829b 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -26,6 +26,8 @@ (define-module (guix build-system glib-or-gtk) #:use-module (guix monads) #:use-module (guix derivations) #:use-module (guix search-paths) + #:use-module ((guix build glib-or-gtk-build-system) + #:select (%gdk-pixbuf-loaders-cache-file)) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) @@ -33,7 +35,8 @@ (define-module (guix build-system glib-or-gtk) #:export (%glib-or-gtk-build-system-modules glib-or-gtk-build glib-or-gtk-cross-build - glib-or-gtk-build-system)) + glib-or-gtk-build-system) + #:re-export (%gdk-pixbuf-loaders-cache-file)) ;for convenience ;; Commentary: ;; diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index c2f814eaeb..785eb54fdc 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,8 @@ (define-module (guix build glib-or-gtk-build-system) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases + %gdk-pixbuf-loaders-cache-file + generate-gdk-pixbuf-loaders-cache glib-or-gtk-build)) ;; Commentary: @@ -183,8 +186,7 @@ (define handle-output (apply wrap-program program #:sh (sh) env-vars)) bin-list)))))) - (for-each handle-output outputs) - #t) + (for-each handle-output outputs)) (define* (compile-glib-schemas #:key outputs #:allow-other-keys) "Implement phase \"glib-or-gtk-compile-schemas\": compile \"glib\" schemas @@ -197,11 +199,56 @@ (define* (compile-glib-schemas #:key outputs #:allow-other-keys) (not (file-exists? (string-append schemasdir "/gschemas.compiled")))) (invoke "glib-compile-schemas" schemasdir))))) - outputs) - #t) + outputs)) + +(define %gdk-pixbuf-loaders-cache-file + "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache") + +(define (generate-gdk-pixbuf-loaders-cache directories outputs) + "Generate the loaders.cache file used by gdk-pixbuf to locate the available +loaders among DIRECTORIES, and set the GDK_PIXBUF_MODULE_FILE environment +variable. The cache file is installed under OUTPUTS. Return the first cache +file name if one was created else #f." + (let* ((loaders (append-map + (cut find-files <> "^libpixbufloader-.*\\.so$") + directories)) + (outputs* (map (cut string-append <> "/" + %gdk-pixbuf-loaders-cache-file) + outputs)) + (loaders.cache (first outputs*)) + (loaders.cache-copies (cdr outputs*))) + (if (not (null? loaders)) + (begin + (mkdir-p (dirname loaders.cache)) + (setenv "GDK_PIXBUF_MODULE_FILE" loaders.cache) + (apply invoke "gdk-pixbuf-query-loaders" "--update-cache" loaders) + (for-each (lambda (f) + (mkdir-p (dirname f)) + (copy-file loaders.cache f)) + loaders.cache-copies) + loaders.cache) + #f))) + +(define* (generate-gdk-pixbuf-loaders-cache-file #:key inputs outputs + #:allow-other-keys) + "Build phase that Wraps the GENERATE-GDK-PIXBUF-LOADERS-CACHE procedure." + ;; Conditionally compute the cache file if the gdk-pixbuf command is + ;; available on PATH (it comes with gdk-pixbuf). + (when (which "gdk-pixbuf-query-loaders") + (let ((loaders.cache (generate-gdk-pixbuf-loaders-cache + (map cdr inputs) + (filter-map identity + (list + (assoc-ref outputs "out") + (assoc-ref outputs "bin") + (assoc-ref outputs "lib")))))) + (when loaders.cache + (format #t "GDK_PIXBUF_MODULE_FILE set to `~a'~%" loaders.cache))))) (define %standard-phases (modify-phases gnu:%standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + generate-gdk-pixbuf-loaders-cache-file) (add-after 'install 'glib-or-gtk-compile-schemas compile-glib-schemas) (add-after 'install 'glib-or-gtk-wrap wrap-all-programs))) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 17/20] profiles: Add a gdk-pixbuf-loaders-cache-file hook. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041819678 (code B ref 51428); Wed, 27 Oct 2021 04:54:08 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:38 +0000 Received: from localhost ([127.0.0.1]:48150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawT-00057E-Vv for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:38 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:33639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawA-00054J-WF for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:19 -0400 Received: by mail-qk1-f178.google.com with SMTP id a132so282134qkg.0 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J6kpl8m7pAL17Q+AfNXk/lzscmckgjBZtLjSVUJVWps=; b=hHzw1zInF+iuxt5jzOqgHJWhQ7ztZTk3ZOuurjetf/T1j8yr66s8m9X6TptxKlsz1m vOm2CFggHOKlXjWOJ0jZAygWluaqW/COHRZ9yGF2l+IugSa32MEfORCA7SQ2ms3oFekK eBCal1NyETYIQvepZfbzVU6AXqSpJf5z3tfqJWwym1JNmEMa1qs6+UblzbYUEo0uFur6 3Ip12fSBzY0t2tp1MngqNmhEGnYfIfhETavYJTRsicrTiql4wFNZS0xU1qJS5uSWGA9V 2loqPblIm0TWHdr425uaekj6x1zAC7l3KaPrvNKrtH4it4RO7Dwt+JuTpNvxyAjiDoLK 8kkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J6kpl8m7pAL17Q+AfNXk/lzscmckgjBZtLjSVUJVWps=; b=J+DTyyhNtZdiiXzMx2y2zSA6mUqTy6XSYJu7P1mDb1b0Ee+feVzi12fNIqayKsVWEf PMpWFF/LJhgnVDM2CyC/avxQQc4hA7gwomw6nW3Pcaj8ts5JUe5S3KZsACm4qxbBvxXg JCHvdW4RbN/vmXABcx1Oo8w29/4GJxkGSjH3fCmaFT9gJjN8QL/j2KFEY6bhZZLq/rzm i28t2Z/utIzyaA4MpGeI+9EB8GvQIoLoEidTCZbqpA6AePfmukCTgEUGpbW0AH31WUIR xHeVSS8Xhehj5taZ5VKTItTXnhKWFwRtwy3vFD7WmwWZmsKyyEXeSKFtOyJftHdZVZPV swFw== X-Gm-Message-State: AOAM531p+2/2xiT18eWguqk6eKm1PtnGhaeu2YDlanjxUvdP9aTyMZR1 d7XPOMEuO1cYK2AHGJQVt3j4ruf6LME= X-Google-Smtp-Source: ABdhPJz5Ei2tPoRhuOpY0PjjmlFN0YH5BI5U+bZul8LudOTAilj8veU75YDSXKU86XB3mcEPFZFhWQ== X-Received: by 2002:a37:6412:: with SMTP id y18mr5757468qkb.293.1635310393319; Tue, 26 Oct 2021 21:53:13 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:12 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:48 -0400 Message-Id: <20211027045151.9889-17-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This paves the way toward properly fixing https://issues.guix.gnu.org/50957. * guix/profiles.scm (gdk-pixbuf-loaders-cache-file): Add procedure... (%default-profile-hooks): ... and register it as a profile hook. --- guix/profiles.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 9494684228..bdc0d52626 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Huang Ying -;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2017, 2021 Maxim Cournoyer ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Danny Milosavljevic @@ -1161,6 +1161,32 @@ (define build `((type . profile-hook) (hook . emacs-subdirs)))) +(define (gdk-pixbuf-loaders-cache-file manifest) + "Return a derivation that produces a loaders cache file for every gdk-pixbuf +loaders discovered in MANIFEST." + (define gdk-pixbuf ;lazy reference + (module-ref (resolve-interface '(gnu packages gtk)) 'gdk-pixbuf)) + + (mlet %store-monad ((%gdk-pixbuf (manifest-lookup-package + manifest "gdk-pixbuf")) + (gdk-pixbuf-bin -> (file-append gdk-pixbuf "/bin"))) + (define build + (with-imported-modules (source-module-closure + '((guix build glib-or-gtk-build-system))) + #~(begin + (use-modules (guix build glib-or-gtk-build-system)) + (setenv "PATH" (string-append #$gdk-pixbuf-bin ":" (getenv "PATH"))) + (generate-gdk-pixbuf-loaders-cache '#$(manifest-inputs manifest) + (list #$output))))) + (if %gdk-pixbuf + (gexp->derivation "gdk-pixbuf-loaders-cache-file" build + #:local-build? #t + #:substitutable? #f + #:properties + '((type . profile-hook) + (hook . gdk-pixbuf-loaders-cache-file))) + (return #f)))) + (define (glib-schemas manifest) "Return a derivation that unions all schemas from manifest entries and creates the Glib 'gschemas.compiled' file." @@ -1672,6 +1698,7 @@ (define %default-profile-hooks ghc-package-cache-file ca-certificate-bundle emacs-subdirs + gdk-pixbuf-loaders-cache-file glib-schemas gtk-icon-themes gtk-im-modules -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 19/20] gnu: gtk: Replace gdk-pixbuf+svg by librsvg. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041919687 (code B ref 51428); Wed, 27 Oct 2021 04:54:09 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:39 +0000 Received: from localhost ([127.0.0.1]:48152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawU-00057L-EY for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:39 -0400 Received: from mail-qv1-f50.google.com ([209.85.219.50]:39546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawC-000550-KZ for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:21 -0400 Received: by mail-qv1-f50.google.com with SMTP id k29so1022270qve.6 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1FEwlK+43S15/LGTNdlHU39AybSgI5/IxYvToSOlHFE=; b=HJ4PpS5kkNjCv4yHbWxGBg4lvwNqZUL6U/kvCgM/sHOWiCMRifjF7R0PJMK5grNrE2 8BU+Xb8yrd6ZoEJ8hNY5nwN045l1JF/kHzMLqA5/nrZj1B481ajdWrlTPguqoV7hN0AS DIuOGe1k0vyJFzaSQ8dBrL6tVR9aXmtEEwauHc7Blk7DpOYjzKtWZai4JxDBDqQ6/O4q PAM7FaGHCKAtwGyDY4M/lTG6MJR/DpaHQ9/i+lp30n/t7xH4NQkzWRJrEtFK/0Xd4ZDY DwlGgxNZ47zA5f1ahSGDhfaEMt6enDjgm9YGk05hK5B5MPKbzJknreblRw9h1fy/dRoV hHkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1FEwlK+43S15/LGTNdlHU39AybSgI5/IxYvToSOlHFE=; b=VTTxuu6L25iP1IIY3/kVMhPqTo8VCu+uGYlg+VOtTzCxm4mTMhkyH2r977DtEQ43Gs SfdPofUS+9d9H5VSGhEmu+I3G+LmxR0zMgJW72yLaifZJU/h9qZiuzFDWXpulWzE42K6 337AHjA1eXV2/rXjdp0LTpQwHNHt76B5e37lb3VpZle5R/NmKhckBehJdf5b9aUUz6r0 rbLiaUqrIga+DT+yUiiQFZv1GbFpXk01mYHDZKDUaga4tCA1+8I0VBw1ERGhAOLReLgJ ovXfN8PuNuc37AQFoORqIKcCvHjwqDk5VUEgjYhtXHjduLQQuavsmHni7u0nUnrWcuqk uYsw== X-Gm-Message-State: AOAM533w4V1nOVF7VAzXkcM4MsOUfqZ3HCwGHtxaiXRN7FwsG16wldxN IRLQu0ad22nvrKTsVRhuXT0Vj7eN1S0= X-Google-Smtp-Source: ABdhPJzLRxBlnDPWidbksNEzhzvs24qexvSCDq84Rqb4i00ghXCTjGLx4D4aysklTQJV5WsJWMgR6w== X-Received: by 2002:ad4:5a07:: with SMTP id ei7mr497855qvb.39.1635310394863; Tue, 26 Oct 2021 21:53:14 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:14 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:50 -0400 Message-Id: <20211027045151.9889-19-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) With the addition of a profile hook for computing the gdk-pixbuf loaders cache file, there is no longer a need for gdk-pixbuf+svg, and librsvg can propagate gdk-pixbuf without fear, so replace the former for the latter. The replacement was automated with the following command: $ git grep -l ',gdk-pixbuf+svg)' \ | xargs sed 's/(".*" ,gdk-pixbuf+svg)/("librsvg" ,librsvg)/' -i * gnu/packages/gtk.scm (gdk-pixbuf+svg): Delete package. (gtk+-2)[propagated-inputs]: Replace gdk-pixbuf+svg with librsvg. (gtk+)[propagated-inputs]: Likewise. * gnu/packages/gnome.scm (gdk-pixbuf+svg): Add deprecated package. --- gnu/packages/dunst.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 14 +++++++------- gnu/packages/graphviz.scm | 2 +- gnu/packages/gstreamer.scm | 4 ++-- gnu/packages/gtk.scm | 35 +++-------------------------------- gnu/packages/image.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 12 ++++++------ gnu/packages/messaging.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/tryton.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vnc.scm | 2 +- 14 files changed, 28 insertions(+), 57 deletions(-) diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index ce2c04bac6..9f3e4c036c 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -67,7 +67,7 @@ (define-public dunst ("which" ,which))) (inputs `(("dbus" ,dbus) - ("gdk-pixbuf" ,gdk-pixbuf+svg) ; for svg support + ("librsvg" ,librsvg) ; for svg support ("glib" ,glib) ("cairo" ,cairo) ("pango" ,pango) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 938720f928..6cba568119 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -279,7 +279,7 @@ (define-public gnome-maps ("libsoup" ,libsoup) ("libgweather" ,libgweather) ("libxml2" ,libxml2) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib-networking" ,glib-networking) ("geoclue" ,geoclue) ("geocode-glib" ,geocode-glib) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cbdf1d9762..a89cd8e7b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -602,7 +602,7 @@ (define-public libdmapsharing ("vala" ,vala))) (inputs `(("avahi" ,avahi) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gee" ,libgee) ("gst-plugins-base" ,gst-plugins-base) ("gtk+" ,gtk+))) @@ -921,7 +921,7 @@ (define-public gnome-photos (inputs `(("babl" ,babl) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gegl" ,gegl) ("geocode-glib" ,geocode-glib) ("gexiv2" ,gexiv2) @@ -2820,7 +2820,7 @@ (define-public gtg ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("pango" ,pango) @@ -4257,7 +4257,7 @@ (define-public drawing ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("pango" ,pango) @@ -6832,7 +6832,7 @@ (define-public epiphany (inputs `(("avahi" ,avahi) ("gcr" ,gcr) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) ; for loading SVG files + ("librsvg" ,librsvg) ; for loading SVG files ("glib-networking" ,glib-networking) ("gnome-desktop" ,gnome-desktop) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) @@ -8713,7 +8713,7 @@ (define-public gnome-shell ("evolution-data-server" ,evolution-data-server) ("gcr" ,gcr) ("gdm" ,gdm) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gjs" ,gjs) ("gtk" ,gtk) ("gnome-autoar" ,gnome-autoar) @@ -8777,7 +8777,7 @@ (define-public gtk-vnc ("vala" ,vala))) (inputs `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gnutls" ,gnutls) ("libgcrypt" ,libgcrypt) diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 25ff51194f..16fbfb6842 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -357,7 +357,7 @@ (define-public xdot (,(dirname (search-input-file inputs "bin/dot")))))))))) (inputs `(("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("graphviz" ,graphviz) ("gtk+" ,gtk+) ("python-pycairo" ,python-pycairo) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1ac5cd4b8e..2a7679b490 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -311,7 +311,7 @@ (define-public libvisual-plugins (inputs `(("alsa-lib" ,alsa-lib) ("esound" ,esound) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("gtk+" ,gtk+-2) ("jack" ,jack-2) ("libx11" ,libx11) @@ -668,7 +668,7 @@ (define-public gst-plugins-good ("bzip2" ,bzip2) ("cairo" ,cairo) ("flac" ,flac) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("glib-networking" ,glib-networking) ("glu" ,glu) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 0463e26246..5bfc19e19d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -714,35 +714,6 @@ (define-public gdk-pixbuf (home-page "https://wiki.gnome.org/Projects/GdkPixbuf") (license license:lgpl2.1+))) -;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends -;; on gdk-pixbuf, so this new variable. Also, librsvg adds 90MiB to the -;; closure size. -(define-public gdk-pixbuf+svg - (package/inherit gdk-pixbuf - (name "gdk-pixbuf+svg") - (inputs - `(("librsvg" ,librsvg) - ,@(package-inputs gdk-pixbuf))) - (arguments - (substitute-keyword-arguments (package-arguments gdk-pixbuf) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'register-svg-loader - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (librsvg (assoc-ref inputs "librsvg")) - (loaders - (append - (find-files out "^libpixbufloader-.*\\.so$") - (find-files librsvg "^libpixbufloader-.*\\.so$"))) - (gdk-pixbuf-query-loaders - (string-append out "/bin/gdk-pixbuf-query-loaders"))) - (apply invoke - gdk-pixbuf-query-loaders - "--update-cache" - loaders)))))))) - (synopsis "Image loading library, with SVG support"))) - ;;; A minimal variant used to prevent a cycle with Inkscape. (define-public at-spi2-core-minimal (hidden-package @@ -903,7 +874,7 @@ (define-public gtk+-2 ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system) (%current-system))) - gdk-pixbuf+svg + librsvg gdk-pixbuf)) ("glib" ,glib) ("pango" ,pango))) @@ -1005,7 +976,7 @@ (define-public gtk+ ;; SVG support is optional and requires librsvg, which pulls in rust. ;; Rust is not supported well on every architecture yet. ("gdk-pixbuf" ,(if (target-x86-64?) - gdk-pixbuf+svg + librsvg gdk-pixbuf)) ("glib" ,glib) ("libcloudproviders" ,libcloudproviders-minimal) @@ -1267,7 +1238,7 @@ (define-public gtk ;; Following dependencies are referenced in .pc files. `(("cairo" ,cairo) ("fontconfig" ,fontconfig) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("graphene" ,graphene) ("libepoxy" ,libepoxy) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 99852fc205..87093b14fa 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2345,7 +2345,7 @@ (define-public mypaint ("gettext" ,gettext-minimal))) (inputs `(("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("hicolor-icon-theme" ,hicolor-icon-theme) ("libmypaint" ,libmypaint) ("mypaint-brushes" ,mypaint-brushes) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 23a8710b9b..5c72a2f1e1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1687,7 +1687,7 @@ (define-public claws-mail ("enchant" ,enchant) ("expat" ,expat) ("fontconfig" ,fontconfig) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("ghostscript" ,ghostscript) ("glib" ,glib) ("gnupg" ,gnupg) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 08fd3562b3..41165e8de7 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -473,7 +473,7 @@ (define-public libmatekbd ("gobject-introspection" ,gobject-introspection))) (inputs `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gtk+" ,gtk+) ("libx11" ,libx11) @@ -983,7 +983,7 @@ (define-public mate-control-center ("polkit" ,polkit) ("startup-notification" ,startup-notification))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) ; mate-slab.pc + `(("librsvg" ,librsvg) ; mate-slab.pc ("librsvg" ,librsvg))) ; mate-slab.pc (home-page "https://mate-desktop.org/") (synopsis "MATE Desktop configuration tool") @@ -1219,7 +1219,7 @@ (define-public mate-screensaver ("dbus-glib" ,dbus-glib) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libcanberra" ,libcanberra) ("libglade" ,libglade) ("libmatekbd" ,libmatekbd) @@ -1271,7 +1271,7 @@ (define-public mate-utils ("cairo" ,cairo) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libcanberra" ,libcanberra) ("libgtop" ,libgtop) ("libx11" ,libx11) @@ -1324,7 +1324,7 @@ (define-public eom ("exempi" ,exempi) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libcanberra" ,libcanberra) ("libx11" ,libx11) ("libxext" ,libxext) @@ -1384,7 +1384,7 @@ (define-public engrampa ("file" ,file) ("glib" ,glib) ("gtk+" ,gtk+) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("json-glib" ,json-glib) ("libcanberra" ,libcanberra) ("libx11" ,libx11) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b5f39cc408..ef7b9085e5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1306,7 +1306,7 @@ (define-public dino ;; NOTE: Commented-out lines are to be enabled in v0.3.0. `(("atk" ,atk) ("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("glib-networking" ,glib-networking) ("gpgme" ,gpgme) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4a415e9460..c87dd5440a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -738,7 +738,7 @@ (define-public blueman (inputs `(("bluez" ,bluez) ("dbus" ,dbus) - ("gdkpixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gtk+" ,gtk+) ("iproute2" ,iproute) diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index d5cfb63e1b..c1275edd22 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -113,7 +113,7 @@ (define-public tryton `(("glib-compile-schemas" ,glib "bin") ("gobject-introspection" ,gobject-introspection))) (propagated-inputs - `(("gdk-pixbuf" ,gdk-pixbuf+svg) + `(("librsvg" ,librsvg) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) ("python-dateutil" ,python-dateutil) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ebee15e296..b9b1ca64be 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4293,7 +4293,7 @@ (define-public pitivi ("gst-libav" ,gst-libav) ("gsound" ,gsound) ("gtk+" ,gtk+) - ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("libpeas" ,libpeas) ("libnotify" ,libnotify) ("pango" ,pango) diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 4c2b13c93c..00ae2be63d 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -120,7 +120,7 @@ (define-public remmina ("ffmpeg" ,ffmpeg) ("freerdp" ,freerdp) ; for rdp plugin ("gcrypt" ,libgcrypt) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ("librsvg" ,librsvg) ("glib" ,glib) ("gnome-keyring" ,gnome-keyring) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 20/20] gnu: librsvg: Preserve the loaders.cache file. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531041919695 (code B ref 51428); Wed, 27 Oct 2021 04:54:09 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:39 +0000 Received: from localhost ([127.0.0.1]:48154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawV-00057U-79 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:39 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:34733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawD-00055A-Bj for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:21 -0400 Received: by mail-qt1-f171.google.com with SMTP id v17so1415832qtp.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Py7GrCxfSIyPCmwBGrxXGQLikbWG/Wb8KOxTGse2YyY=; b=Ixe2wuIZKEBpJvNVlsiG/J+KdruTrTBV9qIU9Oi8Mif9gdKTFESw/9hHQoL25sk3T0 tmBqprIq7KVO25cvFA7VLfNbK9KnYSRK/o8GJ/OP0D1hKw6+12CXqgWEPWZxfzeXl1yv ILjfwNiDiKu+fpXNiCEaqTZYxcAZR0K9YzxB1Uu5bGYidLoYRfgl5jfyF6Uc+KGMCE1W hYVUHxNEgbmannHfrhrCzrApSXo5JFYCal0GqFIwcQXxPEmkfsy1pygPp03crolX05rL 7WvPIDitSuxJKWOch3ozhkaFzb7uuoerbZh2Q8AvagBYNf0bdQzRDmRyfzJXk3qVbaf8 zwlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Py7GrCxfSIyPCmwBGrxXGQLikbWG/Wb8KOxTGse2YyY=; b=I8vX96XN+hmNN+pxrtWZvAYloUAlLhLGFvE9icHBXqCHwHMfQWXPPlxcq2OuHWAxAj 5iWr5iuukgmvsi4jXCVL543Vs0YRqZvSIWl8xeMQmrI01PDcOyWZeIMOBYlCSdHRl07e gj4pAm9TgsiShSjdR3arn9LpCFGpciOLLdI/99kqdZmMXbo1Da2CMwRdb6Rc4P7wkdqk AeF1ILtuYj5GCiVaj3KCldm6AAfUSOJG+IVPebXa4RF83o03bJEd+1dloaxSD+IfkfLz 5hD5C8ih8Kwj7Fo+bAT6Kg1Aak3qr3iUUqdoMlNHotXzWjt4b9E9bVuUtChdtuXp/Q3Y qHLw== X-Gm-Message-State: AOAM533iG1UdU4FbY9/gmbbPik2KrXhlkfBey058+/A75CHGE3K520SZ NxS7LRyADDvQPZNe+dJ9tBxlw4pbvfg= X-Google-Smtp-Source: ABdhPJwL/t2SASENPxW1hkSmA1RFlItM7H2C0sed3W+Xc9vF5jSF4F9vRZjclvtKAm7ut+g83r4aTA== X-Received: by 2002:ac8:7f42:: with SMTP id g2mr29061913qtk.286.1635310395754; Tue, 26 Oct 2021 21:53:15 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:15 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:51 -0400 Message-Id: <20211027045151.9889-20-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Now that we have a search path that honors it on gdk-pixbuf, it is more valuable to keep it. * gnu/packages/gnome.scm (librsvg)[phases]{pre-configure}: Install loaders, cache file to locations derived from %gdk-pixbuf-loaders-cache-file. --- gnu/packages/gnome.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a89cd8e7b4..7556b0cf84 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3487,17 +3487,20 @@ (define-public librsvg (substitute* '("Makefile.am" "Makefile.in") (("--locked") "")))) (add-before 'configure 'pre-configure - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" ;; By default the gdk-pixbuf loader is installed under ;; gdk-pixbuf's prefix. Work around that. (("gdk_pixbuf_moduledir = .*$") (string-append "gdk_pixbuf_moduledir = " - "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/" - "loaders\n")) - ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg. - (("gdk_pixbuf_cache_file = .*$") - "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")))) + "$(prefix)/" + ,(dirname %gdk-pixbuf-loaders-cache-file) "/" + "loaders\n"))) + (substitute* "configure" + (("gdk_pixbuf_cache_file=.*") + (string-append "gdk_pixbuf_cache_file=" + (assoc-ref outputs "out") "/" + ,%gdk-pixbuf-loaders-cache-file "\n"))))) (add-after 'configure 'gnu-configure (lambda* (#:key outputs #:allow-other-keys #:rest args) (apply (assoc-ref gnu:%standard-phases 'configure) -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 18/20] gnu: gdk-pixbuf: Add a search path for the loaders cache file. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531042019701 (code B ref 51428); Wed, 27 Oct 2021 04:54:10 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:40 +0000 Received: from localhost ([127.0.0.1]:48156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawV-00057c-Kx for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:39 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:41660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawB-00054h-QE for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:24 -0400 Received: by mail-qv1-f48.google.com with SMTP id gh1so1009798qvb.8 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=faSj/yY6YLijfO/oM9e4GqCFWGcijsze0z1f31L7cDg=; b=lhANQakIqbOnKLIkLtBcyeiXHILEC8TnC9odDXJgv7fCnlUJwxq+x8hnFhgNbD/aJ3 ZePn77c5gfR8oSreqRh4NQ6DFm1Uep6LI4Z42hIgyM5CQDKm275Qnp7JQG/ehVb4Y5yR nGS3aidrAA4FdcMKvfJfIJ+57nO59z+GXpYQRqRBvy3VLcMxgHfiTQ0vyv3PMecEzeq/ fydnh43e2dLjNLvC3qkdarnsozBhJKx/0qzrpOYU520snakram8/84vzC9nCoWs9j4Ay 6/47+kZb+3T+gb606ioPmkL0iendbInh4zc33w19V4cHec0x1Cb4Fy176LrRf1mr+sDg k6Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=faSj/yY6YLijfO/oM9e4GqCFWGcijsze0z1f31L7cDg=; b=VeHtsoqE0GYYpb5bxYu1kO9R9yncx/1xq8+oHd8KI/iTwHd8J3hFanFStWpw2hA6gS HLksjiiMWvY+kbfed2vL6uq/D12P4TyMcKwMzqtppJFo9V3LFdPihJzsKrXGZVmMJBNk 3DmqieM/j0YJsMncsHrOAraS4rjbJEesM477Dm70JprGtcfU6DPaL6y0Z/g5VCrpsawH 368wIDoU2iOJ1mLD1wX7elnyIMQXTjfRsiybmMgxgO1V9tRPk2ZnGd2HoF0J6QpVUmtw g4GYRaLvcptkg1mX92rbeygPKmOZYJrXfj2E8szep1vVsLXzFavUTBF2Cya4njJdqoSk hZWQ== X-Gm-Message-State: AOAM531Yi5cFL4i9b80Ybqr8Wjekt10GfB5Gby3ximvnf6CByInbURPb QMfbWdNt8Ewa3Z+zmripWax5tdKHe4E= X-Google-Smtp-Source: ABdhPJz4ZgLwoEd5QKhrB52q9bbWXImM65ALJCZlCFUu/+hEGpFySUJKHdyroGG7jTJnZLjv9nMxmA== X-Received: by 2002:a05:6214:1d21:: with SMTP id f1mr16461242qvd.6.1635310394141; Tue, 26 Oct 2021 21:53:14 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:13 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:49 -0400 Message-Id: <20211027045151.9889-18-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . The previous commit added a profile hook to compute a gdk-pixbuf loaders cache file. This change enables gdk-pixbuf to make use of it. * gnu/packages/gtk.scm (gdk-pixbuf)[native-search-paths]: Add a search path specification to set the GDK_PIXBUF_MODULE_FILE environment variable. --- gnu/packages/gtk.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 22106c1185..0463e26246 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -52,6 +52,8 @@ (define-module (gnu packages gtk) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix build utils) #:select (alist-replace)) + #:use-module ((guix build glib-or-gtk-build-system) + #:select (%gdk-pixbuf-loaders-cache-file)) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -697,6 +699,14 @@ (define-public gdk-pixbuf ("perl" ,perl) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) + (native-search-paths + ;; This file is produced by the gdk-pixbuf-loaders-cache-file + ;; profile hook. + (list (search-path-specification + (variable "GDK_PIXBUF_MODULE_FILE") + (files (list %gdk-pixbuf-loaders-cache-file)) + (separator #f) ;single valued + (file-type 'regular)))) (synopsis "Image loading library") (description "GdkPixbuf is a library that loads image data in various formats and stores it as linear buffers in memory. The buffers can then be -- 2.33.1 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 14:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163534596026514 (code B ref 51428); Wed, 27 Oct 2021 14:46:01 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 14:46:00 +0000 Received: from localhost ([127.0.0.1]:50157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkBk-0006tB-8j for submit@debbugs.gnu.org; Wed, 27 Oct 2021 10:46:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkBV-0006aN-7P for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 10:45:58 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfkBP-0004W3-Kd; Wed, 27 Oct 2021 10:45:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=MMRefPH15OO7TAIifuYkG5O0xBW0WXPJCitLJdSx7kE=; b=YGL78q/hOui+T3kjDcLA b3KL4DI46mhQ0InqligCPiwemTLHMjHDfY/4JpKdcXo+xUF5+ussyNuD7QGiJgf8EyLubma+VCU75 M2Suw0ly4CjOW6ZQNsVXNOtF9F0pQ70wGJuzrOWlf1x08l3R6JpY6/9K+zNAuLhONUx5laSkP4W0B fN3eE84kPsw+CEcwMUAbhYqJScOsmHoDRNMzS66qht/hkqs/dQbF9uDk5nFV7L/s02fAbQkB50Oi+ NLp0FOK4tAlFDMc6ZM0liRoebraRlSkPUej44OzCGW+JE5UjMVV9wvPRISLnd7+PyZUcnOidNENmj S0kmozqwFBRA1w==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:54240 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfkBK-00049l-S6; Wed, 27 Oct 2021 10:45:39 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> <20211027045151.9889-17-maxim.cournoyer@gmail.com> Date: Wed, 27 Oct 2021 16:45:32 +0200 In-Reply-To: <20211027045151.9889-17-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Wed, 27 Oct 2021 00:51:48 -0400") Message-ID: <87mtmufrw3.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Maxim Cournoyer skribis: > This paves the way toward properly fixing https://issues.guix.gnu.org/509= 57. > > * guix/profiles.scm (gdk-pixbuf-loaders-cache-file): Add procedure... > (%default-profile-hooks): ... and register it as a profile hook. [...] > + (mlet %store-monad ((%gdk-pixbuf (manifest-lookup-package > + manifest "gdk-pixbuf")) You could call it =E2=80=98gdk-pixbuf?=E2=80=99 since it=E2=80=99s used as = a boolean. > + (gexp->derivation "gdk-pixbuf-loaders-cache-file" build > + #:local-build? #t > + #:substitutable? #f > + #:properties > + '((type . profile-hook) > + (hook . gdk-pixbuf-loaders-cache-file))) No showstopper but we should eventually add this to (guix status) for nicer reporting. My 2=C2=A2, Ludo=E2=80=99. From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 14:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163534613031625 (code B ref 51428); Wed, 27 Oct 2021 14:49:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 14:48:50 +0000 Received: from localhost ([127.0.0.1]:50162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkET-0008E1-Sd for submit@debbugs.gnu.org; Wed, 27 Oct 2021 10:48:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkES-0008Dm-Bz for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 10:48:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfkEN-0001ZV-39; Wed, 27 Oct 2021 10:48:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=ATN3Dif2WLyX0g0Nv/GZWB9cmEzsH0gxys49X0PvyWw=; b=Q1aTJy+1ov141kXvs8rs f+WD7R5lTUavuvVIR40VIT6V+9nKvYW2u2O2GuaZdJNZzg87AgPXEfygq1LsWDpeIZzFvBaP4wXlo Uos3Z2C4zRhFKeR9fo8pPeUm5mAeARLb0kQxgGI8R8ECjnk96vXIHp+YaG9zq8LzGAZs5JYUqFizt QhwpvueE0dkgWDwyCXNh1vdZB5uhUI/xVYqxi2vCHYkc8nPP8QG9QfLwRv3uqbuJXm7DfgOVgcguB oQ0FUY4P/43RDI+Z/IA6nWQ/UPHmfRTfds6QoRTZFEX2/7T4U4AJzfnO5HPmobqD5+Wt7GQkwx2Fw Cegn6InsJD1yAQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=55008 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfkEM-0004T4-Lh; Wed, 27 Oct 2021 10:48:42 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> <20211027045151.9889-16-maxim.cournoyer@gmail.com> Date: Wed, 27 Oct 2021 16:48:40 +0200 In-Reply-To: <20211027045151.9889-16-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Wed, 27 Oct 2021 00:51:47 -0400") Message-ID: <87h7d2frqv.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Maxim Cournoyer skribis: > +(define %gdk-pixbuf-loaders-cache-file > + "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache") A comment indicating that this file is built by the hook would be nice, but let=E2=80=99s not trigger a rebuild just for that. Isn=E2=80=99t the hard-coded version number going to cause troubles when gdk-pixbuf is upgraded? Or if we have some packages using a newer version while others remain on 2.10.0? Thanks, Ludo=E2=80=99. From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 14:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163534630431999 (code B ref 51428); Wed, 27 Oct 2021 14:52:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 14:51:44 +0000 Received: from localhost ([127.0.0.1]:50167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkHI-0008K2-9A for submit@debbugs.gnu.org; Wed, 27 Oct 2021 10:51:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkHA-0008Je-2T for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 10:51:43 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39218) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfkH1-00042i-Tf; Wed, 27 Oct 2021 10:51:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=zb9hGpNk7G7AzdeAQqGCY1+wizzNDuLmVCtch0hihD8=; b=KrzaYam5ge6dpQ+iPGVy JVAd0pd8kWonj8JEmUcs6o8WM/oGSN6irSTdapub019vvnSz8/jR/95Mwg9QgP+uv+PBTyFr9u/9L 7lfAQ3UN7OWVAf316+gzxHeFD/u1fia+bdde/YWUwlWeeV/Vf0ze9d0sEUeE0Rx3QdtTZVibodT/a hrJwE+nkm14pyO4+mSjkyYzUOPpMrNETA7spH5LJcg+Geau9woZd69Dw+liVLcTq0QYEcYJU+HT/S vzikxzoSHEzsI3pWua1XdmKJ/wFCTpPxOXbqgzABoxLeE8vw/vZqH9fcYiwpv1/KC4cWZ72WFpVpP V0xOTF8Qj8KuTA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:54242 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfkH1-0004tC-Gz; Wed, 27 Oct 2021 10:51:27 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87v91jcdvy.fsf@gmail.com> Date: Wed, 27 Oct 2021 16:51:25 +0200 In-Reply-To: <87v91jcdvy.fsf@gmail.com> (Maxim Cournoyer's message of "Wed, 27 Oct 2021 00:04:01 -0400") Message-ID: <87bl3afrma.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Maxim Cournoyer skribis: > I've experimented quite a bit with core-updates-frozen-batched-changes > in the last weeks, and it seems to be in a decent shape, good enough to > merge into core-updates-frozen, I think. Woo! Congrats! > I'd like to bring attention to some non-trivial changes that I included > in the branch: > > 1. merging of the staging branch -- quite a few conflicts had to be > resolved. > > 2. Replacement of inkscape@0.92 by inkscape@1.1, which required solving > some dependency cycles. > > 3. Fix for https://issues.guix.gnu.org/50957 via a new search path > specification on gdk-pixbuf and accompanying build phase and profile > hook. Well done! > I'll send the corresponding patches for review, which can also be > consulted directly on the core-updates-frozen-batched-changes branch, > which I've manually built on Berlin for things such as Rust and > ungoogled-chromium. > > I'd like to merge it into core-updates-frozen by the beginning of > November, unless there are problems you can spot :-). I=E2=80=99ve sent minor comments (no blockers) regarding the bits I=E2=80= =99m the most familiar with. I=E2=80=99d say that if your testing is conclusive, you can probably merge = while fresh substitutes are still around! Thanks, Ludo=E2=80=99. From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 14:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163534637032124 (code B ref 51428); Wed, 27 Oct 2021 14:53:01 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 14:52:50 +0000 Received: from localhost ([127.0.0.1]:50172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkIL-0008M3-SJ for submit@debbugs.gnu.org; Wed, 27 Oct 2021 10:52:50 -0400 Received: from mx.kolabnow.com ([212.103.80.153]:33200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkII-0008Ll-LW for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 10:52:48 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 36B1540BE3; Wed, 27 Oct 2021 16:52:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1635346358; x=1637160759; bh=Oi6iKQBtZPPrQHj31m/BB6DBze10iuEjBoI NasPBnBg=; b=Au8UJZEcjeG0NRkgC3FdBNnkiayLkZRwGu3xhrGMumDOyCTEtMa TYPE90ps9EBPuNm58M+xHX3nsqnr2CvQ0fzfhj1w1YI6qUHDbbItcHIifW/2vvMK U59BcZ5zz+lY+P+kWHJd7JY121jaLaYAu+dOpnBhcnDZZnWbPYuVzEYe5Op0YHSB XSHQbaaEjm5uaQjf0zZgWSypayt510Obqfp/FRSiYnBwe9lAZlPyHnuTwX08oRfL bPhojKfqGxQbt4KHTla/fQW715W4Mp2+FO5yYQFIaZswD/bx8PRPEfu4I551ZhPm fhvDlPjM5JmtPxUrZ5Eu/7h1fCv+kfpuc14pQrRWGW7vXdg6GBOb9Q+fasYC8dEh E1NOxvYDfTcLR74+kCMiYAqpVl787KS7zH64b/32lgjWHAU9Rim5DZ85WV6cYcSR NySC/xoycB0jCToCLHrogLF+qYTJ1f/gn+dX1C29L2VqLdVdZ1TUNQhi2YhRRcfN LZ/NY2rsN8ARYVVm5m3fWa1nnAvEaezsU8IjwigksuMXp6svP9ActERD7/ABNsvG 1LbhVk0GwsnIG0LD9VlMfVwF9oEW+FaC8dp7231XTL056Un/8nrAOKSTZBLtZeqS TpzdK29rztZ/os+naZnqHJKTKDmY4KeAiiyQkVV/RwrsUT/pceZhByeI= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.899 X-Spam-Level: X-Spam-Status: No, score=-1.899 tagged_above=-10 required=5 tests=[BAYES_00=-1.9, HTML_MESSAGE=0.001] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8NV0hrmeVlmP; Wed, 27 Oct 2021 16:52:38 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id 6940A40814; Wed, 27 Oct 2021 16:52:38 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id D21084E78; Wed, 27 Oct 2021 16:52:37 +0200 (CEST) From: Thiago Jung Bauermann Date: Wed, 27 Oct 2021 11:52:32 -0300 Message-ID: <8713634.9p3TXzYIDv@popigai> In-Reply-To: <87v91jcdvy.fsf@gmail.com> References: <87v91jcdvy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="nextPart3703204.0FojuZWfBJ" Content-Transfer-Encoding: 7Bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --nextPart3703204.0FojuZWfBJ Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Hello Maxim, Em quarta-feira, 27 de outubro de 2021, =C3=A0s 01:04:01 -03, Maxim Cournoy= er escreveu: > Hello, >=20 > I've experimented quite a bit with core-updates-frozen-batched-changes > in the last weeks, and it seems to be in a decent shape, good enough to > merge into core-updates-frozen, I think. Nice! Thank you very much for this work! > I'd like to merge it into core-updates-frozen by the beginning of > November, unless there are problems you can spot :-). I wouldn=E2=80=99t say it=E2=80=99s a problem but it=E2=80=99s an additiona= l significant change to be aware of: polkit is updated to depend on mozjs-78, which depends on Rust which only b= uilds on=20 x86_64. The practical consequence is that polkit and all its dependents (wh= ich include=20 GTK+ and some Qt libraries) become x86_64-only packages. I=E2=80=99m not sa= ying it=E2=80=99s a problem,=20 but it=E2=80=99s a big change and I thought it would beuseful to mention it. I discovered this yesterday night when playing a bit with the core-updates-= frozen- batched-changes branch on ppc64le. This may be a temporary limitation, because there are two pull requests for= polkit=20 replacing mozjs with duktape: https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35[1] https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97[2] =2D-=20 Thanks, Thiago =2D------- [1] https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35 [2] https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97 --nextPart3703204.0FojuZWfBJ Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset="UTF-8"

Hello Maxim,


Em quarta-feira, 27 de outubro de 2021, =C3=A0s 01:04:01 -03, Maxim Cour= noyer escreveu:

>= ; Hello,

>= ;

>= ; I've experimented quite a bit with core-updates-frozen-batched-changes

>= ; in the last weeks, and it seems to be in a decent shape, good enough to

>= ; merge into core-updates-frozen, I think.


Nice! Thank you very much for this work!


> I'd like to merge it into core-updates-frozen by the beginning of

>= ; November, unless there are problems you can spot :-).


I wouldn=E2=80=99t say it=E2=80=99s a problem but it=E2=80=99s an additi= onal significant change to be aware of:


polkit is updated to depend on mozjs-78, which depends on Rust which onl= y builds on x86_64. The practical consequence is that polkit and all its de= pendents (which include GTK+ and some Qt libraries) become x86_64-only pack= ages. I=E2=80=99m not saying it=E2=80=99s a problem, but it=E2=80=99s a big= change and I thought it would beuseful to mention it.


I discovered this yesterday night when playing a bit with the core-updat= es-frozen-batched-changes branch on ppc64le.


This may be a temporary limitation, because there are two pull requests = for polkit replacing mozjs with duktape:


https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35

h= ttps://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97


--

Tha= nks,

Thi= ago

--nextPart3703204.0FojuZWfBJ-- From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thiago Jung Bauermann Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.16353490524804 (code B ref 51428); Wed, 27 Oct 2021 15:38:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 15:37:32 +0000 Received: from localhost ([127.0.0.1]:50255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkzc-0001FQ-CV for submit@debbugs.gnu.org; Wed, 27 Oct 2021 11:37:32 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:44819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfkzZ-0001FA-5O for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 11:37:30 -0400 Received: by mail-qt1-f181.google.com with SMTP id c28so2792167qtv.11 for <51428@debbugs.gnu.org>; Wed, 27 Oct 2021 08:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=s8qoSgLTbZ8znm8TW9MF2T/TwkNEtRG8LVQnvQCMB3I=; b=PysmXeBA0HLameXeKHZhcmVyYz3f5ll0mol8KedtllVlpxPX6uNM2MNUf3C3IeuDOP CZ8znVINBzoTmMyKEBY6fGq1AFwFzLD5ZegIXQ+8l7WJW5qdci80AuFV8lo4wbEdcowD 4vcpxmbus+hk3drK5JgFAztpE8WsixH49B+GcmIwq9gSLLkRu+VhqouyMy3O/swIzEtG 2N9OMWoR5RXWCjv6B5Te98AyAMtPEzu2bDPnAk+Ce1DDrTm/uAYFHiYcqXAF77N2vd5B 3A6GTZhC+Jfy80uboaAEM8nUaQuYmvxlAIF4t4oGqUSlInKp0dHZq5o5N0xe3gT6HDn4 zTaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=s8qoSgLTbZ8znm8TW9MF2T/TwkNEtRG8LVQnvQCMB3I=; b=o6MRCgfAGELQf5i3hK+zUnLy1VYHjPgHmuLgw6FNqGY0vI7hkIj38bpC7OWyhnjykz YOWrYtazmfVXhedQ/zlLXiN65jLweHfH/sUkDUd4kBFyK5IpOjnE9VIbXXk45lb/RawJ bo0xnWPrjgQv5ZCyzRNvffeZP+ojbWnVm5LciD8/Z7FhJ79dc5lb+NYRmgQdU6VSUKh/ dzdinU4WgBT1GXsM9/CG+7WiBYOthsoGdJYe0FyHE0/UWLt2UP5wUT/0Dt3o/VGlO74z 1AMrixTquUQpP7msKXJMcQILhOlO82OMm2hfohCdnd4x3cBSJEZDq6y29kj/HKvh7quL K+mQ== X-Gm-Message-State: AOAM5332QHE/upjemazjeQiAxgWbKl0umAYv1c6Z+Qw8wajdfhTdg1aa f7Vo1M7E8brdl64c3O2MDcKTV3ipauI= X-Google-Smtp-Source: ABdhPJxZcwIiP4lLizYSwAMqp5JjYqV3VBj/YVRCHkt2rgXQ1R2WXXAj06twuj4E9aNO1wXo2MbMpg== X-Received: by 2002:ac8:5a01:: with SMTP id n1mr31836030qta.77.1635349043409; Wed, 27 Oct 2021 08:37:23 -0700 (PDT) Received: from hurd (dsl-152-69.b2b2c.ca. [66.158.152.69]) by smtp.gmail.com with ESMTPSA id j23sm138027qtr.23.2021.10.27.08.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 08:37:22 -0700 (PDT) From: Maxim Cournoyer References: <87v91jcdvy.fsf@gmail.com> <8713634.9p3TXzYIDv@popigai> Date: Wed, 27 Oct 2021 11:37:21 -0400 In-Reply-To: <8713634.9p3TXzYIDv@popigai> (Thiago Jung Bauermann's message of "Wed, 27 Oct 2021 11:52:32 -0300") Message-ID: <871r46cwcu.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Thiago, Thiago Jung Bauermann writes: > Hello Maxim, > > Em quarta-feira, 27 de outubro de 2021, =C3=A0s 01:04:01 -03, Maxim Courn= oyer escreveu: >> Hello, >>=20 >> I've experimented quite a bit with core-updates-frozen-batched-changes >> in the last weeks, and it seems to be in a decent shape, good enough to >> merge into core-updates-frozen, I think. > > Nice! Thank you very much for this work! > >> I'd like to merge it into core-updates-frozen by the beginning of >> November, unless there are problems you can spot :-). > > I wouldn=E2=80=99t say it=E2=80=99s a problem but it=E2=80=99s an additio= nal significant change to be aware of: > > polkit is updated to depend on mozjs-78, which depends on Rust which only= builds on=20 > x86_64. The practical consequence is that polkit and all its dependents (= which include=20 > GTK+ and some Qt libraries) become x86_64-only packages. I=E2=80=99m not = saying it=E2=80=99s a problem,=20 > but it=E2=80=99s a big change and I thought it would beuseful to mention = it. > > I discovered this yesterday night when playing a bit with the core-update= s-frozen- > batched-changes branch on ppc64le. Good observation! Did rust ended up building and working fine there? I'm hoping that with the reduced Rust bootstrap chain that starts with 1.39 and uses newer components, it may finally be more accessible to other architectures. > This may be a temporary limitation, because there are two pull requests f= or polkit=20 > replacing mozjs with duktape: > > https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35[1] > https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97[2] Good to know! Thank you, Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 16:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163535202019007 (code B ref 51428); Wed, 27 Oct 2021 16:27:01 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 16:27:00 +0000 Received: from localhost ([127.0.0.1]:50395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfllN-0004wM-HT for submit@debbugs.gnu.org; Wed, 27 Oct 2021 12:27:00 -0400 Received: from mx.kolabnow.com ([212.103.80.155]:45184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfllL-0004w5-5J for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 12:26:52 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id DFD1AB8E; Wed, 27 Oct 2021 18:26:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1635352002; x=1637166403; bh=JzxGsDje/wWk123Ujd5AHpVLbagaTuI7wXZ U/A/8u30=; b=iJgkIyMFpr4kMlKuW+p1z5dAOfCI8IvFpzCVANfTyH8QPFLD5hX a7KTUTV62Y9S1gfHZQDlOgcy5+9/drPAzmqhS9kHCs7BoTszy/LrmCVOiTK8ZejZ YrVgxHIcblG0jlSDKUVX3G5YHxRaJairHwt7gSeMvH8OWtO8CIzBY7db+OocUvUh qdjityie2kcPrMVfE+eUWSGlN9bXYiHy03tDsJiJzAyoSlJtDbZRv3yNoG+BRgf4 3aCjJBPtGPcM5cuPH5Hf8LUl6xadCFWfvh/vs0e9R6nzMBsAXi/3OT8mAEp2tAxv THe4ZTHahB/x5YjvdBkOMoUe4L94eHWOBFFRWGO3H4udzJsPOVCgPnOrCCJgFNvT vf+C+cV6gtPiSMPDmGUQr2Tf4U29Xa5TA8hNwzn3YaI92Md6siNF5pKoOYz/zV33 evcQIO1ISN/b3NlLyBbiMYN0CXu6oa7SWNPhKoKtzskJKiIeS/wpyhTY/tngz+VH rdRl4u2+vEUXTOflcI5OTMn7mYHgDXadvOSDDkFkw1jhOC/P+a36y6GxFA6Y4DDp uzJmL5nKEBKqpJHZ3aOSAmyZZ1IM4CW9cY4m/zuF5fNUqVXwqZn0yw6CFyth+5DP JSDPimlaigpRD4AbHa1kWGsuST43duilTUfxGYt79kmk+igS0BULzXs4= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.898 X-Spam-Level: X-Spam-Status: No, score=-1.898 tagged_above=-10 required=5 tests=[BAYES_00=-1.9, HTML_MESSAGE=0.001, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2ZbnJuRGs87W; Wed, 27 Oct 2021 18:26:42 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id ABE5E709; Wed, 27 Oct 2021 18:26:42 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 419CB4BB0; Wed, 27 Oct 2021 18:26:42 +0200 (CEST) From: Thiago Jung Bauermann Date: Wed, 27 Oct 2021 13:26:37 -0300 Message-ID: <4222209.gjDTJ53qjz@popigai> In-Reply-To: <871r46cwcu.fsf@gmail.com> References: <87v91jcdvy.fsf@gmail.com> <8713634.9p3TXzYIDv@popigai> <871r46cwcu.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="nextPart4957271.4qJydBEjh6" Content-Transfer-Encoding: 7Bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --nextPart4957271.4qJydBEjh6 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Hello Maxim, Em quarta-feira, 27 de outubro de 2021, =C3=A0s 12:37:21 -03, Maxim Cournoy= er escreveu: > Thiago Jung Bauermann writes: > > Em quarta-feira, 27 de outubro de 2021, =C3=A0s 01:04:01 -03, Maxim Cou= rnoyer escreveu: > >> I'd like to merge it into core-updates-frozen by the beginning of > >> November, unless there are problems you can spot :-). > >=20 > > I wouldn=E2=80=99t say it=E2=80=99s a problem but it=E2=80=99s an addit= ional significant change > > to be aware of: > >=20 > > polkit is updated to depend on mozjs-78, which depends on Rust which > > only builds on x86_64. The practical consequence is that polkit and > > all its dependents (which include GTK+ and some Qt libraries) become > > x86_64-only packages. I=E2=80=99m not saying it=E2=80=99s a problem, bu= t it=E2=80=99s a big > > change and I thought it would beuseful to mention it. > >=20 > > I discovered this yesterday night when playing a bit with the > > core-updates-frozen- batched-changes branch on ppc64le. >=20 > Good observation! Did rust ended up building and working fine there? It didn=E2=80=99t. mrustc builds, but when rust=E2=80=99s build phase tries= to use it, mrustc errors out: =2D-8<---------------cut here---------------start------------->8--- bin/minicargo rustc-1.39.0-src/src/libstd --vendor-dir rustc-1.39.0-src/ven= dor --script-overrides script-overrides/stable-1.39.0-linux/ --output-dir o= utput/ -j8 --manifest-overrides rustc-1.39.0-overrides.toml > /tmp/guix-build-rust-1.39.0.drv-0/mrustc/bin/mrustc -Z print-cfgs Unknown target name '' Process was terminated with signal 6 EXCEPTION: Unable to invoke compiler to get config options make: *** [minicargo.mk:82: output/libstd.rlib] Error 1 =2D-8<---------------cut here---------------end--------------->8--- > I'm hoping that with the reduced Rust bootstrap chain that starts with > 1.39 and uses newer components, it may finally be more accessible to > other architectures. There=E2=80=99s an unmerged PR for mrustc adding support for ppc64 but I ha= ven=E2=80=99t tried it: https://github.com/thepowersgang/mrustc/pull/159[1] Accessing the link now, I see that someone reported being able to bootstrap rustc 1.29 on powerpc64le-linux with it! \o/ I=E2=80=99ll try it out within the next couple of days and send a patch if = it works. > > This may be a temporary limitation, because there are two pull requests > > for polkit replacing mozjs with duktape: > >=20 > > https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35[1] > > https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97[2] >=20 > Good to know! And duktape builds on ppc64le. :-) Changing subjects a bit: I forgot to report in my last email that I tested: $ guix pull --url=3D$HOME/src/guix \ --branch=3D core-updates-frozen-batched-changes on powerpc64le-linux and it worked. Well, almost. It did when I included the mariadb patch from https://issues.guix.gnu.org/51376[2] (which is alrea= dy in core-updates-frozen). =2D-=20 Thanks, Thiago =2D------- [1] https://github.com/thepowersgang/mrustc/pull/159 [2] https://issues.guix.gnu.org/51376 --nextPart4957271.4qJydBEjh6 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset="UTF-8"

Hello Maxim,


Em quarta-feira, 27 de outubro de 2021, =C3=A0s 12:37:21 -03, Maxim Cour= noyer escreveu:

>= ; Thiago Jung Bauermann <bauermann@kolabnow.com> writes:

>= ; > Em quarta-feira, 27 de outubro de 2021, =C3=A0s 01:04:01 -03, Maxim = Cournoyer escreveu:

>= ; >> I'd like to merge it into core-updates-frozen by the beginning o= f

>= ; >> November, unless there are problems you can spot :-).

>= ; >

>= ; > I wouldn=E2=80=99t say it=E2=80=99s a problem but it=E2=80=99s an ad= ditional significant change

>= ; > to be aware of:

>= ; >

>= ; > polkit is updated to depend on mozjs-78, which depends on Rust which=

>= ; > only builds on x86_64. The practical consequence is that polkit and<= /p>

>= ; > all its dependents (which include GTK+ and some Qt libraries) become=

>= ; > x86_64-only packages. I=E2=80=99m not saying it=E2=80=99s a problem,= but it=E2=80=99s a big

>= ; > change and I thought it would beuseful to mention it.

>= ; >

>= ; > I discovered this yesterday night when playing a bit with the

>= ; > core-updates-frozen- batched-changes branch on ppc64le.

>= ;

>= ; Good observation!  Did rust ended up building and working fine there= ?


It didn=E2=80=99t. mrustc builds, but when rust=E2=80=99s build phase tr= ies to use it,

mru= stc errors out:


--8<---------------cut here---------------start------------->8---<= /p>

bin= /minicargo rustc-1.39.0-src/src/libstd --vendor-dir rustc-1.39.0-src/vendor= --script-overrides script-overrides/stable-1.39.0-linux/ --output-dir outp= ut/ -j8 --manifest-overrides rustc-1.39.0-overrides.toml

>= ; /tmp/guix-build-rust-1.39.0.drv-0/mrustc/bin/mrustc -Z print-cfgs

Unk= nown target name ''

Pro= cess was terminated with signal 6

EXC= EPTION: Unable to invoke compiler to get config options

mak= e: *** [minicargo.mk:82: output/libstd.rlib] Error 1

--8= <---------------cut here---------------end--------------->8---


> I'm hoping that with the reduced Rust bootstrap chain that starts w= ith

>= ; 1.39 and uses newer components, it may finally be more accessible to

>= ; other architectures.


There=E2=80=99s an unmerged PR for mrustc adding support for ppc64 but I= haven=E2=80=99t

tri= ed it:


https://git= hub.com/thepowersgang/mrustc/pull/159


Accessing the link now, I see that someone reported being able to bootst= rap

rus= tc 1.29 on powerpc64le-linux with it!  \o/


I=E2=80=99ll try it out within the next couple of days and send a patch = if it works.


> > This may be a temporary limitation, because there are two pull= requests

>= ; > for polkit replacing mozjs with duktape:

>= ; >

>= ; > https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/35[1]<= /p>

>= ; > https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/97[2]<= /p>

>= ;

>= ; Good to know!


And duktape builds on ppc64le. :-)


Changing subjects a bit: I forgot to report in my last email that I test= ed:


$ guix pull --url=3D$HOME/src/guix \

&nb= sp;   --branch=3D core-updates-frozen-batched-changes


on powerpc64le-linux and it worked. Well, almost. It did when I included=

the= mariadb patch from https://i= ssues.guix.gnu.org/51376 (which is already

in = core-updates-frozen).


--

Tha= nks,

Thi= ago

--nextPart4957271.4qJydBEjh6-- From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 17:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163535710628641 (code B ref 51428); Wed, 27 Oct 2021 17:52:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 17:51:46 +0000 Received: from localhost ([127.0.0.1]:50489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfn5V-0007Rs-6p for submit@debbugs.gnu.org; Wed, 27 Oct 2021 13:51:46 -0400 Received: from mail-qv1-f54.google.com ([209.85.219.54]:42891) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfn5K-0007RU-N1 for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 13:51:43 -0400 Received: by mail-qv1-f54.google.com with SMTP id jk5so2293184qvb.9 for <51428@debbugs.gnu.org>; Wed, 27 Oct 2021 10:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=TUwYq4G9GiGYivPjpN1RSDd97wnAkNLwAEDCgRMf1U0=; b=k9OkvonLHWjDJnXIYx/Zpa3vTzS1bGvBtNeO9ahmVHE3xFWpe9HKfkbvCTRYDCrIkE ZDBkKtHcXKapB3nCmVKLYdhV33VPl6wZtvFBF7bngf+VH3kxL9sSOCd8hLzAFnBzhgyE CTFShRM4vC4PO3fi6dv4IL4LmCKXhPqjdmOIw6jfbG+b2eJ0iLEDr7lb2RX2gC0Vum/T 0r/4D7xi259ChCYI2tZAjZi+C7nO4AEyq2LsRHeJ42N7Zm9hTpyGKgkPAH+ZNh0KOeKz nBSuUpEnA/l5aMbjg/Lp3TV7xkERXLr8Q9XTw/UtWFlb29XXFx5T52ku5+ibFboqIWua 0peg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=TUwYq4G9GiGYivPjpN1RSDd97wnAkNLwAEDCgRMf1U0=; b=5D0mFmZGsi0vCG+BqXa3NMjyW5aWSxDmty0MluEPJX76Pg/98kSzUs9omg1W9ZNb1L 4mjHY+1/4Jl+aAfYVwnwlYgzfuQ45gw078kgHr8W5DNeFYWk1pvmZBTnShrlh7xKE402 JqFnVhM0NeE1YRCuA6oPhQYRURC9BxLr6TPmlTmCD1n2QevTAavaixdjFtP9JV4ZCI3H RKeukNi3KstfaIgfA5miDmKrehgjBAFyGwRwYf3Dx9zaiaKBf6pCp/XNBrjlkBOTAckZ HPpQ/RCXUf7Cg3HF7KDyjDM9qNx5g00lideQIAfkLA8/xG77yQsGlNVr3KLbccocXHMd fftw== X-Gm-Message-State: AOAM532vqq2/Pjph/Kf5iCwNQrz3JgJxQtKtM0WNzm+dTf+dFcqpTbpQ pFiBnSP8y+LwQWXhfoN7NJ4uNrFVfwI= X-Google-Smtp-Source: ABdhPJyD+bE2CWhCPcLc7pkFXL1fBnZSQ79k4Mrz/ual3csGHbbB1QyPdkzfdEx1mDTPmn1cxDQtCg== X-Received: by 2002:ad4:47ac:: with SMTP id a12mr23838975qvz.51.1635357088748; Wed, 27 Oct 2021 10:51:28 -0700 (PDT) Received: from hurd (dsl-152-69.b2b2c.ca. [66.158.152.69]) by smtp.gmail.com with ESMTPSA id h12sm455567qkp.52.2021.10.27.10.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 10:51:28 -0700 (PDT) From: Maxim Cournoyer References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> <20211027045151.9889-17-maxim.cournoyer@gmail.com> <87mtmufrw3.fsf_-_@gnu.org> Date: Wed, 27 Oct 2021 13:51:26 -0400 In-Reply-To: <87mtmufrw3.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 27 Oct 2021 16:45:32 +0200") Message-ID: <87v91ibbkx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Ludovic Court=C3=A8s writes: > Hi, > > Maxim Cournoyer skribis: > >> This paves the way toward properly fixing https://issues.guix.gnu.org/50= 957. >> >> * guix/profiles.scm (gdk-pixbuf-loaders-cache-file): Add procedure... >> (%default-profile-hooks): ... and register it as a profile hook. > > [...] > >> + (mlet %store-monad ((%gdk-pixbuf (manifest-lookup-package >> + manifest "gdk-pixbuf")) > > You could call it =E2=80=98gdk-pixbuf?=E2=80=99 since it=E2=80=99s used a= s a boolean. > >> + (gexp->derivation "gdk-pixbuf-loaders-cache-file" build >> + #:local-build? #t >> + #:substitutable? #f >> + #:properties >> + '((type . profile-hook) >> + (hook . gdk-pixbuf-loaders-cache-file))) Good idea; done: modified guix/profiles.scm @@ -1167,8 +1167,8 @@ (define (gdk-pixbuf-loaders-cache-file manifest) (define gdk-pixbuf ;lazy reference (module-ref (resolve-interface '(gnu packages gtk)) 'gdk-pixbuf)) =20 - (mlet %store-monad ((%gdk-pixbuf (manifest-lookup-package - manifest "gdk-pixbuf")) + (mlet %store-monad ((%gdk-pixbuf? (manifest-lookup-package + manifest "gdk-pixbuf")) (gdk-pixbuf-bin -> (file-append gdk-pixbuf "/bin"))) (define build (with-imported-modules (source-module-closure @@ -1178,7 +1178,7 @@ (define build (setenv "PATH" (string-append #$gdk-pixbuf-bin ":" (getenv "PA= TH"))) (generate-gdk-pixbuf-loaders-cache '#$(manifest-inputs manifes= t) (list #$output))))) - (if %gdk-pixbuf + (if %gdk-pixbuf? (gexp->derivation "gdk-pixbuf-loaders-cache-file" build #:local-build? #t #:substitutable? #f =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20 > No showstopper but we should eventually add this to (guix status) for > nicer reporting. > > My 2=C2=A2, > Ludo=E2=80=99. Thanks, I was wondering why the hook message output looked different. Done, like: modified guix/status.scm @@ -381,6 +381,8 @@ (define (hook-message hook-type) (G_ "building CA certificate bundle...")) ('emacs-subdirs (G_ "listing Emacs sub-directories...")) + ('gdk-pixbuf-loaders-cache-file + (G_ "generating GdkPixbuf loaders cache...")) ('glib-schemas (G_ "generating GLib schema cache...")) ('gtk-icon-themes Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 18:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163535761729685 (code B ref 51428); Wed, 27 Oct 2021 18:01:02 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 18:00:17 +0000 Received: from localhost ([127.0.0.1]:50513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfnDl-0007ii-1U for submit@debbugs.gnu.org; Wed, 27 Oct 2021 14:00:17 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:36357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfnDj-0007iO-97 for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 14:00:15 -0400 Received: by mail-qv1-f41.google.com with SMTP id d6so2349386qvb.3 for <51428@debbugs.gnu.org>; Wed, 27 Oct 2021 11:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=QTqFktJ5Qs1oT4BSBPWnrTm5SNCYRqlAc7iTl1kiD00=; b=a6bSj4GwxIORbx2yINi3CsYnk8GRwiY3FiK9LjjhS719vlxWWy9KKnIRgE54nvYqoz zYKwdJ+tcyLvg3BxWck2K24X2pJk+zsiNba/YFG5TdSKcTcaHCsXTBvnZ9F5u5IDVKK2 mhwUEFzKjuxqsOOKgLToZdK6Yg9McEI/kssBhBo+S6Hg4zxJtyHE3TX58BjExNH3fgbn 0szVv8ybnJJ8CKlcGkMjgjY7Sj7W+3Aw4B8Pj1UwmvHgLHQxcUgIu69dq6ycVlOz3n5R XKSp3TgvLDw/RqC8LXyETcAD/2fi7YMI8U85gzgFNNDBwRUhJVftwnwT2d89A3IiM+Bg 0XSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=QTqFktJ5Qs1oT4BSBPWnrTm5SNCYRqlAc7iTl1kiD00=; b=SH3edBHTwiCeI3YqZlNLBAu4c2DX9cYPrSjdpLfMFFX3/BCT0B45oEq/KysSyf8H4q 8yJMhgsVa/6NAyJLOgExZFGLyCoVdb6efh04ltyP+PBTyWHzY6ZJ+OutLhUPjnjcOGg2 FQAz0s/vYtq/kiKfe43O3HQL95y4E/AkvpYSBfNKay70UAA1Gr86xr5p0qD2m9aaeYe1 VQWt7iZpKe8fXxyitelnzxg2W3okX1upSyEI9J7sxLpG3q9peM6JHBCekkPTcK/BIxRN lMElUIQSzSU3iENH/xzA1JyDDiReZ4/ZGinS+T5Iz1btqK2B/LbLVxihWi5BuhYDykGw Bj+A== X-Gm-Message-State: AOAM532rZfjebOT55ykfiXwGLXClIGW3UI+KMPIBug3kkjgygEKo9Wxy 5mi6/z6HscxcRBVCaoG/LL2cevIt0ac= X-Google-Smtp-Source: ABdhPJy2l1GM2m2KXszI5wYKWwJcGo6/qJURWmMGer3eozAGRmS2W9fs95YGAU/ui0bjwAP7NWlLrw== X-Received: by 2002:a0c:f8cb:: with SMTP id h11mr11784273qvo.60.1635357609313; Wed, 27 Oct 2021 11:00:09 -0700 (PDT) Received: from hurd (dsl-152-69.b2b2c.ca. [66.158.152.69]) by smtp.gmail.com with ESMTPSA id c21sm434170qko.81.2021.10.27.11.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 11:00:08 -0700 (PDT) From: Maxim Cournoyer References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> <20211027045151.9889-16-maxim.cournoyer@gmail.com> <87h7d2frqv.fsf_-_@gnu.org> Date: Wed, 27 Oct 2021 14:00:07 -0400 In-Reply-To: <87h7d2frqv.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 27 Oct 2021 16:48:40 +0200") Message-ID: <87r1c6bb6g.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Ludovic Court=C3=A8s writes: > Maxim Cournoyer skribis: > >> +(define %gdk-pixbuf-loaders-cache-file >> + "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache") > > A comment indicating that this file is built by the hook would be nice, > but let=E2=80=99s not trigger a rebuild just for that. I've added the following comment: ;; This file is to be generated by the ;; `generate-gdk-pixbuf-loaders-cache' build phase defined below. > Isn=E2=80=99t the hard-coded version number going to cause troubles when > gdk-pixbuf is upgraded? Or if we have some packages using a newer > version while others remain on 2.10.0? I was puzzled by it at the beginning, but it seems some historical related version string that isn't meant to change. Even newer versions of gdk-pixbuf refer to this older version in their documentation/build system. Thank you! Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Oct 2021 04:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163548161527738 (code B ref 51428); Fri, 29 Oct 2021 04:27:01 +0000 Received: (at 51428) by debbugs.gnu.org; 29 Oct 2021 04:26:55 +0000 Received: from localhost ([127.0.0.1]:53742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgJTj-0007DK-IL for submit@debbugs.gnu.org; Fri, 29 Oct 2021 00:26:55 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:23552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgJTg-0007D6-QI for 51428@debbugs.gnu.org; Fri, 29 Oct 2021 00:26:54 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id A243212BA; Fri, 29 Oct 2021 06:26:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1635481606; x=1637296007; bh=Nv1aLWJWil2hKoiNOhiDj3/e/C+BMFtHP51 S5BFnteA=; b=qjEfQoEpVO0ZGgBmWF0xvrjTe8oWztDT3ixt7BmhlOB3G1FP7Ag mdS34pnf0sq73wY1alhNn0qiLOMFO926pULSkbRBKdtpUYd46cIm15Yxb9Wbfdwo 5+Mbf18Gy/OBE/Ug5gGsDl1+9pZd1p8YossPRID0aiByu3kr6cDQw13QQv45g4+p IUlcxg1x2+u52XoRECrki0oVX55B6il41uyzu+idxLqzAlmRLZk04/42riues3ch cBCUCF8kS/Nqd5ylOgmY8z23Oicc/lAU+v+uc/lw3gTFTlo32nvQn1lBS7X7DH35 adv1FHxDNEx8VPOdQP2WlNMeEk0+yy2z2Vr8QWE+S0ruykf+oKWsloQZBijtVA1N tEPJORRKqS2UeICh3ZyS2YYPt034fBkvpFV3dsbJ//iK5xCxlrVGnrRc6NY2uSTU 1zT5PH7A1ubhMPpQoAbNJOfDW4DCB1pWtgSNN2QaFL40GOckgc2giIXgCvB7BxCv vJraCMB4ldB60wUVpVecP/AMBVLwRp5BZ9rnfv+4/qzRGVeW319cshunjihPjPLm Um7lCHsXQ0aNRn+CEgGtM3HWGKfpPdJKplMhq6YLfvjLR8JxnYAvmJU+ytIjwLQI J8eVdCKiKbdUEOu4nLwPaiwIvK9OtI4P6V3uK5BpDqdMXJwqIj25D+nE= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-10 required=5 tests=[BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nkhh1vAKublW; Fri, 29 Oct 2021 06:26:46 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id D7BAA9CD; Fri, 29 Oct 2021 06:26:45 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 19BFE50C0; Fri, 29 Oct 2021 06:26:44 +0200 (CEST) From: Thiago Jung Bauermann Date: Fri, 29 Oct 2021 01:26:38 -0300 Message-ID: <1723112.AEdn0yoaQS@popigai> In-Reply-To: <4222209.gjDTJ53qjz@popigai> References: <87v91jcdvy.fsf@gmail.com> <871r46cwcu.fsf@gmail.com> <4222209.gjDTJ53qjz@popigai> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello again, Em quarta-feira, 27 de outubro de 2021, =C3=A0s 13:26:37 -03, Thiago Jung=20 Bauermann escreveu: > Hello Maxim, >=20 > Em quarta-feira, 27 de outubro de 2021, =C3=A0s 12:37:21 -03, Maxim Courn= oyer=20 escreveu: > > I'm hoping that with the reduced Rust bootstrap chain that starts with > > 1.39 and uses newer components, it may finally be more accessible to > > other architectures. >=20 > There=E2=80=99s an unmerged PR for mrustc adding support for ppc64 but I = haven=E2=80=99t > tried it: >=20 > https://github.com/thepowersgang/mrustc/pull/159[1] >=20 > Accessing the link now, I see that someone reported being able to > bootstrap rustc 1.29 on powerpc64le-linux with it! \o/ >=20 > I=E2=80=99ll try it out within the next couple of days and send a patch i= f it > works. Unfortunately it doesn=E2=80=99t work. :-/ I even tried the workaround men= tioned=20 in the pull request (i.e., reverting commit b9b23c5), but mrustc terminates= =20 with signal 7 (SIGBUS). I=E2=80=99ll dig some more. =2D-=20 Thanks, Thiago From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Oct 2021 20:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thiago Jung Bauermann Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163553821414465 (code B ref 51428); Fri, 29 Oct 2021 20:11:02 +0000 Received: (at 51428) by debbugs.gnu.org; 29 Oct 2021 20:10:14 +0000 Received: from localhost ([127.0.0.1]:56041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgYCc-0003lF-KY for submit@debbugs.gnu.org; Fri, 29 Oct 2021 16:10:14 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:42803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgYCZ-0003ko-DV for 51428@debbugs.gnu.org; Fri, 29 Oct 2021 16:10:13 -0400 Received: by mail-qt1-f169.google.com with SMTP id f1so10193775qto.9 for <51428@debbugs.gnu.org>; Fri, 29 Oct 2021 13:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=KfcUlgfls56ugwwEEapmynuFSSzkZrT3Gxcl5SkQXAY=; b=lbHeSrx2zdQHq04TC9aWFhUgR418XE6mFcmIPfVV2kNiFWknoI78ERGQ6EyZ6TlOw+ m1ybME+B7j1pJTyjh4s74WfcwJKx7T9ixMLpXJVuum4kl5P0DIFkOrRkA9vjBwc5N/aA BsM443/a9OnR58oS776UabCvnpsLjzARjYws+pce5JWuB4/GuOmN+EPntJQYP6uXUyJr DUE8JmYjt2Tav+DalB0vy24/XYM00RgSoL/LlmjSmGBWdx1T9NMNFoUWoi83qFEBezYD f8bZ7xeaPiUNTdFsQV7YZxi+GvciVpL5QO0pVlQHjkBj17pY55mLyHZbYJ8W62I39/ID UK7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=KfcUlgfls56ugwwEEapmynuFSSzkZrT3Gxcl5SkQXAY=; b=MmkDpmnyICYSktjF9o6ivkJZga39CwzC5x6uP1WF1xp9gz0fSdHxc2q3nI52Ilg9V4 MMR2z4clhL5YloiNauMi5/0UU8e8AjeIhpo41+WicOnfXK5k8vDGbMe6n6RUYDfD5CSr 2yd3vLsehlaxHZ8+juXG+ymrkb+MX4RAUTNXLZJZxm/6jwN6zHsqApsrKtB/TmOAJpeN lLEy4s7ONuaykse1SFGLdvuX+1LpDgzkqOasH6g0K0C8rOS2Dhgf/hoea/cBK5JI1SpG l2o3VhMU7iZw66qLYw5a3GUMcLcXY9f/R6RlazPaUyLhcQ5MeahcrwYq9J2xBp4wlkog LwVw== X-Gm-Message-State: AOAM532fBJ8RJ3X5GEC4qL6fx8jay0TDxLorRYC6bsmP8obQds0Re2Cb vqHBMd4EgBksNy/CjzNQ0JQixi2iZV4= X-Google-Smtp-Source: ABdhPJzEowiK28lGTQjUMIvI1ODjGwyG9UKnyDISyQd+YE4DxtAtOwFnubnELl7GREU+9gr9cY8cAw== X-Received: by 2002:ac8:7a82:: with SMTP id x2mr14098956qtr.260.1635538205743; Fri, 29 Oct 2021 13:10:05 -0700 (PDT) Received: from hurd (dsl-148-192.b2b2c.ca. [66.158.148.192]) by smtp.gmail.com with ESMTPSA id e4sm5301148qty.59.2021.10.29.13.10.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 13:10:05 -0700 (PDT) From: Maxim Cournoyer References: <87v91jcdvy.fsf@gmail.com> <871r46cwcu.fsf@gmail.com> <4222209.gjDTJ53qjz@popigai> <1723112.AEdn0yoaQS@popigai> Date: Fri, 29 Oct 2021 16:10:03 -0400 In-Reply-To: <1723112.AEdn0yoaQS@popigai> (Thiago Jung Bauermann's message of "Fri, 29 Oct 2021 01:26:38 -0300") Message-ID: <87bl37a8ys.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Thiago, Thiago Jung Bauermann writes: > Hello again, > > Em quarta-feira, 27 de outubro de 2021, =C3=A0s 13:26:37 -03, Thiago Jung= =20 > Bauermann escreveu: >> Hello Maxim, >>=20 >> Em quarta-feira, 27 de outubro de 2021, =C3=A0s 12:37:21 -03, Maxim Cour= noyer=20 > escreveu: >> > I'm hoping that with the reduced Rust bootstrap chain that starts with >> > 1.39 and uses newer components, it may finally be more accessible to >> > other architectures. >>=20 >> There=E2=80=99s an unmerged PR for mrustc adding support for ppc64 but I= haven=E2=80=99t >> tried it: >>=20 >> https://github.com/thepowersgang/mrustc/pull/159[1] >>=20 >> Accessing the link now, I see that someone reported being able to >> bootstrap rustc 1.29 on powerpc64le-linux with it! \o/ >>=20 >> I=E2=80=99ll try it out within the next couple of days and send a patch = if it >> works. > > Unfortunately it doesn=E2=80=99t work. :-/ I even tried the workaround m= entioned=20 > in the pull request (i.e., reverting commit b9b23c5), but mrustc terminat= es=20 > with signal 7 (SIGBUS). > > I=E2=80=99ll dig some more. OK! Note that it currently bootstraps from 1.39; it'd be nice to not have to return to 1.29 for powerpc64el. In other news I've added a polkit-duktape package on the cufbc branch. Feel free to try it (with some transformation applied, or by hacking s/polkit/polkit-duktape/ manually in your checkout). HTH! Thanks for experimenting with it. Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Oct 2021 21:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163554235421924 (code B ref 51428); Fri, 29 Oct 2021 21:20:01 +0000 Received: (at 51428) by debbugs.gnu.org; 29 Oct 2021 21:19:14 +0000 Received: from localhost ([127.0.0.1]:56095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgZHO-0005hX-Fz for submit@debbugs.gnu.org; Fri, 29 Oct 2021 17:19:14 -0400 Received: from mx.kolabnow.com ([212.103.80.155]:25930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgZHM-0005hE-7Z for 51428@debbugs.gnu.org; Fri, 29 Oct 2021 17:19:13 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 4C9D91207; Fri, 29 Oct 2021 23:19:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1635542344; x=1637356745; bh=oBV8534uzKU3rXLr6G/PiJINUPg/R6GaBNF Ru5zkaJY=; b=YGjxHTfVMB2T82c01vVv/6s9AlssC/I2SjlKPEPtM9w+Z1YSY7r M/ipnnUwac3ncy/A6tUMINmL5v6UU0Qmv3DHFwfCOJ2wZTkCx3KfaxobqkYSTMBD it3I365Og38yF7S+iUjp0EOMC19GIux06VwIgzV1if/HufseUJxskiqJiAFVe2jQ ha8P/KHWSR9miX1pHmDR1H1f0fW/FTthc8iBE54OD4JZYHUxn+axGlEmCXj3JrUP G+5vQX6WK+l5elqlCCQkzTBAxCUAbzexRUHsZ0s3tRXMGRqWztERH5xuiZGmUla2 mfDiSbzVF9VtjjLrJzSo2k+Zf0DEKRLfx8SuZ6bFI/7YPTXGvRS5DV/1eXgQy1cb 295HvA6pnzeytw2F0/iaYbjnQCDqYKmhswh+70JjbGXKIUoriu2UqGUhYjbSU48q vf2eDbO9jo9hfsfYeaLb4ihku8Qr1zSBWVCQwEN64BIU7mk4ZZ4VTf+x7fAd6VrQ B/4jHb9blQrBgww55XW7PeUq0DrzmI1+RjUBqRD10JlZ/awQ6cIOPhOwFR9PFR6y g/iYN5QmJYfAn0SQI4xNy40ckyR/b1wsb7Njvlq3X4CEDgEc7GTDmwdZb5Jc3Kq+ COYhFSFAI3ea3ruP+wfmS9kZyEnSr74BU1NUA0q12qZ2efHbaKJ41rB0= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.899 X-Spam-Level: X-Spam-Status: No, score=-1.899 tagged_above=-10 required=5 tests=[BAYES_00=-1.9, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eVBptMN0PqH1; Fri, 29 Oct 2021 23:19:04 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id 93408874; Fri, 29 Oct 2021 23:19:03 +0200 (CEST) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx002.mykolab.com (Postfix) with ESMTPS id E00722366; Fri, 29 Oct 2021 23:19:02 +0200 (CEST) From: Thiago Jung Bauermann Date: Fri, 29 Oct 2021 18:18:56 -0300 Message-ID: <15534555.0F4JW65k6J@popigai> In-Reply-To: <87bl37a8ys.fsf@gmail.com> References: <87v91jcdvy.fsf@gmail.com> <1723112.AEdn0yoaQS@popigai> <87bl37a8ys.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Maxim, Em sexta-feira, 29 de outubro de 2021, =C3=A0s 17:10:03 -03, Maxim Cournoye= r=20 escreveu: > Hello Thiago, >=20 > Thiago Jung Bauermann writes: > > Hello again, > >=20 > > Em quarta-feira, 27 de outubro de 2021, =C3=A0s 13:26:37 -03, Thiago Ju= ng > >=20 > > Bauermann escreveu: > >> Hello Maxim, > >>=20 > >> Em quarta-feira, 27 de outubro de 2021, =C3=A0s 12:37:21 -03, Maxim > >> Cournoyer > >=20 > > escreveu: > >> > I'm hoping that with the reduced Rust bootstrap chain that starts > >> > with > >> > 1.39 and uses newer components, it may finally be more accessible to > >> > other architectures. > >>=20 > >> There=E2=80=99s an unmerged PR for mrustc adding support for ppc64 but= I > >> haven=E2=80=99t > >> tried it: > >>=20 > >> https://github.com/thepowersgang/mrustc/pull/159[1] > >>=20 > >> Accessing the link now, I see that someone reported being able to > >> bootstrap rustc 1.29 on powerpc64le-linux with it! \o/ > >>=20 > >> I=E2=80=99ll try it out within the next couple of days and send a patc= h if it > >> works. > >=20 > > Unfortunately it doesn=E2=80=99t work. :-/ I even tried the workaround > > mentioned in the pull request (i.e., reverting commit b9b23c5), but > > mrustc terminates with signal 7 (SIGBUS). > >=20 > > I=E2=80=99ll dig some more. >=20 > OK! Note that it currently bootstraps from 1.39; it'd be nice to not > have to return to 1.29 for powerpc64el. Agreed. I just mentioned 1.29 because that=E2=80=99s what the person on the= pull=20 request mentioned that they used. I was trying with 1.39. > In other news I've added a polkit-duktape package on the cufbc branch. > Feel free to try it (with some transformation applied, or by hacking > s/polkit/polkit-duktape/ manually in your checkout). >=20 > HTH! Thank you. I=E2=80=99ll try it out. > Thanks for experimenting with it. Thank you for the cufbc branch! From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Oct 2021 16:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: Mathieu Othacehe , 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163569904723681 (code B ref 51428); Sun, 31 Oct 2021 16:51:01 +0000 Received: (at 51428) by debbugs.gnu.org; 31 Oct 2021 16:50:47 +0000 Received: from localhost ([127.0.0.1]:33032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhE2h-00069s-3D for submit@debbugs.gnu.org; Sun, 31 Oct 2021 12:50:47 -0400 Received: from mout01.posteo.de ([185.67.36.65]:42207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhE2f-00069f-Av for 51428@debbugs.gnu.org; Sun, 31 Oct 2021 12:50:46 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id CE028240027 for <51428@debbugs.gnu.org>; Sun, 31 Oct 2021 17:50:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1635699038; bh=kVn5GHPzxADwdt4gakVZV0Om3JPCFKvpD/quIlO7Kbw=; h=From:To:Cc:Subject:Date:From; b=aFnlGZ8Pm/SJC0Rc+NLI7TDedEIydpTVXcHMJ37E9lwx7aa4mdP7EoHgrKLwONQFB L6MSdkzzUJHitNKL6VHK6PqL7j6cEj3H5uQag8EwJk4tO/QuoaH3IDiQ24vp0bdr00 GkhTOG9iPkwdWkVbRfQ1sliTmXN+aoEjKEIIwGCrJvgc8xUdeGA9vD7lUJyau5AkcL MhD/W+uzjEX5UWqZlRonj+8pI5fiWi9cN5X4cDoctCD+wus1D+Zqb/XNOmZcZ38OJF iM9lNeFL6LiqDGW9pA3P1qpPI0XmU0t7Hd8o4AbkMX4zj1EvzRncN1+cJbVgRuRMmP VvxJoWhc/wjuA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Hj2Gj4QHFz6tmJ; Sun, 31 Oct 2021 17:50:37 +0100 (CET) References: <87v91jcdvy.fsf@gmail.com> From: Guillaume Le Vaillant Date: Sun, 31 Oct 2021 16:30:05 +0000 In-reply-to: <87v91jcdvy.fsf@gmail.com> Message-ID: <877ddtp28z.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Maxim Cournoyer skribis: > I've experimented quite a bit with core-updates-frozen-batched-changes > in the last weeks, and it seems to be in a decent shape, good enough to > merge into core-updates-frozen, I think. > > [...] > > I'll send the corresponding patches for review, which can also be > consulted directly on the core-updates-frozen-batched-changes branch, > which I've manually built on Berlin for things such as Rust and > ungoogled-chromium. > > I'd like to merge it into core-updates-frozen by the beginning of > November, unless there are problems you can spot :-). Hi Maxim, I think that when you rewrote the core-updates-frozen-batched-changes branch you lost the commit that Mathieu added to fix the evaluations on the CI [1], and this is why they are now failing. The patch is in attachment (I found it in the guix-commits mailing list). If you add it back to the branch, the CI should start building substitutes again. [1] https://ci.guix.gnu.org/eval/36297 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Remove-references-to-a-removed-patch.patch Content-Transfer-Encoding: quoted-printable From=2027d4c26cb55e588cd0ff515887a297a6480f2676 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 25 Oct 2021 18:03:35 +0000 Subject: [PATCH] gnu: Remove references to a removed patch. * gnu/packages/backup.scm (libchop)[source]: Remove the patch. (idutils)[source]: Ditto. =2D-- gnu/packages/backup.scm | 1 - gnu/packages/idutils.scm | 1 - 2 files changed, 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 8c5ea07a9f..a18a16687c 100644 =2D-- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -557,7 +557,6 @@ (define-public libchop (sha256 (base32 "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g")) =2D (patches (search-patches "diffutils-gets-undeclared.patch"= )) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index d16f2ffdeb..3e404b9a6f 100644 =2D-- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -36,7 +36,6 @@ (define-public idutils (sha256 (base32 "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1")) =2D (patches (search-patches "diffutils-gets-undeclared.patch")) (modules '((guix build utils))) (snippet '(begin =2D-=20 2.33.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYX7JXA8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j96ewD7Bpxl3DqY76sig32vvBy0VNEhCfqmnWiyUlMD ByKOu00A/jPRn4g1xlrG4XVKR56Aswf/nmJbrdVyzGeALAV3h+4o =rrfR -----END PGP SIGNATURE----- --==-=-=-- From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Oct 2021 21:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Guillaume Le Vaillant Cc: Mathieu Othacehe , 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163571470815507 (code B ref 51428); Sun, 31 Oct 2021 21:12:01 +0000 Received: (at 51428) by debbugs.gnu.org; 31 Oct 2021 21:11:48 +0000 Received: from localhost ([127.0.0.1]:33186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhI7I-000423-DH for submit@debbugs.gnu.org; Sun, 31 Oct 2021 17:11:48 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:40604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhI7D-00041n-MX for 51428@debbugs.gnu.org; Sun, 31 Oct 2021 17:11:47 -0400 Received: by mail-qt1-f172.google.com with SMTP id 19so12673973qtt.7 for <51428@debbugs.gnu.org>; Sun, 31 Oct 2021 14:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=w+9tzJMaG/EVTDS+ksC7m5qOCgc7eBtqkWUODIIm2lA=; b=Ze2MYUJVg0bLViiqwaUVcxTsViGpk0CW3k5znLI+xcH5Aeax8BF0zJEeUS1ppm5fkg 0wbTZlvnq28dbSLoJpUiK7yW92shyaWRjTWIn7y7G9qINEmJIoruSeFBrKSajMUtwfaU vG81pzOSYFL4wkVaY6VI1ZmxkjRKx9xrivk2nBBNCiGH85kayYegQNJjySTMNivPgxQ1 bUvL4/QIHj92mr5lcSDvzSG8VktdlfvaE7pbo6+OTOd0QJG9GXMnYUMKJU6gsA0Xub8o maCwWxsc/2mcBj1+8t0CqWBy2HV4B+9zg5GDzzl0k3qskqi63z5EEBV7WZ9eGbhb6vo1 tpgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=w+9tzJMaG/EVTDS+ksC7m5qOCgc7eBtqkWUODIIm2lA=; b=gP0EHn0T9CwN6y6w1abHa8qGRiJXplQqxWgaloSjP3DmwGrhkjae2g8QW4eHuiGiWK A5j8rMbO9l5K2V03hat9UfmJqqJY6xx72ZdpRm9fQ598VZvicLufO2wiafHAjGamYq2P gKK41fu8AOnVJSx/yMducJs4zF5uibCmquIs5ORRCA7LUqiNlY09a7F+KPHu+BdqFvSc T+62+e5E4kzbcoEBcRq0bNpQYArWaeO8OG5fCx2Gs7t7xkcM1gq1x2qlnBGZDP6KlzdA VebmHbzERFi+hoe1A/5voK464RmhQ2i6XjxI3BMVr+P8xYVRNW5jkmKCiPPQUfhL+pVT +LVA== X-Gm-Message-State: AOAM532cNILfyi1qnX0BYBuB72Wq+2a4RvZmnWWeGFokLP5kzqaM+A0M go5YSKJSuvTLy+7wFah8rVs= X-Google-Smtp-Source: ABdhPJz08/fCO9ugHFbdvStOcs4zSgp+NSpiuYAjxKTSLpXpGJo5e/pV0LVdfCDNfAQzVNhcG9SZTw== X-Received: by 2002:a05:622a:15:: with SMTP id x21mr26092890qtw.310.1635714698211; Sun, 31 Oct 2021 14:11:38 -0700 (PDT) Received: from hurd (dsl-153-210.b2b2c.ca. [66.158.153.210]) by smtp.gmail.com with ESMTPSA id a124sm3307498qkc.64.2021.10.31.14.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Oct 2021 14:11:37 -0700 (PDT) From: Maxim Cournoyer References: <87v91jcdvy.fsf@gmail.com> <877ddtp28z.fsf@kitej> Date: Sun, 31 Oct 2021 17:11:33 -0400 In-Reply-To: <877ddtp28z.fsf@kitej> (Guillaume Le Vaillant's message of "Sun, 31 Oct 2021 16:30:05 +0000") Message-ID: <87o8747vcq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Guillaume Le Vaillant writes: > Maxim Cournoyer skribis: > >> I've experimented quite a bit with core-updates-frozen-batched-changes >> in the last weeks, and it seems to be in a decent shape, good enough to >> merge into core-updates-frozen, I think. >> >> [...] >> >> I'll send the corresponding patches for review, which can also be >> consulted directly on the core-updates-frozen-batched-changes branch, >> which I've manually built on Berlin for things such as Rust and >> ungoogled-chromium. >> >> I'd like to merge it into core-updates-frozen by the beginning of >> November, unless there are problems you can spot :-). > > Hi Maxim, > > I think that when you rewrote the core-updates-frozen-batched-changes > branch you lost the commit that Mathieu added to fix the evaluations on > the CI [1], and this is why they are now failing. > > The patch is in attachment (I found it in the guix-commits mailing > list). If you add it back to the branch, the CI should start building > substitutes again. > > [1] https://ci.guix.gnu.org/eval/36297 Thanks a lot! And sorry for missing that. I've applied it to the branch and pushed! Let's see if the CI is happy again :-). Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Nov 2021 02:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163590708412875 (code B ref 51428); Wed, 03 Nov 2021 02:39:02 +0000 Received: (at 51428) by debbugs.gnu.org; 3 Nov 2021 02:38:04 +0000 Received: from localhost ([127.0.0.1]:38512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mi6A7-0003Lb-RA for submit@debbugs.gnu.org; Tue, 02 Nov 2021 22:38:04 -0400 Received: from mx.kolabnow.com ([212.103.80.153]:33046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mi6A5-0003L6-Tl for 51428@debbugs.gnu.org; Tue, 02 Nov 2021 22:38:02 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 927AB407B7; Wed, 3 Nov 2021 03:37:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1635907075; x=1637721476; bh=PU3+duVWFWQxWJjDwQy17HIo0cXAdnY28EW aun+bfIY=; b=5vRKtIvhSHxLkYDbdjHyQSxu1++voAaNcPB5ulTV7KVyiiyosZp O6J0H+T8W52TDvK15NMjZTwKood76D1fysEhV9bhT2aCHqUkt6Ur5VVQDEBfoyvc aN3CCKQIQS1dsScx7xxy2u15zMV6s/U1IL4u34vsz8H3ystmQ6NAzhzFqFd0ide4 frkIkk4ZcQM+/NDULce5RLK+0dF30ZaeZH8xtQMsdHWUzlmNBMuS3598Yedq5Bew eeBMM3VMOWEPtSso/VPH3MVIKYqKYVC3ND51SRhQUSmPAGKUvSyZINZlxDsZmcqD fhYnoNuWDRKgG8jEiEOCXzR/xMIqnAEawPFpYKtNMBJIHIJY7mHAcc9kXy1pjcoR iIBjZKm5xwgQDFAFzxiTRIL+cWLexKWS9+KkN7TKm5Dcia3d/HEt+3oKa3X3h3iu whYWi7rPUe8Uu8rnpoXy7qKJKcdcCZ4jWdShHLa3D/clzJRbeh9HQgmLGxM4eVtf YfB6dse62kldXc57kZdTudX0HgPbzYrUyAmvDtA+/95v7RMha3hj5qHt5QMEkAiO ChpN+97pKqKxsRFzO+FXQC7RNJc99lMyDbNEQOOUneksb50+AuD41n6myhPAg2Kh CYSh2DSMLNz+q4kTgSHxGq9HuZ3a1G7KbGTZ6WNpEjp3W27G6L1Q2Cyo= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-10 required=5 tests=[BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vp6cpBjfE7sG; Wed, 3 Nov 2021 03:37:55 +0100 (CET) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id F2520404C5; Wed, 3 Nov 2021 03:37:53 +0100 (CET) Received: from ext-subm002.mykolab.com (unknown [10.9.6.2]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 489374233; Wed, 3 Nov 2021 03:37:53 +0100 (CET) From: Thiago Jung Bauermann Date: Tue, 02 Nov 2021 23:37:47 -0300 Message-ID: <5311476.e0r0s4ehiO@popigai> In-Reply-To: <87bl37a8ys.fsf@gmail.com> References: <87v91jcdvy.fsf@gmail.com> <1723112.AEdn0yoaQS@popigai> <87bl37a8ys.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello again, Em sexta-feira, 29 de outubro de 2021, =C3=A0s 17:10:03 -03, Maxim Cournoyer escreveu: > In other news I've added a polkit-duktape package on the cufbc branch. > Feel free to try it (with some transformation applied, or by hacking > s/polkit/polkit-duktape/ manually in your checkout). Thank you for providing that package. I tried it with the patch at the end of this message, and GTK+ built! Though I don=E2=80=99t think I have a way = to test whether polkit-duktape works well. I was even able to build Emacs, but when I tried to install it there was this error: =2D-8<---------------cut here---------------start------------->8--- guixp9: ./pre-inst-env guix package -p /tmp/profile -i emacs =E2=8B=AE building /gnu/store/cm09wbm7wj7k237df58rny22ghkmmcg8-emacs-27.2.drv... building CA certificate bundle... listing Emacs sub-directories... building fonts directory... generating GdkPixbuf loaders cache... builder for `/gnu/store/w3bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pixbuf-loaders= =2Dcache-file.drv' failed to produce output path `/gnu/store/g4pj8hm97bl3fw= nbami0j3g5ycvnh559-gdk-pixbuf-loaders-cache-file' build of /gnu/store/w3bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pixbuf-loaders-cac= he-file.drv failed View build log at '/var/log/guix/drvs/w3/bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk= =2Dpixbuf-loaders-cache-file.drv.bz2'. cannot build derivation `/gnu/store/7hd26alx72spjadmfhs6ssfd6zs815l7-profil= e.drv': 1 dependencies couldn't be built guix package: error: build of `/gnu/store/7hd26alx72spjadmfhs6ssfd6zs815l7-= profile.drv' failed =2D-8<---------------cut here---------------end--------------->8--- The build log is just a bzip2-compressed empty file, though: =2D-8<---------------cut here---------------start------------->8--- guixp9: ls -l /var/log/guix/drvs/w3/bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pixb= uf-loaders-cache-file.drv.bz2 =2Drw-r--r-- 1 root root 14 Nov 2 23:10 /var/log/guix/drvs/w3/bmrsz4v0bcz1= s5gsd6dl83jrn0yk7n-gdk-pixbuf-loaders-cache-file.drv.bz2 guixp9: bzcat /var/log/guix/drvs/w3/bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pixb= uf-loaders-cache-file.drv.bz2 =20 guixp9:=20 =2D-8<---------------cut here---------------end--------------->8--- Unfortunately I=E2=80=99ve been having less time to work on Guix lately, and I wasn=E2=80=99t able yet to investigate this issue further. Also, I will = be on travel for about a week with very little access to the internet, so I won= =E2=80=99t be able to respond or experiment further until I=E2=80=99m back. This was based on c.u.f.b.c. commit eae3355ec8ad. =2D-=20 Thanks, Thiago =46rom 57599a32057b6d42abf943356a9b9ea99687b81d Mon Sep 17 00:00:00 2001 =46rom: Thiago Jung Bauermann Date: Mon, 1 Nov 2021 11:53:41 -0300 Subject: [PATCH] gnu: colord-minimal: Use polkit-duktape on non-x86_64 targets. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Because polkit depends on mozjs, which requires Rust, it can only be built = on x86_64 targets. Therefore use polkit-duktape on other architectures. * gnu/packages/gnome.scm (colord-minimal)[inputs]: Use =E2=80=98polkit-dukt= ape=E2=80=99 on non-x86_64 targets. =2D-- gnu/packages/gnome.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5f7d3a953dcb..7345a3518b63 100644 =2D-- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5303,7 +5303,12 @@ (define-public colord-minimal ("gusb" ,gusb-minimal) ("libgudev" ,libgudev) ("libusb" ,libusb) =2D ("polkit" ,polkit) + ;; polkit pulls in rust because of mozjs, so it=E2=80=99s only avai= lable on + ;; x86_64. Use polkit-duktape on other arches, which uses duktape + ;; instead. + ("polkit" ,(if (target-x86-64?) + polkit + polkit-duktape)) ("python" ,python-wrapper) ("sqlite" ,sqlite) ("sane-backends" ,sane-backends))) base-commit: eae3355ec8ad7ac81419f4fd43dd71416b032f07 From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Nov 2021 10:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.16359350934594 (code B ref 51428); Wed, 03 Nov 2021 10:25:01 +0000 Received: (at 51428) by debbugs.gnu.org; 3 Nov 2021 10:24:53 +0000 Received: from localhost ([127.0.0.1]:39113 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDRs-0001C1-LX for submit@debbugs.gnu.org; Wed, 03 Nov 2021 06:24:52 -0400 Received: from mail-qk1-f174.google.com ([209.85.222.174]:42542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miDRq-0001Bm-RQ for 51428@debbugs.gnu.org; Wed, 03 Nov 2021 06:24:51 -0400 Received: by mail-qk1-f174.google.com with SMTP id bm28so1737092qkb.9 for <51428@debbugs.gnu.org>; Wed, 03 Nov 2021 03:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GNboczw7zacqg4p70tL/dinaec46+UzKFNF2xSf/jhA=; b=VYY7lm/mzS0W5VPpTnHRKy02Tn0F71YpA9nyUcyJecmNXhOrtFwjllNwWmO/fBlSff dEYPoiOBYn1mhajvz1I3uzX2ds4vP3imT8MUtP8IulkxJQNZVq+KkkwKlYq2QQ+2En9J OxLEke89CnwZ4B2z65G/ZBRQYRwJn/jDXf1dk3RxK+R7FT2gtSXo0A+XM1LFHUruPlYm wWzf1yHGCpqCbuj/CoG/WwpSypTWDeVN+4r8KTmgAc9MFmkq8E2z/uL4Pu1ZtQtPGHr+ 8h0Lj6HfKQ+mTpGto35ffqSQ4mBXsusyP2bgS7oM6nrJV5ecF6zEPiJ9i10ymBiTdABm 85Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GNboczw7zacqg4p70tL/dinaec46+UzKFNF2xSf/jhA=; b=AJdEG+8gUVrtcsKa+nKKluo/NkguMEFmFMU/20e6IHLz2N2GQk3V3dV6/jX/3kAufC NXSl1Zz4iGK1mEjMmOUQ0/3zYlTgIWnvqPo+VXH3wACoKGFuVi6mFHSWr0KyCOISOUW/ I7mBY4gOyj7I74bqUihd+o4qh1qSZnSrKv9q3NHPUyQMxF57w2onnsk4OSxrvvo8twrm yeWnIpOAH1fnI6LtehOV9TERKPqmk+OdlarOmizvbWKD52P0GStms0yr+1RjCGe8AxiT wXCCb9t39xxlTdGoAKOqjdNv8Fu2lvYO8sbrATzoaELEDKAGLXVXiHbiknuNJ7VShisV /0Yw== X-Gm-Message-State: AOAM530XrOncvwaYkLb4LltZV4LP3EulL7+TRcyX/Vks7l3Jt7P3O44p bdDMHzxhRlS7SIIgGk/rRPfOZqhADU9P4StPERE= X-Google-Smtp-Source: ABdhPJyBHyGOEmMO0Ej2G+TpiSVvLPIDLtQcAuHBLxINTmiqAgX8QZLZUARFBq0FBwl79H9oziq+o7pKw/b7dra6KrQ= X-Received: by 2002:a05:620a:843:: with SMTP id u3mr11171763qku.463.1635935085222; Wed, 03 Nov 2021 03:24:45 -0700 (PDT) MIME-Version: 1.0 References: <87v91jcdvy.fsf@gmail.com> In-Reply-To: <87v91jcdvy.fsf@gmail.com> From: zimoun Date: Wed, 3 Nov 2021 11:24:34 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, On Wed, 27 Oct 2021 at 06:06, Maxim Cournoyer wrote: > I'd like to merge it into core-updates-frozen by the beginning of > November, unless there are problems you can spot :-). For testing, I run "guix time-machine --branch=core-updates-frozen -- build -m my-manifest.scm" but I hit this error: --8<---------------cut here---------------start------------->8--- perl-5.34.0 14.0MiB 19KiB/s 05:12 [####### ] 41.5% guix substitute: erreur : Erreur TLS dans la proc?dure ??read_from_session_record_port?? : Erreur de d?codage du paquet TLS re?u. |In ./guix/monads.scm: 471:9 19 (_ _) [...] /guix/store.scm:1417:15: ERROR: 1. &store-protocol-error: message: "some substitutes for the outputs of derivation `/gnu/store/76j9dhf2l01jz9ijsn50xh44hf548b2i-subversion-1.14.1.drv' failed (usually happens due to networking issues); try `--fallback' to build derivation from source " status: 1 guix time-machine: erreur : You found a bug: the program '/gnu/store/qs8487rmfx0cvadi60y6dy96b1kksnc0-compute-guix-derivation' failed to compute the derivation for Guix (version: "95d5090d9c9df7759ab053a896fb4cfa2037c77b"; system: "x86_64-linux"; host version: "af5742c05b1ea1aac8fb0707e265964006cd197a"; pull-version: 1). Please report it by email to . --8<---------------cut here---------------end--------------->8--- Well, I do not know where does it come from. Aside, if the merge is done e.g., next week, do we also plan a new release (1.4) for end of November? Cheers, simon From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Nov 2021 13:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: zimoun Cc: Maxim Cournoyer , 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.16359466982996 (code B ref 51428); Wed, 03 Nov 2021 13:39:01 +0000 Received: (at 51428) by debbugs.gnu.org; 3 Nov 2021 13:38:18 +0000 Received: from localhost ([127.0.0.1]:39505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miGT4-0000mF-AM for submit@debbugs.gnu.org; Wed, 03 Nov 2021 09:38:18 -0400 Received: from mx.kolabnow.com ([212.103.80.154]:63914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1miGT2-0000lz-Ge for 51428@debbugs.gnu.org; Wed, 03 Nov 2021 09:38:17 -0400 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id C76F8B19; Wed, 3 Nov 2021 14:38:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1635946689; x=1637761090; bh=d8rSVclMLA5NI6pdh3LqmQC6RNzu2f3eeIR hGh8SaQw=; b=fbaqb+9tesIT7BUJBx0nj3uqAcwJeZejK+IK0lAcoWClgUuRqhH Q8gJ91ol8YaMv7Ur9KyEHESLTT0spcd9bUp6OnskYJMkLrldbNcu8N6FY8Ujogbq hLeATtLqckx25fbXW1hSmLXgRnGcPeIlnoAzpwSLmEiKGmOR6piN0m7YSOD+6UZi b8LQRK9i4PKs0sBn0ecbbogRtVHsmpeJHczjtOl0+J3SuOAoqsTIGzHAdPCFLvyg WELAxQhs6UZeAcs2eDM8wMW8ufJFxWI3xxL6m9sD80TGNY03CEP7PeGgQIzXdMBW h7zZ9DfRCQBgq1wiOm7La4Z/RcXZmhpCXo89+cFyNOiiO15jypbHRLEqK2DNu0FU fgvcuMd/lV7E8MmLWzlnTNZPL7YXu86Lq1yC7PvEOtExvtYBAFYycOLAAdTugJ9i G2sMraPJClFbjugcKOy7hdTm41EdYscoSN8cxEUdn6i69qKkZMdEyZAXKVQVTjF4 WJXQIshwbNM9NVGm/HPw8O95CwAmaUU/sZjhrszt3AW/iVqRsogooWth2jLJfonK WBhrHxkHuFJNtE7gil3TmWFV2m0erDECc3v2SjfO46mv6jvDQOfO4i1qW7rP/CJd r8HptWPNtlRF66xuuOhtdFQ+eMvdq+M1garwydJkrrAgLfRTieO6XoxE= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-10 required=5 tests=[BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out001.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cxwI6YXuuyEh; Wed, 3 Nov 2021 14:38:09 +0100 (CET) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id 3D4BDAA8; Wed, 3 Nov 2021 14:38:07 +0100 (CET) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 9E7521D45; Wed, 3 Nov 2021 14:38:07 +0100 (CET) From: Thiago Jung Bauermann Date: Wed, 03 Nov 2021 10:38:02 -0300 Message-ID: <3363964.dpsNcyy5eN@popigai> In-Reply-To: References: <87v91jcdvy.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello simon, Em quarta-feira, 3 de novembro de 2021, =C3=A0s 07:24:34 -03, zimoun escrev= eu: > For testing, I run "guix time-machine --branch=3Dcore-updates-frozen -- > build -m my-manifest.scm" but I hit this error: >=20 > --8<---------------cut here---------------start------------->8--- > perl-5.34.0 14.0MiB 19KiB/s 05:12 [####### ] > 41.5% guix substitute: erreur : Erreur TLS dans la proc?dure > ??read_from_session_record_port?? : Erreur de d?codage du paquet TLS > re?u. Have you tried running the command again? Once in a while I get spurious=20 TLS errors (even when using Guix from the master branch), and simply re- running the command makes the error go away. > Well, I do not know where does it come from. I don=E2=80=99t know where the TLS errors come from either. =2D-=20 Thanks, Thiago From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Nov 2021 04:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thiago Jung Bauermann Cc: 51428@debbugs.gnu.org, zimoun Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163608828227531 (code B ref 51428); Fri, 05 Nov 2021 04:59:01 +0000 Received: (at 51428) by debbugs.gnu.org; 5 Nov 2021 04:58:02 +0000 Received: from localhost ([127.0.0.1]:44345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mirIg-00079z-Ey for submit@debbugs.gnu.org; Fri, 05 Nov 2021 00:58:02 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:41785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mirIe-00079T-8y for 51428@debbugs.gnu.org; Fri, 05 Nov 2021 00:58:01 -0400 Received: by mail-qk1-f177.google.com with SMTP id br39so7820197qkb.8 for <51428@debbugs.gnu.org>; Thu, 04 Nov 2021 21:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=XW3UhR9+UNf0CNLVKzopL7fIG089GBRPynV+sboOyIs=; b=KBeBG/wTjroIbTUPAkAfOInDLRbeV+qKTuBhMeHdwEz3l4StwJPf0Jk5bD7zTcMc7k h31DqVsJx82fg1uJDLU9F4moFNa/KUyvKoH7EVr+3f+Pm13+XgD4ze8HREsvSU4PSnz6 DZKRjDIL4i7wPTrwD2megsNeoHB1NI6Pi9RdLJAu0Ys0m6bHlo7o5J+os7yEF1X3qw2X VyVrDdx2mwFZBZSOqTlnuQ1ROpfpfqAKnA0u2nf1wTe9W/8jDui8RkpuuOizOKpHSFcQ daAHuJWV7w01lk3xdcqTTWbF8aCNmvqA119ts/uepep0tV6jCNl6LHXVwhFyyzCU0txI zPUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=XW3UhR9+UNf0CNLVKzopL7fIG089GBRPynV+sboOyIs=; b=RzgoRnj8WNze+4ge0g4kFPMDe6Uxwy7/9E64yvcME+Nk4jmb4Kp2MsY43b/qtEsP01 uD4W2JinE3PFpFoRCWRTtyBt576CKzw6tun2GsYGlK5AiYID+CW+QnMSFq9Pb+1YuK96 R/I81IZR6iZcAatYlWrAwJG6i9xLjCPZEBghsFeCaTy/n4roBEJggeZydWcZLxpANPQA ZFdXE98bs1Qz0zOh7tXGSckU5eU5ZM/SlWhWDWJdxdSu718tAgj0BYloHUtO4ynhNurm N8vE9jjoZN+JRfeWPDwpmtvgkBo9syzCINRk8m8xsqA7Zg3EdYmRro71H6rRYdv1OME9 kEcQ== X-Gm-Message-State: AOAM533oDf4D+JYzIs/ZFWorK+HGwhNJ1ypspwJBH4tXOMELP4bLgjxu o4Mvgzlxqgdv3fPgUeIbQ8OLssGOphmbZQ== X-Google-Smtp-Source: ABdhPJzYUay/CG+0GpWzOx2+ydv0fIWoKEPth5+98j4qaTo4W5jeZ9Lse4kATJOEIqimyZ/yOyOkIQ== X-Received: by 2002:a05:620a:14a7:: with SMTP id x7mr5742973qkj.484.1636088274650; Thu, 04 Nov 2021 21:57:54 -0700 (PDT) Received: from hurd (dsl-156-19.b2b2c.ca. [66.158.156.19]) by smtp.gmail.com with ESMTPSA id s22sm5266931qko.88.2021.11.04.21.57.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 21:57:54 -0700 (PDT) From: Maxim Cournoyer References: <87v91jcdvy.fsf@gmail.com> <3363964.dpsNcyy5eN@popigai> Date: Fri, 05 Nov 2021 00:57:53 -0400 In-Reply-To: <3363964.dpsNcyy5eN@popigai> (Thiago Jung Bauermann's message of "Wed, 03 Nov 2021 10:38:02 -0300") Message-ID: <878ry342su.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Thiago Jung Bauermann writes: > Hello simon, > > Em quarta-feira, 3 de novembro de 2021, =C3=A0s 07:24:34 -03, zimoun escr= eveu: >> For testing, I run "guix time-machine --branch=3Dcore-updates-frozen -- >> build -m my-manifest.scm" but I hit this error: >>=20 >> --8<---------------cut here---------------start------------->8--- >> perl-5.34.0 14.0MiB 19KiB/s 05:12 [####### ] >> 41.5% guix substitute: erreur : Erreur TLS dans la proc?dure >> ??read_from_session_record_port?? : Erreur de d?codage du paquet TLS >> re?u. > > Have you tried running the command again? Once in a while I get spurious= =20 > TLS errors (even when using Guix from the master branch), and simply re- > running the command makes the error go away. > >> Well, I do not know where does it come from. > > I don=E2=80=99t know where the TLS errors come from either. I sometimes get this too, it's annoying! It was first reported as https://issues.guix.gnu.org/42902. My debug foo in this area is rather weak unfortunately. Thanks, Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Nov 2021 05:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Thiago Jung Bauermann Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.16360887734164 (code B ref 51428); Fri, 05 Nov 2021 05:07:01 +0000 Received: (at 51428) by debbugs.gnu.org; 5 Nov 2021 05:06:13 +0000 Received: from localhost ([127.0.0.1]:44349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mirQb-000156-9J for submit@debbugs.gnu.org; Fri, 05 Nov 2021 01:06:13 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:37376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mirQZ-00014t-EY for 51428@debbugs.gnu.org; Fri, 05 Nov 2021 01:06:11 -0400 Received: by mail-qk1-f169.google.com with SMTP id r8so7852879qkp.4 for <51428@debbugs.gnu.org>; Thu, 04 Nov 2021 22:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=DwTcOVF6h9MMuiVPZZ93O8yGefWEpvK9zkL7e+G3aAI=; b=QNX9JtuwkhDbHJRo6dwwKKNvrJ4Gg7nXC/5F2UmnPws2nwdkfRn9SmW2kDVnw66t0+ 5NX1tloDr8OIXu3xJi/OTJw930piLBEM58fcStjAIkGCWDSfC277c0ZWCGydwfIjcGol QbaK6r8coBYJZgDA2ebuHfEuZSIRRVkp6z62iNgn5LoZXgTqSECofd6ULpoa/9grQu9a pVbEaB3toygNOBhw9wpnN6N370TsaGde9NOWa2IzkWkZHJwYwQ6w9OilvtjAgeeRn+rZ iJ1KziRk02osf0fSWeVqh8ySQdBNImgOpjqPPRKB1DLj/pbtdb/YukEzzsdoIJ2l4Y3K XcQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=DwTcOVF6h9MMuiVPZZ93O8yGefWEpvK9zkL7e+G3aAI=; b=zPpPTaIhPdLte/uzxQTXV/TK/v/z5H7eDNfS7iGS8iHl1bX2RF1vCmOmlb8t59Z0jy Ct6I8IeSQg1VzegCtVmCa+cuXeY8+QrvmhReu3oXuw7/kCnnfozEAd7lgsVOEFieJMkO rX9kqLUOgbM7iVFHJpXJ0k/kyJFkzSnR5WGnaS31t3BeW/vQUGYDLsapSRz9/1INw5nx HwU2MSuC0E1vUgh21GPBgGnMGdOSuNnbeNU9X0/+iC3IcAMnKwES7XU/ypan9IFkczVL YHIZQHwMx6gFfid5IcVocSn+82/0Ur7Kq2BFYZd+26F/b26t0h9A+x0h8pDo8YyKfs/7 kKzA== X-Gm-Message-State: AOAM5302teuOAW2Boz3pPd1djV+oafBCLZSZBWRTU8Y5iTYT+PjwUm5/ BuF1K/6oWqupKxMLc10MMcx2vaear/c4Ow== X-Google-Smtp-Source: ABdhPJwngzWQQuQvVRnhr2+ItaBSzgNqH4SHaKDt0C2GUsnJT3pW0Gba9ILQ0y6McyMSilr2/VUiJw== X-Received: by 2002:a37:548:: with SMTP id 69mr10308358qkf.26.1636088765656; Thu, 04 Nov 2021 22:06:05 -0700 (PDT) Received: from hurd (dsl-156-19.b2b2c.ca. [66.158.156.19]) by smtp.gmail.com with ESMTPSA id f3sm5422072qtf.55.2021.11.04.22.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 22:06:05 -0700 (PDT) From: Maxim Cournoyer References: <87v91jcdvy.fsf@gmail.com> <1723112.AEdn0yoaQS@popigai> <87bl37a8ys.fsf@gmail.com> <5311476.e0r0s4ehiO@popigai> Date: Fri, 05 Nov 2021 01:06:04 -0400 In-Reply-To: <5311476.e0r0s4ehiO@popigai> (Thiago Jung Bauermann's message of "Tue, 02 Nov 2021 23:37:47 -0300") Message-ID: <8735ob42f7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Thiago, Thiago Jung Bauermann writes: > Hello again, > > Em sexta-feira, 29 de outubro de 2021, =C3=A0s 17:10:03 -03, Maxim Courno= yer > escreveu: >> In other news I've added a polkit-duktape package on the cufbc branch. >> Feel free to try it (with some transformation applied, or by hacking >> s/polkit/polkit-duktape/ manually in your checkout). > > Thank you for providing that package. I tried it with the patch at the end > of this message, and GTK+ built! Though I don=E2=80=99t think I have a wa= y to test > whether polkit-duktape works well. > > I was even able to build Emacs, but when I tried to install it there was > this error: > > guixp9: ./pre-inst-env guix package -p /tmp/profile -i emacs > =E2=8B=AE > building /gnu/store/cm09wbm7wj7k237df58rny22ghkmmcg8-emacs-27.2.drv... > building CA certificate bundle... > listing Emacs sub-directories... > building fonts directory... > generating GdkPixbuf loaders cache... > builder for `/gnu/store/w3bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pixbuf-loade= rs-cache-file.drv' failed to produce output path `/gnu/store/g4pj8hm97bl3fw= nbami0j3g5ycvnh559-gdk-pixbuf-loaders-cache-file' > build of /gnu/store/w3bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pixbuf-loaders-c= ache-file.drv failed > View build log at '/var/log/guix/drvs/w3/bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-g= dk-pixbuf-loaders-cache-file.drv.bz2'. > cannot build derivation `/gnu/store/7hd26alx72spjadmfhs6ssfd6zs815l7-prof= ile.drv': 1 dependencies couldn't be built > guix package: error: build of `/gnu/store/7hd26alx72spjadmfhs6ssfd6zs815l= 7-profile.drv' failed > > > The build log is just a bzip2-compressed empty file, though: > > guixp9: ls -l /var/log/guix/drvs/w3/bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pi= xbuf-loaders-cache-file.drv.bz2 > -rw-r--r-- 1 root root 14 Nov 2 23:10 /var/log/guix/drvs/w3/bmrsz4v0bcz1= s5gsd6dl83jrn0yk7n-gdk-pixbuf-loaders-cache-file.drv.bz2 > guixp9: bzcat /var/log/guix/drvs/w3/bmrsz4v0bcz1s5gsd6dl83jrn0yk7n-gdk-pi= xbuf-loaders-cache-file.drv.bz2=20=20=20=20=20=20=20 > guixp9:=20 > > Unfortunately I=E2=80=99ve been having less time to work on Guix lately, = and > I wasn=E2=80=99t able yet to investigate this issue further. Also, I wil= l be on > travel for about a week with very little access to the internet, so I won= =E2=80=99t > be able to respond or experiment further until I=E2=80=99m back. > > This was based on c.u.f.b.c. commit eae3355ec8ad. Ah, I could reproduce this! It seems to happen when no loader libraries were found amongst the inputs. As a workaround, you could install e.g. gdk-pixbuf (which itself provides loaders) in the profile. I'll see how this can be fixed, but at least we won't need to rebuild the world as it's a problem at the level of the profile hook. --8<---------------cut here---------------start------------->8--- (define (gdk-pixbuf-loaders-cache-file manifest) "Return a derivation that produces a loaders cache file for every gdk-pix= buf loaders discovered in MANIFEST." (define gdk-pixbuf ;lazy reference (module-ref (resolve-interface '(gnu packages gtk)) 'gdk-pixbuf)) (mlet %store-monad ((%gdk-pixbuf? (manifest-lookup-package manifest "gdk-pixbuf")) (gdk-pixbuf-bin -> (file-append gdk-pixbuf "/bin"))) (define build (with-imported-modules (source-module-closure '((guix build glib-or-gtk-build-system))) #~(begin (use-modules (guix build glib-or-gtk-build-system)) (setenv "PATH" (string-append #$gdk-pixbuf-bin ":" (getenv "PAT= H"))) (generate-gdk-pixbuf-loaders-cache '#$(manifest-inputs manifest) (list #$output))))) (if %gdk-pixbuf? (gexp->derivation "gdk-pixbuf-loaders-cache-file" build #:local-build? #t #:substitutable? #f #:properties '((type . profile-hook) (hook . gdk-pixbuf-loaders-cache-file))) (return #f)))) --8<---------------cut here---------------end--------------->8--- It's curious that it would occur though, because I thought that when gdk-pixbuf was found with `manifest-lookup-package', it meant it'd also be part of the manifest inputs? Apparently it isn't the case. Weird! Thanks for the report! Maxim From unknown Fri Aug 08 15:18:33 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] core-updates-frozen-batched-changes built and ready to merge Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Nov 2021 00:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxim Cournoyer Cc: 51428@debbugs.gnu.org Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.16366773224428 (code B ref 51428); Fri, 12 Nov 2021 00:36:02 +0000 Received: (at 51428) by debbugs.gnu.org; 12 Nov 2021 00:35:22 +0000 Received: from localhost ([127.0.0.1]:42628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlKXK-00019L-4B for submit@debbugs.gnu.org; Thu, 11 Nov 2021 19:35:22 -0500 Received: from mx.kolabnow.com ([212.103.80.155]:2706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlKXI-000198-7p for 51428@debbugs.gnu.org; Thu, 11 Nov 2021 19:35:20 -0500 Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id 402921098; Fri, 12 Nov 2021 01:35:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-type:content-type:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1636677314; x=1638491715; bh=GLzJOR4/DpNprdOJ7f9/g2GNrdPsfarpWsd ZVCUcw1c=; b=py7BjAmzyJsW9Mott815vtuDbcAjv2FcuOn0UJ8bOcnjxF2k7RA jCLdlDglo9K61qD4mBmWVwKi2z0ZLYbNU1MGGdYLFOkQK/uROCspQFdMUmGKgR1Y jiMB9bcgX4dlmuTbQXT35eutrAEBNY+sNFxlSqMufknn/TSrXNpYk6UROjEOBQHi ReTE+o0ROxeUafwqBLJv2CF/J7AWndduwtn9xBU0Ozvfyi1rn1cPku4sRG0xDXMH 3JuyIKi7IHQaiIT845yQU9HJmQ/XFje74N7wsRPrsYUQ0Wd5f+GHk8Q3G57NE6WO TkeDDx8AvqmV0XKnQJNfZItfyrDyxiv36g0p2x7Y0RBGcUIbs46NUZHbOM/SBFI4 evSz8H6Br/gloU9TpQrqEINlP3FGSlzz6zQ9qNWAiYZbx37rqUmW+c1tTxfat2h0 NzO545dwD0D51EW8XbUvY3fptJ9tZ9vfagmgPL+dGTcsely+N4Cax2lBdEhQXAdz mBLgAw1sYWhxIjNG4U5Bm109oX1Vwk9W+Q3Z7tl5iTpcfSB0ycdjijjFk+JvWKi2 s6Sim8/t+Ql5AcjqrNDbOj9uIgezO74Tt+qQZEDQqXx9BZzDcwl7tboKvDNQvSPD o/WaHbRC2reLJlzCW3jUa3JSfD/H1O2l0HBbP7LtwengYsTUaQuqugqA= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-10 required=5 tests=[BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xoYowPX34eic; Fri, 12 Nov 2021 01:35:14 +0100 (CET) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by mx.kolabnow.com (Postfix) with ESMTPS id C58C85F4; Fri, 12 Nov 2021 01:35:12 +0100 (CET) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 2F29AA48; Fri, 12 Nov 2021 01:35:12 +0100 (CET) From: Thiago Jung Bauermann Date: Thu, 11 Nov 2021 21:35:06 -0300 Message-ID: <3063359.q1fMdWyH99@popigai> In-Reply-To: <8735ob42f7.fsf@gmail.com> References: <87v91jcdvy.fsf@gmail.com> <5311476.e0r0s4ehiO@popigai> <8735ob42f7.fsf@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Maxim, Em sexta-feira, 5 de novembro de 2021, =C3=A0s 02:06:04 -03, Maxim Cournoye= r=20 escreveu: > It's curious that it would occur though, because I thought that when > gdk-pixbuf was found with `manifest-lookup-package', it meant it'd also > be part of the manifest inputs? Apparently it isn't the case. Weird! I=E2=80=99m glad you found out what the problem was. I didn=E2=80=99t know = where to start=20 investigating it! > Thanks for the report! Thank you for looking into it. Should I open a bug report about it? =2D-=20 Thanks, Thiago From unknown Fri Aug 08 15:18:33 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Maxim Cournoyer Subject: bug#51428: closed (Re: [bug#51428] core-updates-frozen-batched-changes built and ready to merge) Message-ID: References: <87k0heq6ul.fsf@gmail.com> <87v91jcdvy.fsf@gmail.com> X-Gnu-PR-Message: they-closed 51428 X-Gnu-PR-Package: guix-patches Reply-To: 51428@debbugs.gnu.org Date: Fri, 12 Nov 2021 05:31:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1636695063-2487-1" This is a multi-part message in MIME format... ------------=_1636695063-2487-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #51428: core-updates-frozen-batched-changes built and ready to merge which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 51428@debbugs.gnu.org. --=20 51428: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D51428 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1636695063-2487-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 51428-done) by debbugs.gnu.org; 12 Nov 2021 05:30:03 +0000 Received: from localhost ([127.0.0.1]:42936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlP8V-0000bJ-8Q for submit@debbugs.gnu.org; Fri, 12 Nov 2021 00:30:03 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:46675) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mlP8T-0000aN-Gp for 51428-done@debbugs.gnu.org; Fri, 12 Nov 2021 00:30:02 -0500 Received: by mail-qt1-f176.google.com with SMTP id m25so7445930qtq.13 for <51428-done@debbugs.gnu.org>; Thu, 11 Nov 2021 21:30:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=QYCxnlWGtzkVkvt0vHYYzFzGpfqbCFxBvnAayx1dNWQ=; b=cMg8tHB4H/RdEUzw1OpubT55V3uWGsGxt3XIgbPCLubfiR+3Wfct7zndy+xV4lbV1T AyipLU42Zzl90cLTnQC7GL6ttwMGMcVjNj0XB3/0Eh3NOt/Iaa6NsJ/0JYXtixksNstU 4+VtEM+DNfZiACK7X1fxrLp4FJtI7c7KdIiQEstIVNleeYBOGA7GlxWgSTw7USdzIwnj o9kEm9/z9YIDOrwVHhL54a8qkJSjrB6mlVR4TYrVKmFct0r3wMSz1AOgfSsYH3gZ/m1H YszOMc+wpoURwopZy0FNbo9mOjucjpItezC044dP1g0m+phagwEmXJlXUizEZsqwZ0Ma j4eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=QYCxnlWGtzkVkvt0vHYYzFzGpfqbCFxBvnAayx1dNWQ=; b=QGGbQ0TtRfc0AGet3yfuUyc3y8cSS0NuzYmYAVYXTDmB5FGZ0Kisj4Kq85vMdsMFYH opSNdq6lqTUe16jOcZJnnBSqFDjRuXRAUL113H+NNcZUb+Uil3381IvYXNwhDWOZlhZO 7g+6/yqk8CgWWHYco2JviBVQXG6kPXad3kVyisvUr+6TZvIHSAX98p5CWb+VrSb76p05 L0x7uHrTZOPlfljzRwHmkOTI+CS8zql0erK6LnUpRyP9Kc5TQLTxBhvKRYygWzvy/ter IYJB5j44JG8yUnNgyPy08IDIq9b9CYpzIbwJ7vOPOYGaTfn+a86NlfjGVFmIbsv5Ayq9 0mwQ== X-Gm-Message-State: AOAM533K+6nx94u2jKmndFZGu1ongURxW3r5u4yi6uCyOGzJID0XnOVk EwQyHVsqFRtKE2xJ3+H+DERlhm3WFLbAHA== X-Google-Smtp-Source: ABdhPJwW8/RqeGKDXOO5bjvQt1Z9ut/QorlhhvGn9DZPqVhutHVWTWg64GCdbWi/+34yZ+byhI0D5A== X-Received: by 2002:a05:622a:1705:: with SMTP id h5mr13583803qtk.331.1636694995907; Thu, 11 Nov 2021 21:29:55 -0800 (PST) Received: from hurd (dsl-10-133-155.b2b2c.ca. [72.10.133.155]) by smtp.gmail.com with ESMTPSA id j20sm2628119qtj.72.2021.11.11.21.29.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 21:29:55 -0800 (PST) From: Maxim Cournoyer To: Thiago Jung Bauermann Subject: Re: [bug#51428] core-updates-frozen-batched-changes built and ready to merge References: <87v91jcdvy.fsf@gmail.com> <5311476.e0r0s4ehiO@popigai> <8735ob42f7.fsf@gmail.com> <3063359.q1fMdWyH99@popigai> Date: Fri, 12 Nov 2021 00:29:54 -0500 In-Reply-To: <3063359.q1fMdWyH99@popigai> (Thiago Jung Bauermann's message of "Thu, 11 Nov 2021 21:35:06 -0300") Message-ID: <87k0heq6ul.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51428-done Cc: 51428-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Thiago, Thiago Jung Bauermann writes: > Hello Maxim, > > Em sexta-feira, 5 de novembro de 2021, =C3=A0s 02:06:04 -03, Maxim Courno= yer=20 > escreveu: >> It's curious that it would occur though, because I thought that when >> gdk-pixbuf was found with `manifest-lookup-package', it meant it'd also >> be part of the manifest inputs? Apparently it isn't the case. Weird! > > I=E2=80=99m glad you found out what the problem was. I didn=E2=80=99t kno= w where to start=20 > investigating it! > >> Thanks for the report! > > Thank you for looking into it. Should I open a bug report about it? No, the commit 20e3dd052d7e4f59273e3646d3533d43c87c30b0 contains a workaround guarding against such situation. Thanks :-). ------------=_1636695063-2487-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Oct 2021 04:04:11 +0000 Received: from localhost ([127.0.0.1]:48064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaAd-0003fG-AV for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:04:11 -0400 Received: from lists.gnu.org ([209.51.188.17]:58290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfaAY-0003f4-HS for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:04:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfaAY-0007aH-CB for guix-patches@gnu.org; Wed, 27 Oct 2021 00:04:06 -0400 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]:42938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfaAW-0007ZA-OD for guix-patches@gnu.org; Wed, 27 Oct 2021 00:04:06 -0400 Received: by mail-qv1-xf33.google.com with SMTP id jk5so952038qvb.9 for ; Tue, 26 Oct 2021 21:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=vpsA89t/xvnngQoCMsvTj1AMqDTOxAw6g1DgHidtDiQ=; b=d+W1paRtdWHIZ3M/+atu6VZ+dg/zbgx1BjUfnizTOv3pGVB02pK0fTrNcoGsyvM9pJ 87eZBl5PTvxqdxc54FQyuGKJu78ZpC8tExh51K/xP/kyX5YNsxkUezxF20q/+jl+/T4v cvQBrD4XrQhHsMzrc7ZimwZcLdl6P0nbg7V4NHVEvETodSoOQ8tELsNpr1Ja4+UwGYJd KCfA13LT1/Vmbj9KvnuSFi4Islqwpg/rAgJKpHu+sJ+nP9gtxvaruTMLMXElKNGo54dt bhAh9phY9ubY1V/Xo59bLRHUmmzmfTQk2fb+aB38xdZhijbEr4wWNDZNX70+pb08nbGg GV7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=vpsA89t/xvnngQoCMsvTj1AMqDTOxAw6g1DgHidtDiQ=; b=QBarBy+KcYRFf/buOaIV0AIvVxQLnT9JzOdVV3cQwtSUYb2wdrpV5f6LAUjBSYQe4a wGQHD8yyxT5s5J1I+g742qAiFR+FLX0X5VFEHPAxmTdSczsiyto8SeD5o4ERRstbfDC8 b+aLDxVWtHkiZsXr7hmSkmOmNVNBex9ZZkCEMoZi58j1to7hunx+b4xTp6cr/4DeD5/f /N8QsHGpPEVHbVS9yQYIFNh8W0EiRGACPG/qz1iBA/xkn3PqensT3bMQaPlsAg6IC44w lkifLxmPASZ5PIV/THQk252Yvb+CgChcqDOVE7WFT2EMShpY1pHe3OJzJ145CwVHCzHQ F7Mg== X-Gm-Message-State: AOAM532JoZZfuVQuAWYTDeXx/F28HRjwUp1WopH+p4uJYLKXbGlzwnDI 1xHNdJlPjmbp7KIKpZ/Y+MYZOgS2vHk= X-Google-Smtp-Source: ABdhPJzJpK7kBdZmNk+S6ogmz7lYlQHjUgnK/w1jXbxRXLD6qGB/r5/3yJtVZS5a6EjfFDQHYI5JDA== X-Received: by 2002:a05:6214:1250:: with SMTP id q16mr7333904qvv.52.1635307443117; Tue, 26 Oct 2021 21:04:03 -0700 (PDT) Received: from hurd (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id w11sm13169697qta.50.2021.10.26.21.04.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:04:02 -0700 (PDT) From: Maxim Cournoyer To: guix-patches Subject: core-updates-frozen-batched-changes built and ready to merge Date: Wed, 27 Oct 2021 00:04:01 -0400 Message-ID: <87v91jcdvy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::f33; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qv1-xf33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, I've experimented quite a bit with core-updates-frozen-batched-changes in the last weeks, and it seems to be in a decent shape, good enough to merge into core-updates-frozen, I think. I'd like to bring attention to some non-trivial changes that I included in the branch: 1. merging of the staging branch -- quite a few conflicts had to be resolved. 2. Replacement of inkscape@0.92 by inkscape@1.1, which required solving some dependency cycles. 3. Fix for https://issues.guix.gnu.org/50957 via a new search path specification on gdk-pixbuf and accompanying build phase and profile hook. I'll send the corresponding patches for review, which can also be consulted directly on the core-updates-frozen-batched-changes branch, which I've manually built on Berlin for things such as Rust and ungoogled-chromium. I'd like to merge it into core-updates-frozen by the beginning of November, unless there are problems you can spot :-). Thank you, Maxim ------------=_1636695063-2487-1--