[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: hplip: Add Qt GUI support.
From: |
Tobias Geerinckx-Rice |
Subject: |
09/09: gnu: hplip: Add Qt GUI support. |
Date: |
Thu, 21 Jun 2018 12:54:18 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 407ef4b38ad394e0b63320b029d95afdd3da6888
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Tue Jun 19 20:02:42 2018 +0200
gnu: hplip: Add Qt GUI support.
Some tools (like ‘hp-toolbox’) still refuse to launch, but at least
others (like ‘hp-systrax’) now seem to work.
* gnu/packages/cups.scm (hplip)[arguments]: Add #configure-flags for Qt.
[inputs]: Add python-gobject and python-pyqt.
---
gnu/packages/cups.scm | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 92c712e..2fedd3a 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -40,6 +40,7 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages python)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages scanner)
#:use-module (gnu packages tls)
#:use-module (guix build-system gnu)
@@ -424,7 +425,8 @@ device-specific programs to convert and print many types of
files.")
,(string-append "--with-icondir="
(assoc-ref %outputs "out") "/share/applications")
,(string-append "--with-systraydir="
- (assoc-ref %outputs "out") "/etc/xdg"))
+ (assoc-ref %outputs "out") "/etc/xdg")
+ "--enable-qt5" "--disable-qt4")
#:imported-modules ((guix build python-build-system)
,@%gnu-build-system-modules)
@@ -463,7 +465,7 @@ device-specific programs to convert and print many types of
files.")
(string-append "hplip_confdir = " out
"/etc/hp"))
(("halpredir =
/usr/share/hal/fdi/preprobe/10osvendor")
- ;; Note: We don't use hal.
+ ;; We don't use hal.
(string-append "halpredir = " out
"/share/hal/fdi/preprobe/10osvendor"))
(("rulesdir = /etc/udev/rules.d")
@@ -477,23 +479,30 @@ device-specific programs to convert and print many types
of files.")
(("/etc/sane.d")
(string-append out "/etc/sane.d"))))))
- ;; Wrap bin/* so that the Python libs are found.
+ ;; Wrap bin/* so that the Python libraries are found.
(add-after 'install 'wrap-binaries
(assoc-ref python:%standard-phases 'wrap)))))
- ;; Python3 support is available starting from address@hidden
- (inputs `(("libjpeg" ,libjpeg)
- ("cups-minimal" ,cups-minimal)
- ("libusb" ,libusb)
- ("sane-backends" ,sane-backends-minimal)
- ("zlib" ,zlib)
- ("dbus" ,dbus)
- ("python-wrapper" ,python-wrapper)
- ("python" ,python)
- ;; TODO: Make hp-setup find python-dbus.
- ("python-dbus" ,python-dbus)))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("perl" ,perl)))))
+ ;; Note that the error messages printed by the tools in the case of
+ ;; missing dependencies are often downright misleading.
+ ;; TODO: hp-toolbox still fails to start with:
+ ;; from dbus.mainloop.pyqt5 import DBusQtMainLoop
+ ;; ModuleNotFoundError: No module named 'dbus.mainloop.pyqt5'
+ (inputs
+ `(("cups-minimal" ,cups-minimal)
+ ("dbus" ,dbus)
+ ("libjpeg" ,libjpeg)
+ ("libusb" ,libusb)
+ ("python" ,python)
+ ("python-dbus" ,python-dbus)
+ ("python-pygobject" ,python-pygobject)
+ ("python-pyqt" ,python-pyqt)
+ ("python-wrapper" ,python-wrapper)
+ ("sane-backends" ,sane-backends-minimal)
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("perl" ,perl)
+ ("pkg-config" ,pkg-config)))))
(define-public foomatic-filters
(package
- branch master updated (945449b -> 407ef4b), Tobias Geerinckx-Rice, 2018/06/21
- 02/09: gnu: ruby-rack: Update to 2.0.5., Tobias Geerinckx-Rice, 2018/06/21
- 01/09: gnu: sdl2-image: Update to 2.0.3., Tobias Geerinckx-Rice, 2018/06/21
- 08/09: gnu: hplip: Update to 3.18.6., Tobias Geerinckx-Rice, 2018/06/21
- 07/09: Order (gnu packages cups) module imports alphabetically., Tobias Geerinckx-Rice, 2018/06/21
- 06/09: gnu: gimp: Update to 2.10.2., Tobias Geerinckx-Rice, 2018/06/21
- 05/09: gnu: gegl: Update to 0.4.2., Tobias Geerinckx-Rice, 2018/06/21
- 04/09: gnu: babl: Update to 0.1.50., Tobias Geerinckx-Rice, 2018/06/21
- 03/09: gnu: ruby-rack-protection: Update to 2.0.3., Tobias Geerinckx-Rice, 2018/06/21
- 09/09: gnu: hplip: Add Qt GUI support.,
Tobias Geerinckx-Rice <=