pool/hplip
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 853766 from Printing

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/853766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=135
This commit is contained in:
Dominique Leuenberger 2020-12-09 21:12:16 +00:00 committed by Git OBS Bridge
commit ba5809e5c8
12 changed files with 111 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Use-lsb_release-fallback-code-if-import-distro-fails.patch
View File

@ -14,10 +14,10 @@ using lsb_release.
installer/core_install.py | 10 +++++++---
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/base/password.py b/base/password.py
index cc91ac7..4352f9d 100644
--- a/base/password.py
+++ b/base/password.py
Index: hplip-3.20.9/base/password.py
===================================================================
--- hplip-3.20.9.orig/base/password.py
+++ hplip-3.20.9/base/password.py
@@ -84,8 +84,12 @@ def get_distro_name():
try:
os_name = platform.dist()[0]
@ -33,11 +33,11 @@ index cc91ac7..4352f9d 100644
if not os_name:
name = os.popen('lsb_release -i | cut -f 2')
diff --git a/installer/core_install.py b/installer/core_install.py
index eaecdc6..8c6b67f 100644
--- a/installer/core_install.py
+++ b/installer/core_install.py
@@ -644,9 +644,13 @@ class CoreInstall(object):
Index: hplip-3.20.9/installer/core_install.py
===================================================================
--- hplip-3.20.9.orig/installer/core_install.py
+++ hplip-3.20.9/installer/core_install.py
@@ -647,9 +647,13 @@ class CoreInstall(object):
name = platform.dist()[0].lower()
ver = platform.dist()[1]
except AttributeError:
@ -54,6 +54,3 @@ index eaecdc6..8c6b67f 100644
if not name:
found = False
--
2.25.1

68
add_missing_includes_and_define_GNU_SOURCE.patch
View File

@ -1,6 +1,24 @@
diff -Pdpru hplip-3.15.11.orig/io/hpmud/jd.c hplip-3.15.11/io/hpmud/jd.c
--- hplip-3.15.11.orig/io/hpmud/jd.c 2015-11-12 11:29:02.000000000 +0100
+++ hplip-3.15.11/io/hpmud/jd.c 2015-11-19 16:49:59.902956345 +0100
diff -urEbwB hplip-3.20.9/common/utils.c hplip-3.20.9.new/common/utils.c
--- hplip-3.20.9/common/utils.c 2020-09-23 07:24:09.000000000 +0200
+++ hplip-3.20.9.new/common/utils.c 2020-11-23 12:21:21.471541779 +0100
@@ -1,9 +1,14 @@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include "utils.h"
#include "string.h"
#include <dlfcn.h>
#include <sys/stat.h>
#include <errno.h>
#include <stdlib.h>
+#include <string.h>
extern int errno;
diff -urEbwBN hplip-3.20.9/io/hpmud/jd.c hplip-3.20.9.new/io/hpmud/jd.c
--- hplip-3.20.9/io/hpmud/jd.c 2020-09-23 07:24:10.000000000 +0200
+++ hplip-3.20.9.new/io/hpmud/jd.c 2020-11-23 12:12:14.920243467 +0100
@@ -31,6 +31,7 @@
#endif
@ -9,34 +27,10 @@ diff -Pdpru hplip-3.15.11.orig/io/hpmud/jd.c hplip-3.15.11/io/hpmud/jd.c
#include "hpmud.h"
#include "hpmudi.h"
diff -Pdpru hplip-3.15.11.orig/protocol/discovery/mdns.c hplip-3.15.11/protocol/discovery/mdns.c
--- hplip-3.15.11.orig/protocol/discovery/mdns.c 2015-11-12 11:29:01.000000000 +0100
+++ hplip-3.15.11/protocol/discovery/mdns.c 2015-11-19 16:46:02.785546885 +0100
@@ -24,7 +24,11 @@
Author: Sanjay Kumar
\*****************************************************************************/
-//#include <stdio.h>
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdio.h>
#include <string.h>
#include <syslog.h>
#include <sys/socket.h>
@@ -32,6 +36,7 @@
#include <netdb.h>
#include <arpa/inet.h>
#include "mdns.h"
+#include <unistd.h>
/* Convert "www.google.com" to "3www6google3com". */
static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name)
diff -Pdpru hplip-3.15.11.orig/protocol/hp_ipp.c hplip-3.15.11/protocol/hp_ipp.c
--- hplip-3.15.11.orig/protocol/hp_ipp.c 2015-11-12 11:29:01.000000000 +0100
+++ hplip-3.15.11/protocol/hp_ipp.c 2015-11-19 16:45:57.890095775 +0100
@@ -18,6 +18,9 @@ Boston, MA 02110-1301, USA.
diff -urEbwBN hplip-3.20.9/protocol/hp_ipp.c hplip-3.20.9.new/protocol/hp_ipp.c
--- hplip-3.20.9/protocol/hp_ipp.c 2020-09-23 07:24:16.000000000 +0200
+++ hplip-3.20.9.new/protocol/hp_ipp.c 2020-11-23 12:12:21.624283957 +0100
@@ -18,6 +18,9 @@
\******************************************************************************/
@ -46,9 +40,9 @@ diff -Pdpru hplip-3.15.11.orig/protocol/hp_ipp.c hplip-3.15.11/protocol/hp_ipp.c
#include <cups/cups.h>
#include <cups/language.h>
diff -Pdpru hplip-3.15.11.orig/scan/sane/bb_ledm.c hplip-3.15.11/scan/sane/bb_ledm.c
--- hplip-3.15.11.orig/scan/sane/bb_ledm.c 2015-11-12 11:28:47.000000000 +0100
+++ hplip-3.15.11/scan/sane/bb_ledm.c 2015-11-19 16:48:12.798968122 +0100
diff -urEbwBN hplip-3.20.9/scan/sane/bb_ledm.c hplip-3.20.9.new/scan/sane/bb_ledm.c
--- hplip-3.20.9/scan/sane/bb_ledm.c 2020-09-23 07:24:20.000000000 +0200
+++ hplip-3.20.9.new/scan/sane/bb_ledm.c 2020-11-23 12:12:21.628283981 +0100
@@ -27,6 +27,7 @@
# include "xml.h"
# include <stdlib.h>
@ -57,9 +51,9 @@ diff -Pdpru hplip-3.15.11.orig/scan/sane/bb_ledm.c hplip-3.15.11/scan/sane/bb_le
# include <stdint.h>
# define _STRINGIZE(x) #x
diff -Pdpru hplip-3.15.11.orig/scan/sane/sclpml.c hplip-3.15.11/scan/sane/sclpml.c
--- hplip-3.15.11.orig/scan/sane/sclpml.c 2015-11-12 11:28:47.000000000 +0100
+++ hplip-3.15.11/scan/sane/sclpml.c 2015-11-19 16:48:16.290576562 +0100
diff -urEbwBN hplip-3.20.9/scan/sane/sclpml.c hplip-3.20.9.new/scan/sane/sclpml.c
--- hplip-3.20.9/scan/sane/sclpml.c 2020-09-23 07:24:20.000000000 +0200
+++ hplip-3.20.9.new/scan/sane/sclpml.c 2020-11-23 12:12:21.628283981 +0100
@@ -25,11 +25,16 @@
\************************************************************************************/

