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

Accepting request 901116 from Printing

Browse Source 
- Update to 3.21.4
  Added support for the following new printers:
  * HP Envy 6400 series
- Update to 3.21.2
  Add support for the following printers:
  * HP LaserJet Enterprise M406dn
  * HP LaserJet Enterprise M407dn
  * HP LaserJet Enterprise MFP M430f
  * HP LaserJet Enterprise MFP M431f
  * HP LaserJet Managed E40040dn
  * HP LaserJet Managed MFP E42540f
  * HP Color LaserJet Enterprise M455dn
  * HP Color LaserJet Managed E45028dn
  * HP Color LaserJet Enterprise MFP M480f
  * HP Color LaserJet Managed MFP E47528f 
  * HP PageWide XL 3920 MFP
  * HP PageWide XL 4200 Printer
  * HP PageWide XL 4200 Multifunction Printer
  * HP PageWide XL 4700 Printer
  * HP PageWide XL 4700 Multifunction Printer
  * HP PageWide XL 5200 Printer
  * HP PageWide XL 5200 Multifunction Printer
  * HP PageWide XL 8200 Printer
  * HP Laserjet M207d 
  * HP Laserjet M208d
  * HP Laserjet M209d
  * HP Laserjet M210d
  * HP Laserjet M212d
  * HP Lasejet  M211d
  * HP Laserjet M209dw

OBS-URL: https://build.opensuse.org/request/show/901116
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=138
This commit is contained in:
Dominique Leuenberger 2021-06-24 16:22:12 +00:00 committed by Git OBS Bridge
commit fed07b6858
8 changed files with 110 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hplip-3.20.11.tar.gz
View File

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

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

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAl/EN2AACgkQc9dwzaWQR7mwywCgs8CcCFi6IP5CjOcdocDCJ9fB
c54An3u+HrBb8V+FCTqiy/JdHB/7SgP/
=gCta
-----END PGP SIGNATURE-----

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

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

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

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAmCTq6sACgkQc9dwzaWQR7l6oQCdHi7nNwoQFZSUqIG9M8/LIT1j
kA0AoOKM0b5GQAoVbpuchkq0wwFA4RCm
=dVk+
-----END PGP SIGNATURE-----

87
hplip-remove-imageprocessor.diff
View File

@ -1,18 +1,7 @@
From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 diff -ur hplip-3.21.4.orig/Makefile.am hplip-3.21.4/Makefile.am
From: Didier Raboud <odyx@debian.org> --- hplip-3.21.4.orig/Makefile.am 2021-05-06 10:39:14.000000000 +0200
Date: Tue, 21 Aug 2018 18:18:10 +0200 +++ hplip-3.21.4/Makefile.am 2021-06-16 09:19:42.354489830 +0200
Subject: Remove all ImageProcessor functionality, which is closed-source @@ -167,7 +167,7 @@
---
Makefile.am | 14 ++------------
prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
2 files changed, 2 insertions(+), 33 deletions(-)
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 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER endif #HPLIP_CLASS_DRIVER
@ -21,7 +10,7 @@ Index: hplip-3.20.9/Makefile.am
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 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 if !HPLIP_CLASS_DRIVER
@@ -595,7 +595,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilte @@ -595,7 +595,7 @@
prnt/hpcups/ImageProcessor.h prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
@ -30,7 +19,7 @@ Index: hplip-3.20.9/Makefile.am
#else #else
#hpcupsdir = $(cupsfilterdir) #hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups #hpcups_PROGRAMS = hpcups
@@ -685,16 +685,6 @@ endif #HPLIP_CLASS_DRIVER @@ -685,16 +685,6 @@
install-data-hook: install-data-hook:
if HPLIP_BUILD if HPLIP_BUILD
@ -47,67 +36,3 @@ Index: hplip-3.20.9/Makefile.am
if !HPLIP_CLASS_DRIVER if !HPLIP_CLASS_DRIVER
# If scanner build, add hpaio entry to sane dll.conf. # If scanner build, add hpaio entry to sane dll.conf.
if [ "$(scan_build)" = "yes" ]; then \ if [ "$(scan_build)" = "yes" ]; then \
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 @@
\*****************************************************************************/
#include "HPCupsFilter.h"
-#include "ImageProcessor.h"
#include <signal.h>
#include <sys/wait.h>
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
- image_processor_t* imageProcessor = imageProcessorCreate();
while (cupsRasterReadHeader2(cups_raster, &cups_header))
{
- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
- if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
- }
-
current_page_number++;
if (current_page_number == 1) {
@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups
color_raster = rgbRaster;
black_raster = kRaster;
- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
- if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
- }
-
-
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
}
} // for() loop end
- result = imageProcessorEndPage(imageProcessor);
- if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
- }
-
-
m_Job.NewPage();
if (err != NO_ERROR) {
break;
@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups
rgbRaster = NULL;
}
- imageProcessorDestroy(imageProcessor);
-
unlink(hpPreProcessedRasterFile);
return ret_status;
}

6
hplip-rpmlintrc
View File

@ -1,3 +1,9 @@
from Config import * from Config import *
addFilter("arch-dependent-file-in-usr-share") addFilter("arch-dependent-file-in-usr-share")
# Ignore any duplicate files
addFilter("files-duplicate .*/hplip/.*/__init__.py")
addFilter("files-duplicate .*/hplip/*/__init__.*pyc")
addFilter("files-duplicate .*/hplip/.*/__pycache__/__init__.*.pyc")
#
addFilter("non-executable-script /usr/share/hplip/.*")

83
hplip.changes
View File

