From patchwork Fri Jan 21 18:17:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 36716 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 7BF5E27BBEA; Fri, 21 Jan 2022 18:19:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,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 F09D527BBE9 for ; Fri, 21 Jan 2022 18:19:19 +0000 (GMT) Received: from localhost ([::1]:43318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAyVL-0003Y1-3e for patchwork@mira.cbaines.net; Fri, 21 Jan 2022 13:19:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAyV5-0003WI-BT for guix-patches@gnu.org; Fri, 21 Jan 2022 13:19:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAyV5-0005HQ-1P for guix-patches@gnu.org; Fri, 21 Jan 2022 13:19:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nAyV4-0005xh-Id for guix-patches@gnu.org; Fri, 21 Jan 2022 13:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53418] [PATCH] gnu: piper: Fix build. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jan 2022 18:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53418 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53418@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.164278909822851 (code B ref -1); Fri, 21 Jan 2022 18:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jan 2022 18:18:18 +0000 Received: from localhost ([127.0.0.1]:35033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAyUH-0005wM-NZ for submit@debbugs.gnu.org; Fri, 21 Jan 2022 13:18:18 -0500 Received: from lists.gnu.org ([209.51.188.17]:44060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAyUD-0005wC-Ba for submit@debbugs.gnu.org; Fri, 21 Jan 2022 13:18:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAyUB-0002u1-RG for guix-patches@gnu.org; Fri, 21 Jan 2022 13:18:09 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:49433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAyU8-0005Bb-To for guix-patches@gnu.org; Fri, 21 Jan 2022 13:18:07 -0500 Date: Fri, 21 Jan 2022 18:17:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1642789081; bh=hXkE1E6LCmVn4GyHGij64oZqt49w7zqKk9x6elx1yss=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=DWu3EiSFshMciuoONKDyzUgscuVhh75+VrKjA/HZrGIMXKF1Ua469lppYTExm3Owl X1PrnJERkOM/E30cuF9obKkeasM0FSgo0Sl1CVZWMGKS9NPGk31jCRQcJwuWWFxW+D 4VmuaQOyir80Nu8LNvPdFCqckhMSnhNdzqppQODW5tDB2/dJPXrxAKRxMZhSrkVba3 JtVmZpOMS2XVDIkUJMa+tLT2Zd9uYcJSzuc2KyLzb9cLDyAZK5iJxdQBlf08oy8+qY 9y0t2BG1kn7g7BHu0Vzoz0/STTP5Zaj8Ze4uH5glqvgK4XxOGdube+0e0bViVAH7yy LZXzyxRtGe7lA== Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.22; envelope-from=john.kehayias@protonmail.com; helo=mail-4322.protonmail.ch 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_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hello, This is a followup to https://issues.guix.gnu.org/53372 fixing Piper (which uses libratbag). Python was added to the inputs to fix the build since Meson does not propagate Python (added to inputs rather than native-inputs as guix gc shows a reference to Python). That allows Piper to build but it had a librsvg error on startup, like syncthing-gtk in https://issues.guix.gnu.org/52651 Fixed the same way here by removing librsvg from inputs since it is propagated by gtk+. (Also simplified the input labels while I was at it, but my quick attempt at rewriting the phases with gexps didn't get far. Since I didn't find any similar examples in current packages, I left it as is for now.) Thanks! John From 5ae7945017dc4d664bdc6ddbffaea6422db72402 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 21 Jan 2022 13:05:15 -0500 Subject: [PATCH] gnu: piper: Fix build. Since commit 6f36d0c89e3bf19bb7bb8f7f5b77de30c9af861b, Meson no longer propagates Python. GTK+ propagates librsvg-bootstrap which causes a startup error due to two librsvg being GI_TYPELIB_PATH. * gnu/packages/gnome.scm (piper)[inputs]: Add PYTHON. Remove LIBRSVG. Simplify. [native-inputs]: Simplify. [arguments]: Remove trailing #t from phases. --- gnu/packages/gnome.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 088c368054..565e3987b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Daniel Meißner ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -12101,21 +12102,21 @@ (define-public piper (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("python-flake8" ,python-flake8))) + (list gettext-minimal + `(,glib "bin") + gobject-introspection + pkg-config + python-flake8)) (inputs - `(("adwaita-icon-theme" ,adwaita-icon-theme) - ("gtk" ,gtk+) - ("gtk:bin" ,gtk+ "bin") - ("libratbag" ,libratbag) - ("librsvg" ,librsvg) - ("python-evdev" ,python-evdev) - ("python-lxml" ,python-lxml) - ("python-pycairo" ,python-pycairo) - ("python-pygobject" ,python-pygobject))) + (list adwaita-icon-theme + gtk+ + `(,gtk+ "bin") + libratbag + python + python-evdev + python-lxml + python-pycairo + python-pygobject)) (arguments `(#:imported-modules ((guix build python-build-system) ,@%meson-build-system-modules) @@ -12128,8 +12129,7 @@ (define-public piper (add-after 'unpack 'dont-update-gtk-icon-cache (lambda _ (substitute* "meson.build" - (("meson.add_install_script('meson_install.sh')") "")) - #t)) + (("meson.add_install_script('meson_install.sh')") "")))) ;; TODO: Switch to wrap-script when it is fixed. (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap)) @@ -12137,8 +12137,7 @@ (define-public piper (lambda* (#:key outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out" )"/bin/piper") - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) - #t))))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (home-page "https://github.com/libratbag/piper/") (synopsis "Configure bindings and LEDs on gaming mice") (description "Piper is a GTK+ application for configuring gaming mice with -- 2.34.0