summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-12-06 23:50:00 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-12-06 23:50:44 +0100
commitac50633c157f8aafb2867e7e05a6568eb91aebdf (patch)
treeb06711afa4735ce4df08ec6478c493b9f2c26964
parenta79e05f9e83099cbb794e26998bf77cf6b23075a (diff)
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.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/cups.scm7
-rw-r--r--gnu/packages/patches/hplip-fix-bug-1898438.patch19
3 files changed, 3 insertions, 24 deletions
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 <me@tobias.gr>
-Date: Sun, 04 Oct 2020 13:28:49 +0200
-Subject: [PATCH] gnu: hplip: Fix non-network builds (bug #1898438)
-
-Reported as <https://bugs.launchpad.net/hplip/+bug/1898438>.
-
-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 <string.h>
- #include <cups/cups.h>
- #include "hpmud.h"
-+#ifdef HAVE_LIBNETSNMP
- #include "avahiDiscovery.h"
-+#endif
- #include "hp_ipp.h"
- #include "soap.h"
- #include "soapht.h"