@ -1,3 +1,86 @@
-------------------------------------------------------------------
Thu Jun 16 11:44:00 UTC 2021 - Thomas Schraitle <thomas.schraitle@suse.com> - 3.21.4
- Update to 3.21.4
Added support for the following new printers:
* HP Envy 6400 series
- Update to 3.21.2
Add support for the following printers:
* HP LaserJet Enterprise M406dn
* HP LaserJet Enterprise M407dn
* HP LaserJet Enterprise MFP M430f
* HP LaserJet Enterprise MFP M431f
* HP LaserJet Managed E40040dn
* HP LaserJet Managed MFP E42540f
* HP Color LaserJet Enterprise M455dn
* HP Color LaserJet Managed E45028dn
* HP Color LaserJet Enterprise MFP M480f
* HP Color LaserJet Managed MFP E47528f
* HP PageWide XL 3920 MFP
* HP PageWide XL 4200 Printer
* HP PageWide XL 4200 Multifunction Printer
* HP PageWide XL 4700 Printer
* HP PageWide XL 4700 Multifunction Printer
* HP PageWide XL 5200 Printer
* HP PageWide XL 5200 Multifunction Printer
* HP PageWide XL 8200 Printer
* HP Laserjet M207d
* HP Laserjet M208d
* HP Laserjet M209d
* HP Laserjet M210d
* HP Laserjet M212d
* HP Lasejet M211d
* HP Laserjet M209dw
* HP Laserjet M209dwe
* HP Laserjet M210dw
* HP Laserjet M210dwe
* HP Laserjet M212dw
* HP LaserJet M212dwe
* HP Laserjet M208dw
* HP Laserjet M207dw
* HP Laserjet M211dw
* HP LaserJet MFP M234dw
* HP LaserJet MFP M234dwe
* HP LaserJet MFP M233d
* HP LaserJet MFP M232d
* HP LaserJet MFP M235d
* HP LaserJet MFP M237d
* HP LaserJet MFP M236d
* HP LaserJet MFP M232dw
* HP LaserJet MFP M232dwc
* HP LaserJet MFP M233dw
* HP LaserJet MFP M236dw
* HP LaserJet MFP M235dw
* HP LaserJet MFP M235dwe
* HP LaserJet MFP M237dwe
* HP LaserJet MFP M237dw
* HP LaserJet MFP M232sdn
* HP LaserJet MFP M233sdn
* HP LaserJet MFP M236sdn
* HP LaserJet MFP M234sdn
* HP LaserJet MFP M234sdne
* HP LaserJet MFP M235sdn
* HP LaserJet MFP M235sdne
* HP LaserJet MFP M237sdne
* HP LaserJet MFP M237sdn
* HP LaserJet MFP M232sdw
* HP LaserJet MFP M233sdw
* HP LaserJet MFP M236sdw
* HP LaserJet MFP M234sdw
* HP LaserJet MFP M234sdwe
* HP LaserJet MFP M235sdw
* HP LaserJet MFP M235sdwe
* HP LaserJet MFP M237sdwe
* HP LaserJet MFP M237sdw
- Spec file:
* Adapted patch hplip-remove-imageprocessor.diff
* Disabled image processor build with the configure option
--disable-imageProcessor-build
* Remove executable bit in %{_datadir}/hplip/
* Ignore duplicate files in hplip-rpmlintrc ("__init__.*.pyc?")
* Fixed some warnings
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 23 17:23:15 UTC 2021 - Martin Wilck <mwilck@suse.com> Tue Feb 23 17:23:15 UTC 2021 - Martin Wilck <mwilck@suse.com>

8
hplip.spec
View File

@ -24,7 +24,7 @@
%define pyexe %{_bindir}/python3 %define pyexe %{_bindir}/python3
%global use_qt5 1 %global use_qt5 1
Name: hplip Name: hplip
Version: 3.20.11 Version: 3.21.4
Release: 0 Release: 0
Summary: HP's Printing, Scanning, and Faxing Software Summary: HP's Printing, Scanning, and Faxing Software
License: BSD-3-Clause AND GPL-2.0-or-later AND MIT License: BSD-3-Clause AND GPL-2.0-or-later AND MIT
@ -327,8 +327,9 @@ find . -name '*.py' -o -name pstotiff | \
sed -i 's,%{_bindir}/python\>,%{pyexe},' \ sed -i 's,%{_bindir}/python\>,%{pyexe},' \
data/rules/* data/rules/*
# replace icon not available on openSUSE # remove shebang line and replace icon not available on openSUSE
sed -i -e 's|%{_datadir}/icons/Humanity/devices/48/printer.svg|printer|' hp-uiscan.desktop.in sed -i -e '/#!.*xdg-open$/d' \
-e 's|%{_datadir}/icons/Humanity/devices/48/printer.svg|printer|' hp-uiscan.desktop.in
%build %build
# If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake)
@ -381,6 +382,7 @@ export CXXFLAGS="%{optflags} ${PYTHON_INCLUDEDIR} -fno-strict-aliasing -Wno-erro
--enable-cups-ppd-install \ --enable-cups-ppd-install \
--enable-hpijs-install \ --enable-hpijs-install \
--disable-foomatic-drv-install \ --disable-foomatic-drv-install \
--disable-imageProcessor-build \
--enable-foomatic-ppd-install \ --enable-foomatic-ppd-install \
--disable-foomatic-rip-hplip-install \ --disable-foomatic-rip-hplip-install \
--with-hpppddir=%{_datadir}/cups/model/manufacturer-PPDs/%{name} \ --with-hpppddir=%{_datadir}/cups/model/manufacturer-PPDs/%{name} \