From patchwork Fri Feb 18 07:50:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 37310 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1DB6C27BBE9; Fri, 18 Feb 2022 07:52:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 455D627BBEA for ; Fri, 18 Feb 2022 07:52:11 +0000 (GMT) Received: from localhost ([::1]:54014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nKy3m-00079E-C7 for patchwork@mira.cbaines.net; Fri, 18 Feb 2022 02:52:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nKy3e-00078n-W8 for guix-patches@gnu.org; Fri, 18 Feb 2022 02:52:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nKy3e-000599-N7 for guix-patches@gnu.org; Fri, 18 Feb 2022 02:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nKy3e-0001s4-Hf for guix-patches@gnu.org; Fri, 18 Feb 2022 02:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53434] Patches to unbreak many i686 packages Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Feb 2022 07:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 53434@debbugs.gnu.org, Denis 'GNUtoo' Carikli Received: via spool by 53434-submit@debbugs.gnu.org id=B53434.16451706697134 (code B ref 53434); Fri, 18 Feb 2022 07:52:02 +0000 Received: (at 53434) by debbugs.gnu.org; 18 Feb 2022 07:51:09 +0000 Received: from localhost ([127.0.0.1]:53357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKy2c-0001qV-JV for submit@debbugs.gnu.org; Fri, 18 Feb 2022 02:51:09 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:58450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nKy2X-0001qI-Cx for 53434@debbugs.gnu.org; Fri, 18 Feb 2022 02:50:57 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id wXqr260064UW6Th01XqrpZ; Fri, 18 Feb 2022 08:50:51 +0100 Message-ID: From: Maxime Devos Date: Fri, 18 Feb 2022 08:50:45 +0100 In-Reply-To: <87ee41ojxe.fsf@gnu.org> References: <20220122025926.22804-1-GNUtoo@cyberdimension.org> <20220122025926.22804-11-GNUtoo@cyberdimension.org> <8735kiyl1q.fsf_-_@gnu.org> <87ee41ojxe.fsf@gnu.org> User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1645170651; bh=OatJn9LXJXxI712xqBS4EmLd2KB2hlX+DA4TfJ3pL0k=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=g2WXASBeUZJaO5j3J3i8axQfcD+R7hiMkxbtw/G/pVrIbNP5bN9Xo39K9bLFWtnWj 9dzOwelLUV2LEenmaK77BoE8gQGMC9STVnrc3Eia+cpBi8fXvIw41Zvqzw0HaL9EB4 Gu9xWL4ZIUEbdYX+LRP0OykroOdSYqr6Td02IsnBFV3jieSFP/x4ekQnUlQdc5Bf44 k0La8jJL7v+iTTJFE03jTtClS4nW47uJVr/jzey/Puqh/s4U3cAUWkpg2zkWBpVOUE QQFNeXYWD1zsgls5jo7w7vbxNGMFv1GLUSJVcRfN+IwebhHxxiPNCCOd8krvDoCTln ntu15uzk/10gg== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès schreef op do 17-02-2022 om 11:40 [+0100]: > Yes, we can do that on master. Do you want to give it a try? See attachment! I verified that: * upower builds: ./pre-inst-env guix build upower * upower builds on i686: ./pre-inst-env guix build upower --system=i686-linux * linting (almost) succeeds: ./pre-inst-env guix lint upower umockdev [...] upower@0.99.15: label 'glib' does not match package name 'glib:bin' I just did `(,glib "bin") (new-input style), so this seems more a problem of the linter or whatever code is reponsible for constructing labels to me. [...]: upower@0.99.15: line 5457 is way too long (101 characters) It contains a long URL, so not much that can be done here. * the dependents of upower and umockdev build: ./pre-inst-env guix refresh -l upower umockdev [...]: thermald@2.4.7 gnome-power-manager@3.32.0 rhythmbox@3.4.4 eiciel@0.9.13.1 gnome-tweaks@40.0 gpaste@3.42.2 gnome-shell-extension-gsconnect@33 arc-theme@20210412 numix-gtk-theme@2.6.7 gnome@41.0 eolie@0.9.101 wmbattery@2.54 mate@1.24.1 mixxx@2.3.2 xfce@4.16.0 usbguard@0.7.8 ./pre-inst-env guix build thermald@2.4.7 gnome-power-manager@3.32.0 rhythmbox@3.4.4 eiciel@0.9.13.1 gnome-tweaks@40.0 gpaste@3.42.2 gnome-shell-extension-gsconnect@33 arc-theme@20210412 numix-gtk-theme@2.6.7 gnome@41.0 eolie@0.9.101 wmbattery@2.54 mate@1.24.1 mixxx@2.3.2 xfce@4.16.0 usbguard@0.7.8 This took to long to run it to the end, but no build failures so far It has _not_ been verified whether this upower is usable for system services! Some remarks: * "guix refresh -u upower" did not work completely because the 'commit' field was (string-append "UPOWER_" (string-map (match-lambda (#\. #\_) (chr chr)) version)) before the update and (string-append "v" version) after the update, which (guix upstream) does not not how to change. If the tag was replaced by the commit it referred to, this would not have been necessary. Greetings, Maxime. From 3771de31fc23a626eebb153589ceac4aa25189f6 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 17 Feb 2022 19:05:26 +0000 Subject: [PATCH 6/6] gnu: upower: Remove obsolete phase Now umockdev-wrapper refers to things by absolute path, this phase is no longer necessary. * gnu/packages/gnome.scm (upower)[arguments]<#:phases>{pre-check}: Remove. --- gnu/packages/gnome.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 64571d414a..708542ccd7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5469,13 +5469,6 @@ faster results and to avoid unnecessary server load.") (arguments (list #:glib-or-gtk? #t - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((umockdev (string-append (assoc-ref inputs "umockdev") - "/lib"))) - (setenv "LD_LIBRARY_PATH" umockdev))))) #:configure-flags #~(list "-Dsystemdsystemunitdir=no" ;; If not specified, udev will try putting history information -- 2.30.2