25
hp_ipp.h-add-missing-prototypes.patch
View File

@ -1,17 +1,7 @@
From e69884e9581d3c6013389ac0efa4e3778dbbee68 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
Date: Wed, 21 Mar 2018 23:56:41 +0100
Subject: [PATCH] hp_ipp.h: add missing prototypes
---
protocol/hp_ipp.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/protocol/hp_ipp.h b/protocol/hp_ipp.h
index 3853f8432dae..24daf8b37a9a 100644
--- a/protocol/hp_ipp.h
+++ b/protocol/hp_ipp.h
@@ -149,6 +149,7 @@ int auth_cancel_req = 0; // 0--> authentication cancel is not requested,
diff -urEbwBN hplip-3.20.9/protocol/hp_ipp.h hplip-3.20.9.new/protocol/hp_ipp.h
--- hplip-3.20.9/protocol/hp_ipp.h 2020-09-23 07:24:16.000000000 +0200
+++ hplip-3.20.9.new/protocol/hp_ipp.h 2020-11-23 12:17:09.178020748 +0100
@@ -149,6 +149,7 @@
http_t* acquireCupsInstance();
@ -19,9 +9,9 @@ index 3853f8432dae..24daf8b37a9a 100644
const char *getCupsErrorString(int status);
void freePrinterList(printer_t *list);
@@ -162,6 +163,11 @@ ipp_t * usbDoRequest(ipp_t *request, char* device_uri);
@@ -162,6 +163,11 @@
ipp_t * networkDoRequest(ipp_t *request, char* device_uri);
ipp_t * getDeviceStatusAttributes(char* device_uri, int *count);
ipp_t * getDeviceStatusAttributes(char* device_uri,char* printer_name, int *count);
int getCupsPrinters(printer_t **printer_list);
+int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file,
+ char *model, char *info);
@ -31,6 +21,3 @@ index 3853f8432dae..24daf8b37a9a 100644
HPIPP_RESULT parseResponseHeader(char* header, int *content_length, int *chunked, int* header_size);
HPIPP_RESULT prepend_http_header(raw_ipp *raw_request);
--
2.16.1

