diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/patches/hplip-fix-bug-1898438.patch | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/patches/hplip-fix-bug-1898438.patch')
| -rw-r--r-- | gnu/packages/patches/hplip-fix-bug-1898438.patch | 19 |
1 files changed, 0 insertions, 19 deletions
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" |