From patchwork Mon Dec 30 17:42:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 19480 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 478F7179A8; Mon, 30 Dec 2019 17:43:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0B3061797C for ; Mon, 30 Dec 2019 17:43:10 +0000 (GMT) Received: from localhost ([::1]:35280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilz4P-0000gc-Dp for patchwork@mira.cbaines.net; Mon, 30 Dec 2019 12:43:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57864) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilz4K-0000gW-2c for guix-patches@gnu.org; Mon, 30 Dec 2019 12:43:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ilz4I-00057Y-Vd for guix-patches@gnu.org; Mon, 30 Dec 2019 12:43:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55581) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ilz4I-00057M-Sy for guix-patches@gnu.org; Mon, 30 Dec 2019 12:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ilz4I-0006Yr-Mq for guix-patches@gnu.org; Mon, 30 Dec 2019 12:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38820] [PATCH] gnu: arandr: Fix build. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2019 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38820 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38820@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157772774125165 (code B ref -1); Mon, 30 Dec 2019 17:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Dec 2019 17:42:21 +0000 Received: from localhost ([127.0.0.1]:33321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ilz3d-0006Xp-IS for submit@debbugs.gnu.org; Mon, 30 Dec 2019 12:42:21 -0500 Received: from lists.gnu.org ([209.51.188.17]:38216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ilz3c-0006Xi-GJ for submit@debbugs.gnu.org; Mon, 30 Dec 2019 12:42:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57803) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ilz3a-0000dU-U0 for guix-patches@gnu.org; Mon, 30 Dec 2019 12:42:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ilz3Z-0004hL-Bh for guix-patches@gnu.org; Mon, 30 Dec 2019 12:42:18 -0500 Received: from mout01.posteo.de ([185.67.36.65]:54182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ilz3Y-0004gA-Tg for guix-patches@gnu.org; Mon, 30 Dec 2019 12:42:17 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C669A160060 for ; Mon, 30 Dec 2019 18:42:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1577727733; bh=JqqrfWs9+ESuVrF6LagfizfgkOl0GBwfqErSWbRLJ0I=; h=From:To:Cc:Subject:Date:From; b=lyxXMh7eeqw0Dvuel8ur5zgoLgHcylx0DvwCD/guUEMRFyN8dJyLi8L3fVDTF74U3 VdOFpK7DweyLvC8R5MKwZ2hYXazuA357mQSlqgPPHxKOmZEj1jwBFMDpCcLRggjxCV 5OdTO3rq+jH47pAV7PkjQI2FrFDtdGDrnmJurjVSGnDyo6ymBYnCQMSM6vhN/oBvB6 iQFpjaPEHSTwv99Jt781qJF+MbvyKVYr1FTTiUYA/4lh4CPXVxI3LMBcFks0CNw8az wXeaweXmOL0tYin6SkaEynFH9kID9vi8wDSshwlRbxQkFq6IcZL4dFxBwyA3wa2hN+ 7n/S6GW7o4UAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 47ml9w563qz6tm7; Mon, 30 Dec 2019 18:42:12 +0100 (CET) From: Kei Kebreau Date: Mon, 30 Dec 2019 12:42:05 -0500 Message-Id: <20191230174205.18101-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 This is a follow-up to commit 218c785850d5ecf3a7646d81ce90445419a5103b. [arguments]: Remove unnecessary #:python flag. Add 'wrap-gi-typelib' phase. [inputs]: Remove python2-pygtk and add gtk+, python-pycairo, and python-pygobject. [native-inputs]: Replace python2-docutils with python-docutils. --- gnu/packages/xdisorg.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9b198a02da..ecf8973a82 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -115,20 +115,28 @@ #t)))) (build-system python-build-system) (arguments - `(#:python ,python-2 ;incompatible with python 3 - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'build 'configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "screenlayout/xrandr.py" (("\"xrandr\"") (string-append "\"" (assoc-ref inputs "xrandr") "/bin/xrandr\""))) + #t)) + (add-after 'install 'wrap-gi-typelib + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/arandr") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) #t))) #:tests? #f)) ;no tests - (inputs `(("pygtk" ,python2-pygtk) + (inputs `(("gtk+" ,gtk+) + ("pycairo" ,python-pycairo) + ("pygobject" ,python-pygobject) ("xrandr" ,xrandr))) (native-inputs `(("gettext" ,gettext-minimal) - ("python-docutils" ,python2-docutils))) + ("python-docutils" ,python-docutils))) (home-page "https://christian.amsuess.com/tools/arandr/") (synopsis "Another RandR graphical user interface") ;; TRANSLATORS: "X11 resize-and-rotate" should not be translated.