From 8ce52a25bcdf4d547c589e95371697c6f440888f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Nov 2020 19:18:20 +0100 Subject: gnu: hplip: Install PPDs into a separate output. * gnu/packages/cups.scm (hplip)[outputs]: Add a :ppd output. [arguments]: Install the .ppd files there. --- gnu/packages/cups.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index bfe24027fb..6365961699 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -446,6 +446,7 @@ should only be used as part of the Guix cups-pk-helper service.") "locatedriverdir = $(pkglibexecdir)\n")) #t)))) (build-system gnu-build-system) + (outputs (list "out" "ppd")) (home-page "https://developers.hp.com/hp-linux-imaging-and-printing") (synopsis "HP printer drivers") (description @@ -473,6 +474,8 @@ should only be used as part of the Guix cups-pk-helper service.") (assoc-ref %outputs "out") "/lib/cups/filter") ,(string-append "--with-cupsbackenddir=" (assoc-ref %outputs "out") "/lib/cups/backend") + ,(string-append "--with-hpppddir=" + (assoc-ref %outputs "ppd") "/share/ppd/HP") ,(string-append "--with-icondir=" (assoc-ref %outputs "out") "/share/applications") ,(string-append "--with-systraydir=" @@ -534,7 +537,7 @@ should only be used as part of the Guix cups-pk-helper service.") (add-before 'configure 'fix-build-with-python-3.8 (lambda* (#:key inputs #:allow-other-keys) (let ((python (assoc-ref inputs "python"))) - ;; XXX: The configure script of looks for Python headers in the + ;; XXX: The configure script looks for Python headers in the ;; wrong places as of version 3.20.3. Help it by adding the ;; include directory on C_INCLUDE_PATH. (when python -- cgit v1.2.3 From ac50633c157f8aafb2867e7e05a6568eb91aebdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Dec 2020 23:50:00 +0100 Subject: gnu: hplip: Update to 3.20.11. * gnu/packages/cups.scm (hplip): Update to 3.20.11. [source]: Remove upstreamed patch. * gnu/packages/patches/hplip-fix-bug-1898438.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/cups.scm | 7 +++---- gnu/packages/patches/hplip-fix-bug-1898438.patch | 19 ------------------- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 gnu/packages/patches/hplip-fix-bug-1898438.patch (limited to 'gnu/packages/cups.scm') diff --git a/gnu/local.mk b/gnu/local.mk index e9dafc0292..4496cf73fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1159,7 +1159,6 @@ dist_patch_DATA = \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hurd-xattr.patch \ - %D%/packages/patches/hplip-fix-bug-1898438.patch \ %D%/packages/patches/hplip-remove-imageprocessor.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-makeicecat.patch \ diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 6365961699..df8e440383 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -415,17 +415,16 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.20.9") + (version "3.20.11") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "1prdbp410405xrfggjc7y34nzljg7jnbgjzalgv4khwwma4i299n")) + "04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb")) (modules '((guix build utils))) - (patches (search-patches "hplip-fix-bug-1898438.patch" - "hplip-remove-imageprocessor.patch")) + (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet '(begin ;; Delete non-free blobs: .so files, pre-compiled diff --git a/gnu/packages/patches/hplip-fix-bug-1898438.patch b/gnu/packages/patches/hplip-fix-bug-1898438.patch deleted file mode 100644 index 7c095f9b2a..0000000000 --- a/gnu/packages/patches/hplip-fix-bug-1898438.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Sun, 04 Oct 2020 13:28:49 +0200 -Subject: [PATCH] gnu: hplip: Fix non-network builds (bug #1898438) - -Reported as . - -diff -Naur a/scan/sane/hpaio.c b/scan/sane/hpaio.c ---- a/scan/sane/hpaio.c 1970-01-01 01:00:01.000000000 +0100 -+++ b/scan/sane/hpaio.c 2020-10-04 13:26:34.665244052 +0200 -@@ -36,7 +36,9 @@ - #include - #include - #include "hpmud.h" -+#ifdef HAVE_LIBNETSNMP - #include "avahiDiscovery.h" -+#endif - #include "hp_ipp.h" - #include "soap.h" - #include "soapht.h" -- cgit v1.2.3 From cf066b7a4eb1426b17442e0bcb779e7d7ff4e150 Mon Sep 17 00:00:00 2001 From: "Boris A. Dekshteyn" Date: Tue, 15 Dec 2020 16:47:08 -0500 Subject: gnu: foo2zjs: Fix installation. * gnu/packages/cups.scm (foo2zjs)[inputs]: Add coreutils and sed. [arguments]: Add new phases ''make-install-dirs', 'wrap-wrappers', and 'install-cups-filters-symlinks'. Signed-off-by: Leo Famulari --- gnu/packages/cups.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu/packages/cups.scm') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index df8e440383..c8ca5db1a0 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages fonts) ; font-dejavu #:use-module (gnu packages fontutils) @@ -716,6 +717,41 @@ printer/driver specific, but spooler-independent PPD file.") (("^MODTIME[[:blank:]]*=.*$") "MODTIME = echo Thu Jan 01 01:00:00 1970\n")) #t)) + (add-before 'install 'make-install-dirs + (lambda* (#:key outputs #:allow-other-keys) + ;; Make missing install dirs + (let ((out (assoc-ref outputs "out")) + (dirs '("/share/cups/model" + "/share/foomatic/db/source/opt" + "/share/foomatic/db/source/printer" + "/share/foomatic/db/source/driver" + "/lib/cups/filter"))) + (for-each (lambda (dir) + (mkdir-p (string-append out dir))) + dirs)))) + (add-after 'install 'wrap-wrappers + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ghostscript (assoc-ref inputs "ghostscript")) + (coreutils (assoc-ref inputs "coreutils")) + (sed (assoc-ref inputs "sed"))) + (for-each (lambda (file) + (wrap-program file + `("PATH" ":" prefix + (,(string-append ghostscript "/bin:" + coreutils "/bin:" + sed "/bin"))))) + (find-files (string-append + out "/bin") "wrapper$"))))) + (add-after 'install 'install-cups-filters-symlinks + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (file) + (symlink file + (string-append out "/lib/cups/filter/" + (basename file)))) + (find-files (string-append out "/bin")))))) (add-after 'install 'remove-pdf (lambda* (#:key outputs #:allow-other-keys) ;; Remove 'manual.pdf' which is (1) useless (it's a @@ -729,7 +765,9 @@ printer/driver specific, but spooler-independent PPD file.") #:tests? #f ;no tests #:make-flags '("CC=gcc"))) (inputs - `(("ghostscript" ,ghostscript) + `(("coreutils" ,coreutils) + ("sed" ,sed) + ("ghostscript" ,ghostscript) ("foomatic-filters" ,foomatic-filters))) ;for 'foomatic-rip' (native-inputs `(("bc" ,bc) -- cgit v1.2.3