Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2019-05-03 22:29:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip" Fri May 3 22:29:34 2019 rev:123 rq:697044 version:3.19.3 Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2019-04-17 10:03:32.502440722 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new.5148/hplip.changes 2019-05-03 22:29:40.376319712 +0200 @@ -1,0 +2,139 @@ +Fri Apr 12 16:33:57 UTC 2019 - Johannes Weberhofer <[email protected]> + +- Added hp-uiscan application +- Updated URLs and source URLs +- Updated/rebased hplip-misc-missing-includes-and-definitions.patch +- Added hplip-remove-imageprocessor.diff which fully removes references + to the closed source ImageProcessor. Thanks to Didier Raboud from Debian. +- Addded hplip-orblite-return-null.diff to let a function return NULL + insetad of nothing. + +- update to 3.19.3 + Added support for the following new Printers: + * HP Color LaserJet Managed E65150dn + * HP Color LaserJet Managed E65160dn + * HP Color LaserJet Managed Flow MFP E67660z + * HP Color LaserJet Managed MFP E67650dh + * HP Color LaserJet Managed MFP E77422a + * HP Color LaserJet Managed MFP E77422dn + * HP Color LaserJet Managed MFP E77422dv + * HP Color LaserJet Managed MFP E77428dn + * HP Color LaserJet Managed MFP E87640 du + * HP Color LaserJet Managed MFP E87650du + * HP Color LaserJet Managed MFP E87660du + * HP DesignJet T1708 PostScript + * HP DesignJet T1708dr PostScript + * HP DesignJet Z6 24in + * HP DesignJet Z6 44in + * HP DesignJet Z6dr 44in + * HP DesignJet Z9 24in + * HP DesignJet Z9 44in + * HP DesignJet Z9dr 44in + * HP Ink Tank 115 + * HP Ink Tank 310 + * HP Ink Tank Wireless 410 + * HP LaserJet Managed E60155dn + * HP LaserJet Managed E60165dn + * HP LaserJet Managed E60175dn + * HP LaserJet Managed Flow MFP E62665h + * HP LaserJet Managed Flow MFP E62665z + * HP LaserJet Managed Flow MFP E62675z + * HP LaserJet Managed MFP E62655dn + * HP LaserJet Managed MFP E62665hs + * HP LaserJet Managed MFP E82540du + * HP LaserJet Managed MFP E82550du + * HP LaserJet Managed MFP E82560du + * HP LaserJet MFP E72425a + * HP LaserJet MFP E72425dn + * HP LaserJet MFP E72425dv + * HP LaserJet MFP E72430dn + * HP LaserJet Pro M118dw + * HP LaserJet Pro M118dw + * HP LaserJet Pro M119dw + * HP LaserJet Pro M119dw + * HP LaserJet Pro MFP M148dw + * HP LaserJet Pro MFP M148dw + * HP LaserJet Pro MFP M148fdw + * HP LaserJet Pro MFP M148fdw + * HP LaserJet Pro MFP M149dw + * HP LaserJet Pro MFP M149dw + * HP LaserJet Pro MFP M149fdw + * HP LaserJet Pro MFP M149fdw + * HP OfficeJet All-in-One 9010 + * HP OfficeJet Pro All-in-One 9010 + * HP OfficeJet Pro All-in-One 9020 + * HP PageWide 755dn + * HP PageWide 755dn + * HP PageWide MFP 774dn + * HP PageWide MFP 774dn + * HP PageWide MFP 774dns + * HP PageWide MFP 774dns + * HP PageWide MFP 779dn + * HP PageWide MFP 779dn + * HP PageWide MFP 779dns + * HP PageWide MFP 779dns + * HP PageWide XL 4100 MFP + * HP PageWide XL 4100 Printer + * HP PageWide XL 4600 Printer + * HP PageWide XL 4600PS MFP + * HP Scanjet Enterprise 7500 Flatbed Scanner + * HP Scanjet Enterprise 7500 Flatbed Scanner + * HP Smart Tank 350 + * HP Smart Tank Wireless 450 + * HP Tango + * HP Tango X + + Added support for the following new ScanJet Device: + * HP Scanjet Pro 2000 S1 + * HP Scanjet Pro 2500 f1 + + Support for Phase 1 Scan features for + * Digital Sender Flow 8500 fn2 + * ScanJet 5000 + * ScanJet 7500 + * Scanjet Ent flow 7000s3 + * Scanjet Ent. Flow N9120 fn2 + * Scanjet Pro 3000s3 + * Scanjet Pro 3500f1 + * Scanjet Pro 4500fn1 + + User can use ScanJet feature by using hp-uiscan tool. Following + features are introduced for ScanJet: + * Straighten page content + * Auto Orient + * Crop to content on page + * Misfeed(multipick) detection + * Delete blank page + * Separate the document based on blank page or barcode + * Page merge + * Mixed document feed + * Document merge + * Crushed page scan + * Image enhancement + * PunchHole Removal + * ColorDropOut/ColorRemoval + * Background Noise Removal + * Background Color Removal + * BMP File format Support + * Searchable PDF + * Smaller file size for PDF and JPEG + + Basic Booklet Printing Support for the following devices: + * HP LaserJet Managed MFP E82540-50-60 dn-du-z + * HP Color LaserJet Managed MFP E87640-50-60 dn-du-z + * HP Color LaserJet Managed MFP E77422a-dv-dn + * HP Color LaserJet Managed MFP E77428dn + * HP LaserJet MFP E72425a-dv-dn + * HP LaserJet MFP E72430dn + + Limitations: + * HPLIP does not support HP ScanJet Pro 2500 f1 device on OpenSuse + Linux distribution. + * Multipick feature not supported in below devices: + HP Scanjet Pro 2000 S1 + HP Scanjet Pro 2500 f1 + + Fixes: + * hp-check crashes with FileNotFoundError using python3.7 + +------------------------------------------------------------------- Old: ---- hplip-3.18.6.tar.gz hplip-3.18.6.tar.gz.asc New: ---- hplip-3.19.3.tar.gz hplip-3.19.3.tar.gz.asc hplip-orblite-return-null.diff hplip-remove-imageprocessor.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.feL0qA/_old 2019-05-03 22:29:41.476319350 +0200 +++ /var/tmp/diff_new_pack.feL0qA/_new 2019-05-03 22:29:41.476319350 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -54,12 +54,12 @@ %endif Name: hplip -Version: 3.18.6 +Version: 3.19.3 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause AND GPL-2.0-or-later AND MIT Group: Hardware/Printing -Url: http://hplipopensource.com +Url: https://developers.hp.com/hp-linux-imaging-and-printing # Source0...Source9 is for sources from HP: # URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.9.tar.gz # URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.15.9.tar.gz.asc @@ -67,8 +67,8 @@ # For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9 # /usr/bin/gpg --verify hplip-3.15.9.tar.gz.asc hplip-3.15.9.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <[email protected]>" -Source0: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz -Source1: http://prdownloads.sourceforge.net/hplip/hplip-%{version}.tar.gz.asc +Source0: https://sourceforge.net/projects/hplip/files/hplip/%{version}/hplip-%{version}.tar.gz +Source1: https://sourceforge.net/projects/hplip/files/hplip/%{version}/hplip-%{version}.tar.gz.asc Source2: hplip.keyring # Patch0...Patch9 is for patches from HP: # Patch10...Patch99 is for Suse patches for the sources from HP: @@ -99,6 +99,10 @@ Patch302: hp_ipp.h-add-missing-prototypes.patch # Fix import error for pcardext Patch303: photocard-fix-import-error-for-pcardext.patch +# PATCH-FIX-SUSE: Remove references to the closed-source ImageProcessor +Patch400: hplip-remove-imageprocessor.diff +# Let a function return NULL instead of nothing +Patch401: hplip-orblite-return-null.diff BuildRequires: dbus-1-devel BuildRequires: fdupes @@ -407,6 +411,8 @@ %patch301 -p1 -b .misc-headers %patch302 -p1 -b .hp_ipp_missing_prototypes %patch303 -p1 -b .photocard_import +%patch400 -p1 +%patch401 -p1 # replace "env" shebang and "/usr/bin/python" with real executable find . -name '*.py' -o -name pstotiff | \ @@ -414,6 +420,9 @@ sed -i 's,/usr/bin/python\>,%{pyexe},' \ data/rules/* +# replace icon not available on openSUSE +sed -i -e 's|/usr/share/icons/Humanity/devices/48/printer.svg|printer|' hp-uiscan.desktop.in + %build # If AUTOMAKE='automake --foreign' is not set, autoreconf (in fact automake) # complains about missing files like NEWS, README, AUTHORS, ChangeLog @@ -644,9 +653,10 @@ popd # Replace the invalid Desktop categories %suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/hplip.desktop System HardwareSettings +%suse_update_desktop_file -r %{buildroot}%{_datadir}/applications/hp-uiscan.desktop System HardwareSettings # Let suse_update_desktop_file add X-SuSE-translate key to /etc/xdg/autostart/hplip-systray.desktop # so that we can update its translations with translation-only packages. -%suse_update_desktop_file %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop +%suse_update_desktop_file -i %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop # End of "Desktop menue entry stuff". # Install the man page for /usr/bin/hpijs: install -d %{buildroot}%{_mandir}/man1 @@ -772,6 +782,7 @@ %{_bindir}/hp-testpage %{_bindir}/hp-timedate %{_bindir}/hp-toolbox +%{_bindir}/hp-uiscan %{_bindir}/hp-uninstall %{_bindir}/hp-unload %{_bindir}/hp-upgrade @@ -792,6 +803,7 @@ %{_datadir}/cups/model/manufacturer-PPDs/%{name}-plugin/ %doc %{_defaultdocdir}/%{name}/ %{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/hp-uiscan.desktop %{_datadir}/hplip/ %exclude %{_datadir}/hplip/data/models/models.dat ++++++ hplip-3.18.6.tar.gz -> hplip-3.19.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.18.6.tar.gz /work/SRC/openSUSE:Factory/.hplip.new.5148/hplip-3.19.3.tar.gz differ: char 5, line 1 ++++++ hplip-misc-missing-includes-and-definitions.patch ++++++ --- /var/tmp/diff_new_pack.feL0qA/_old 2019-05-03 22:29:41.512319338 +0200 +++ /var/tmp/diff_new_pack.feL0qA/_new 2019-05-03 22:29:41.512319338 +0200 @@ -1,19 +1,7 @@ -From 6dd5de8c21284530a7d9716b979812446cc4eb79 Mon Sep 17 00:00:00 2001 -From: Martin Wilck <[email protected]> -Date: Wed, 21 Mar 2018 23:56:05 +0100 -Subject: [PATCH] hplip: misc missing #includes and definitions - ---- - protocol/discovery/mdns.c | 1 + - protocol/discovery/mdns.h | 1 + - scan/sane/hpaio.c | 1 + - scan/sane/http.c | 1 + - 4 files changed, 4 insertions(+) - -Index: b/protocol/discovery/mdns.c -=================================================================== ---- a/protocol/discovery/mdns.c -+++ b/protocol/discovery/mdns.c +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" @@ -22,33 +10,32 @@ /* Convert "www.google.com" to "3www6google3com". */ static int mdns_convert_name_to_dns(const char *name, int name_size, char *dns_name) -Index: b/protocol/discovery/mdns.h -=================================================================== ---- a/protocol/discovery/mdns.h -+++ b/protocol/discovery/mdns.h -@@ -100,5 +100,6 @@ static void mdns_parse_respponse(unsign +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 -Index: b/scan/sane/hpaio.c -=================================================================== ---- a/scan/sane/hpaio.c -+++ b/scan/sane/hpaio.c -@@ -46,6 +46,7 @@ +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" - #define DEBUG_DECLARE_ONLY - #include "sanei_debug.h" -Index: b/scan/sane/http.c -=================================================================== ---- a/scan/sane/http.c -+++ b/scan/sane/http.c + +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 @@ -33,6 +33,7 @@ #include <stdio.h> ++++++ hplip-orblite-return-null.diff ++++++ diff -ur hplip-3.19.3-orig/scan/sane/orblite.c hplip-3.19.3/scan/sane/orblite.c --- hplip-3.19.3-orig/scan/sane/orblite.c 2019-03-14 10:28:56.000000000 +0100 +++ hplip-3.19.3/scan/sane/orblite.c 2019-04-12 18:59:07.734202665 +0200 @@ -331,6 +331,7 @@ return &g_handle->Options[option]; } //return g_handle->bb_orblite_get_option_descriptor(g_handle, option); + return NULL; } ++++++ hplip-remove-imageprocessor.diff ++++++ >From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001 From: Didier Raboud <[email protected]> Date: Tue, 21 Aug 2018 18:18:10 +0200 Subject: Remove all ImageProcessor functionality, which is closed-source --- Makefile.am | 14 ++------------ 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 dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py endif #HPLIP_CLASS_DRIVER -dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template 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 prnt/hpcups/ImageProcessor.h hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) #else #hpcupsdir = $(cupsfilterdir) #hpcups_PROGRAMS = hpcups @@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER install-data-hook: if HPLIP_BUILD - if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \ - cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \ - chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \ - ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \ - fi; \ - if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \ - cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \ - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \ - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \ - fi 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 @@ -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_raster_t *cups_raster) 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_raster_t *cups_raster) 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_raster_t *cups_raster) } } // 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_raster_t *cups_raster) rgbRaster = NULL; } - imageProcessorDestroy(imageProcessor); - unlink(hpPreProcessedRasterFile); return ret_status; }
