emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#38820: closed ([PATCH] gnu: arandr: Fix build.)


From: GNU bug Tracking System
Subject: bug#38820: closed ([PATCH] gnu: arandr: Fix build.)
Date: Sun, 05 Jan 2020 16:25:01 +0000

Your message dated Sun, 05 Jan 2020 11:23:51 -0500
with message-id <address@hidden>
and subject line Re: [bug#38820] [PATCH] gnu: arandr: Fix build.
has caused the debbugs.gnu.org bug report #38820,
regarding [PATCH] gnu: arandr: Fix build.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
38820: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38820
GNU Bug Tracking System
Contact address@hidden with problems
--- Begin Message --- Subject: [PATCH] gnu: arandr: Fix build. Date: Mon, 30 Dec 2019 12:42:05 -0500
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.
-- 
2.24.1




--- End Message ---
--- Begin Message --- Subject: Re: [bug#38820] [PATCH] gnu: arandr: Fix build. Date: Sun, 05 Jan 2020 11:23:51 -0500 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
Since there have been no complaints and this is a minor change, I've
pushed it as commit 06c8e87224decebc0a3d5bdc7d2ca13cb2b08299 on master.


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]