$ git diff --patch-with-stat --summary 742b5be9f8800e0b61119440ee41c590d9902434..8a1ed2e2e90d3fa08599b8592443fa3aad688f10
.abf.yml | 2 +-
hplip-3.20.11-authtype.patch | 11 ++++
hplip-fix-Wreturn-type-warning.patch | 100 +++++++++++++++++++++++++++++++++++
hplip.spec | 20 ++++---
4 files changed, 126 insertions(+), 7 deletions(-)
create mode 100644 hplip-3.20.11-authtype.patch
create mode 100644 hplip-fix-Wreturn-type-warning.patch
diff --git a/.abf.yml b/.abf.yml
index e73301a..00ac128 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,4 @@
sources:
hp-sendfax.png: 2201320c59c2eaba10abce5c40306c6461e79beb
SmartInstallDisable-Tool.run: c82103aa609cd7e58f43b090266bb77216933937
- hplip-3.20.2.tar.gz: 59f9895dea6228114bc00ddcce67c8ffbcf5f224
+ hplip-3.20.11.tar.gz: 6b51905111c96da5b92f4d66aa9ff6fb9266d90f
diff --git a/hplip-3.20.11-authtype.patch b/hplip-3.20.11-authtype.patch
new file mode 100644
index 0000000..93e3d28
--- /dev/null
+++ b/hplip-3.20.11-authtype.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.20.11/base/password.py.omv~ hplip-3.20.11/base/password.py
+--- hplip-3.20.11/base/password.py.omv~ 2021-02-03 14:56:24.319391449 +0100
++++ hplip-3.20.11/base/password.py 2021-02-03 14:56:50.772689515 +0100
+@@ -57,6 +57,7 @@ AUTH_TYPES = {'mepis': 'su',
+ 'boss': 'su',
+ 'lfs': 'su',
+ 'manjarolinux': 'sudo',
++ 'openmandrivalx': 'sudo',
+ }
+
+
diff --git a/hplip-fix-Wreturn-type-warning.patch b/hplip-fix-Wreturn-type-warning.patch
new file mode 100644
index 0000000..aa40e1a
--- /dev/null
+++ b/hplip-fix-Wreturn-type-warning.patch
@@ -0,0 +1,100 @@
+--- hplip-3.20.3/scan/sane/hpaio.c.orig 2020-03-25 01:24:15.558732638 +0000
++++ hplip-3.20.3/scan/sane/hpaio.c 2020-03-25 02:48:36.097054366 +0000
+@@ -406,20 +406,34 @@ extern SANE_Status sane_hpaio_open(SANE_
+
+ extern void sane_hpaio_close(SANE_Handle handle)
+ {
+- if (strcmp(*((char **)handle), "MARVELL") == 0)
+- return marvell_close(handle);
+- if (strcmp(*((char **)handle), "SOAP") == 0)
+- return soap_close(handle);
+- if (strcmp(*((char **)handle), "SOAPHT") == 0)
+- return soapht_close(handle);
+- if (strcmp(*((char **)handle), "LEDM") == 0)
+- return ledm_close(handle);
+- if (strcmp(*((char **)handle), "SCL-PML") == 0)
+- return sclpml_close(handle);
+- if (strcmp(*((char **)handle), "ESCL") == 0)
+- return escl_close(handle);
+- if (strcmp(*((char **)handle), "ORBLITE") == 0)
+- return orblite_close(handle);
++ if (strcmp(*((char **)handle), "MARVELL") == 0) {
++ marvell_close(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "SOAP") == 0) {
++ soap_close(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "SOAPHT") == 0) {
++ soapht_close(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "LEDM") == 0) {
++ ledm_close(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "SCL-PML") == 0) {
++ sclpml_close(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "ESCL") == 0) {
++ escl_close(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "ORBLITE") == 0) {
++ orblite_close(handle);
++ return;
++ }
+ } /* sane_hpaio_close() */
+
+ extern const SANE_Option_Descriptor * sane_hpaio_get_option_descriptor(SANE_Handle handle, SANE_Int option)
+@@ -539,20 +553,34 @@ extern SANE_Status sane_hpaio_read(SANE_
+ /* Note, sane_cancel is called normally not just during IO abort situations. */
+ extern void sane_hpaio_cancel( SANE_Handle handle )
+ {
+- if (strcmp(*((char **)handle), "MARVELL") == 0)
+- return marvell_cancel(handle);
+- if (strcmp(*((char **)handle), "SOAP") == 0)
+- return soap_cancel(handle);
+- if (strcmp(*((char **)handle), "SOAPHT") == 0)
+- return soapht_cancel(handle);
+- if (strcmp(*((char **)handle), "LEDM") == 0)
+- return ledm_cancel(handle);
+- if (strcmp(*((char **)handle), "SCL-PML") == 0)
+- return sclpml_cancel(handle);
+- if (strcmp(*((char **)handle), "ESCL") == 0)
+- return escl_cancel(handle);
+- if (strcmp(*((char **)handle), "ORBLITE") == 0)
+- return orblite_cancel(handle);
++ if (strcmp(*((char **)handle), "MARVELL") == 0) {
++ marvell_cancel(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "SOAP") == 0) {
++ soap_cancel(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "SOAPHT") == 0) {
++ soapht_cancel(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "LEDM") == 0) {
++ ledm_cancel(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "SCL-PML") == 0) {
++ sclpml_cancel(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "ESCL") == 0) {
++ escl_cancel(handle);
++ return;
++ }
++ if (strcmp(*((char **)handle), "ORBLITE") == 0) {
++ orblite_cancel(handle);
++ return;
++ }
+ } /* sane_hpaio_cancel() */
+
+ extern SANE_Status sane_hpaio_set_io_mode(SANE_Handle handle, SANE_Bool nonBlocking)
diff --git a/hplip.spec b/hplip.spec
index 3eff0cd..c6a753e 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -24,7 +24,7 @@
Summary: HP printer/all-in-one driver infrastructure
Name: hplip
-Version: 3.20.2
+Version: 3.20.11
Release: 2
License: GPLv2+ and MIT
Group: System/Printing
@@ -43,7 +43,9 @@ Source6: README.urpmi
# do not get applied in %%post on a new installation:
Patch2: hplip-apply-udev-rules-on-action-change.patch
Patch3: hplip-cups-2.2.patch
-Patch4: hplip-3.15.4-hp_ipp.patch
+#Patch4: hplip-3.15.4-hp_ipp.patch
+# Fix compiler issues on 3.20.5
+Patch5: hplip-fix-Wreturn-type-warning.patch
# Fedora patches
Patch101: hplip-pstotiff-is-rubbish.patch
@@ -91,6 +93,7 @@ Patch229: process-events-for-systray.patch
Patch302: hplip-CVE-2013-4325.patch
Patch303: hplip-3.17.11-hp-systray-dont-start-in-KDE.patch
Patch304: hplip-3.18.12-clang7.patch
+Patch305: hplip-3.20.11-authtype.patch
# From Debian
Patch400: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
# (itchka) Fix clang build error
@@ -98,13 +101,15 @@ Patch500: fix-void-function-returning-value-clang-error.patch
BuildRequires: desktop-file-utils
BuildRequires: imagemagick
BuildRequires: polkit
-BuildRequires: python-sip >= 1:4.16.4-1
+BuildRequires: python-sip >= 4.16.4-1
BuildRequires: net-snmp-devel
BuildRequires: cups-devel
# For ppdc
BuildRequires: cups-common cups
BuildRequires: jpeg-devel
BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(avahi-core)
+BuildRequires: pkgconfig(avahi-client)
BuildRequires: pkgconfig(libgphoto2)
BuildRequires: pkgconfig(libusb)
BuildRequires: pkgconfig(libv4l1)
@@ -245,6 +250,7 @@ Group: System/Printing
Requires: python-qt5-gui
Requires: python-qt5-widgets
Requires: python-qt5-dbus
+Requires: python3dist(distro)
Requires: %{name} = %{version}-%{release}
%description gui
@@ -289,7 +295,8 @@ flash memory cards.
%patch2 -p1 -b .udev-rules-on-action-change
%patch3 -p1 -b .cups22~
-%patch4 -p1 -b .004~
+#patch4 -p1 -b .004~
+%patch5 -p1
# Fedora patches
@@ -457,6 +464,7 @@ sed -i.duplex-constraints \
%patch302 -p0
%patch303 -p1
%patch304 -p1
+%patch305 -p1 -b .omv~
%patch400 -p1 -b .noClosedSource~
@@ -497,7 +505,7 @@ WITHOUT_SANE="--without-sane"
--enable-policykit \
--with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python}
-%make
+%make_build
%install
mkdir -p %{buildroot}%{_bindir}
@@ -505,7 +513,7 @@ mkdir -p %{buildroot}%{_includedir}
mkdir -p %{buildroot}%{_initrddir}
mkdir -p %{buildroot}%{_sysconfdir}/hp
-%makeinstall_std PYTHON=%{__python}
+%make_install PYTHON=%{__python}
# Install files which the "make install" missed to install
install -m 644 ip/hpip.h %{buildroot}%{_includedir}