3
hplip-3.20.6.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c64b2d334348010a9911f4feb075b2aa669047e7adb86c72d4a6ee7d392a7c20
size 25908476

7
hplip-3.20.6.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAl7rZ8EACgkQc9dwzaWQR7k3rQCeJIGD4a/G6P0MNtVgUkyQva2L
n7MAoLtPeNEsMp6J7kc/zGgRm6j8VXjN
=KBqV
-----END PGP SIGNATURE-----

3
hplip-3.20.9.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36251189aa9cc349f6a3eacbb7ac3c4fd26fc9f087c9f75cee051010c85d2ddf
size 26141198

7
hplip-3.20.9.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAl9q3H0ACgkQc9dwzaWQR7mXYwCg29C1KMe4i4oKiGBuTORPyFFD
DBIAoNsiIA+A17b4QeR4GCbRhWBEYvl5
=OKLE
-----END PGP SIGNATURE-----

42
hplip-misc-missing-includes-and-definitions.patch
View File

@ -1,41 +1,7 @@
Only in hplip-3.18.12/: Makefile.am.orig
diff -ur hplip-3.18.12-orig/protocol/discovery/mdns.c hplip-3.18.12/protocol/discovery/mdns.c
--- hplip-3.18.12-orig/protocol/discovery/mdns.c 2018-12-08 14:56:48.794408994 +0100
+++ hplip-3.18.12/protocol/discovery/mdns.c 2018-12-08 14:56:28.785871912 +0100
@@ -37,6 +37,7 @@
#include <arpa/inet.h>
#include "mdns.h"
#include <unistd.h>
+#include <ctype.h>
/* Convert "www.google.com" to "3www6google3com". */
static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name)
diff -ur hplip-3.18.12-orig/protocol/discovery/mdns.h hplip-3.18.12/protocol/discovery/mdns.h
--- hplip-3.18.12-orig/protocol/discovery/mdns.h 2018-12-03 08:08:49.000000000 +0100
+++ hplip-3.18.12/protocol/discovery/mdns.h 2018-12-08 14:56:28.785871912 +0100
@@ -100,5 +100,6 @@
static void mdns_rr_cleanup(DNS_RECORD *rr);
static DNS_RECORD *mdns_read_responses(int udp_socket, int mode);
static unsigned char* mdns_readMDL(unsigned char *p, unsigned char *normalized_mdl, int len);
+int mdns_probe_nw_scanners(char* uris_buf, int buf_size, int *count);
#endif // _DISCOVERY_MDNS_H
diff -ur hplip-3.18.12-orig/scan/sane/hpaio.c hplip-3.18.12/scan/sane/hpaio.c
--- hplip-3.18.12-orig/scan/sane/hpaio.c 2018-12-03 08:10:22.000000000 +0100
+++ hplip-3.18.12/scan/sane/hpaio.c 2018-12-08 14:58:23.952963358 +0100
@@ -45,6 +45,7 @@
#include "sclpml.h"
#include "escl.h"
#include "io.h"
+#include "mdns.h"
#include "orblitei.h"
Only in hplip-3.18.12/scan/sane: hpaio.c.orig
Only in hplip-3.18.12/scan/sane: hpaio.c.rej
diff -ur hplip-3.18.12-orig/scan/sane/http.c hplip-3.18.12/scan/sane/http.c
--- hplip-3.18.12-orig/scan/sane/http.c 2018-12-03 08:10:22.000000000 +0100
+++ hplip-3.18.12/scan/sane/http.c 2018-12-08 14:56:28.789872019 +0100
Index: hplip-3.20.9/scan/sane/http.c
===================================================================
--- hplip-3.20.9.orig/scan/sane/http.c
+++ hplip-3.20.9/scan/sane/http.c
@@ -33,6 +33,7 @@
#include <stdio.h>

30
hplip-remove-imageprocessor.diff
View File

@ -8,11 +8,11 @@ Subject: Remove all ImageProcessor functionality, which is closed-source
prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
2 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1b097c4f9..8d5d78c9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
Index: hplip-3.20.9/Makefile.am
===================================================================
--- hplip-3.20.9.orig/Makefile.am
+++ hplip-3.20.9/Makefile.am
@@ -167,7 +167,7 @@ if !HPLIP_CLASS_DRIVER
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER
@ -21,7 +21,7 @@ index 1b097c4f9..8d5d78c9f 100644
dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
if !HPLIP_CLASS_DRIVER
@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
@@ -595,7 +595,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte
prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@ -30,7 +30,7 @@ index 1b097c4f9..8d5d78c9f 100644
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
@@ -685,16 +685,6 @@ endif #HPLIP_CLASS_DRIVER
install-data-hook:
if HPLIP_BUILD
@ -47,10 +47,10 @@ index 1b097c4f9..8d5d78c9f 100644
if !HPLIP_CLASS_DRIVER
# If scanner build, add hpaio entry to sane dll.conf.
if [ "$(scan_build)" = "yes" ]; then \
diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
index 5b282d83f..0bacfafac 100644
--- a/prnt/hpcups/HPCupsFilter.cpp
+++ b/prnt/hpcups/HPCupsFilter.cpp
Index: hplip-3.20.9/prnt/hpcups/HPCupsFilter.cpp
===================================================================
--- hplip-3.20.9.orig/prnt/hpcups/HPCupsFilter.cpp
+++ hplip-3.20.9/prnt/hpcups/HPCupsFilter.cpp
@@ -31,7 +31,6 @@
\*****************************************************************************/
@ -59,7 +59,7 @@ index 5b282d83f..0bacfafac 100644
#include <signal.h>
#include <sys/wait.h>
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
@ -76,7 +76,7 @@ index 5b282d83f..0bacfafac 100644
current_page_number++;
if (current_page_number == 1) {
@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups
color_raster = rgbRaster;
black_raster = kRaster;
@ -89,7 +89,7 @@ index 5b282d83f..0bacfafac 100644
if ((y == 0) && !is_ljmono) {
//For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
//may not skip blank lines before actual data
@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups
}
} // for() loop end
@ -102,7 +102,7 @@ index 5b282d83f..0bacfafac 100644
m_Job.NewPage();
if (err != NO_ERROR) {
break;
@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups
rgbRaster = NULL;
}

8
hplip-udev-rules-in-usr.patch
View File

@ -1,8 +1,8 @@
Index: b/Makefile.am
Index: hplip-3.20.9/Makefile.am
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,7 +134,7 @@ dist_rulessystem_DATA =data/rules/hplip-
--- hplip-3.20.9.orig/Makefile.am
+++ hplip-3.20.9/Makefile.am
@@ -137,7 +137,7 @@ dist_rulessystem_DATA =data/rules/hplip-
# hpmud.rules
if !HPLIP_CLASS_DRIVER

29
hplip.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Mon Nov 23 11:47:45 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Update to 3.20.9
Add support for the following printers:
* HP Color LaserJet Managed MFP E57540dn
* HP Color LaserJet Managed Flow MFP E57540c
* HP Color LaserJet Enterprise MFP M578dn
* HP Color LaserJet Enterprise MFP M578f
* HP Color LaserJet Enterprise Flow MFP M578c
* HP Color LaserJet Enterprise Flow MFP M578z
* HP Color LaserJet Managed E55040dw
* HP Color LaserJet Managed E55040dn
* HP Color LaserJet Enterprise M554dn
* HP Color LaserJet Enterprise M555dn
* HP Color LaserJet Enterprise M555x
- Modified patches:
* Use-lsb_release-fallback-code-if-import-distro-fails.patch
* hp_ipp.h-add-missing-prototypes.patch
* hplip-remove-imageprocessor.diff
* hplip-udev-rules-in-usr.patch
+ refresh using source service
* add_missing_includes_and_define_GNU_SOURCE.patch
+ refresh, drop inexisting file and add GNU_SOURCE definition
and missing include in common/utils.c
* hplip-misc-missing-includes-and-definitions.patch
+ rediff to changed context
- New build dependency on libavahi-devel
-------------------------------------------------------------------
Thu Oct 29 13:23:39 UTC 2020 - Michal Svec <msvec@suse.com>

5
hplip.spec
View File

@ -24,7 +24,7 @@
%define pyexe %{_bindir}/python3
%global use_qt5 1
Name: hplip
Version: 3.20.6
Version: 3.20.9
Release: 0
Summary: HP's Printing, Scanning, and Faxing Software
License: BSD-3-Clause AND GPL-2.0-or-later AND MIT
@ -90,6 +90,7 @@ BuildRequires: cups-devel > 1.5
BuildRequires: dbus-1-devel
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: libavahi-devel
BuildRequires: libdrm-devel
BuildRequires: libgphoto2-devel
BuildRequires: libjpeg-devel
@ -149,11 +150,11 @@ Requires(post): %{_bindir}/find
Requires(post): /bin/grep
Requires(post): /bin/sed
Requires(post): coreutils
Recommends: python3-reportlab
# Obsolete earlier package names
Obsoletes: hplip17
Provides: hplip3 = 3.9.5
Obsoletes: hplip3 < 3.9.5
Recommends: python3-reportlab
# cups-rpm-helper is now pulled in indirectly via cups-devel.
# This causes the "postscriptdriver" provides to be generated.
# To avoid that, put "Ignore: cups-devel: cups-rpm-helper in the prjconf.