me/guix
Archived
1
0
Fork 0
Code Activity

gnu: hplip: Update to 3.21.2.

Browse source 
* gnu/packages/cups.scm (hplip): Update to 3.21.2.
* gnu/packages/patches/hplip-remove-imageprocessor.patch: Adapt.
This commit is contained in:
Tobias Geerinckx-Rice 2021-03-05 23:56:15 +01:00
parent 04d780b5c6
commit ae2231559c
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/cups.scm
View file

@ -5,7 +5,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017–2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -484,14 +484,14 @@ should only be used as part of the Guix cups-pk-helper service.")
(define-public hplip (define-public hplip
(package (package
(name "hplip") (name "hplip")
(version "3.20.11") (version "3.21.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version (uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz")) "/hplip-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb")) "0hbwx9d4c8177vi0gavz9pxi7rc97jciacndp90ms8327shj2121"))
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch")) (patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet (snippet

41
gnu/packages/patches/hplip-remove-imageprocessor.patch
View file

@ -1,4 +1,5 @@
This patch is based heavily on the Debian patch. This patch is based heavily on the Debian patch, but was updated to
apply to subsequent upstream changes not yet in Debian.
https://salsa.debian.org/printing-team/hplip/raw/debian/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch https://salsa.debian.org/printing-team/hplip/raw/debian/3.18.10+dfsg0-1/debian/patches/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
@ -175,55 +176,67 @@ index 5b282d8..0bacfaf 100644
#include <signal.h> #include <signal.h>
#include <sys/wait.h> #include <sys/wait.h>
@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) @@ -651,21 +650,8 @@
sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
- image_processor_t* imageProcessor = imageProcessorCreate();
- image_processor_t* imageProcessor=NULL;
- IMAGE_PROCESSOR_ERROR result;
- //added if condition to check if pinter language is "ljzjstream"
- //If so, then bypass imageprocessing functions while running HPCUPS filter.
- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
- imageProcessor = imageProcessorCreate();
- }
while (cupsRasterReadHeader2(cups_raster, &cups_header)) while (cupsRasterReadHeader2(cups_raster, &cups_header))
{ {
- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); - result = imageProcessorStartPage(imageProcessor, &cups_header);
- if (result != IPE_SUCCESS){ - if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result); - dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
- } - }
- - }
current_page_number++; current_page_number++;
if (current_page_number == 1) { if (current_page_number == 1) {
@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) @@ -764,14 +750,6 @@
color_raster = rgbRaster; color_raster = rgbRaster;
black_raster = kRaster; black_raster = kRaster;
- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
- {
- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine); - result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
- if (result != IPE_SUCCESS){ - if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result); - dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
- } - }
- - }
- -
if ((y == 0) && !is_ljmono) { if ((y == 0) && !is_ljmono) {
//For ljmono, make sure that first line is not a blankRaster line.Otherwise printer //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
//may not skip blank lines before actual data //may not skip blank lines before actual data
@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) @@ -801,14 +779,6 @@
} }
} // for() loop end } // for() loop end
- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
- {
- result = imageProcessorEndPage(imageProcessor); - result = imageProcessorEndPage(imageProcessor);
- if (result != IPE_SUCCESS){ - if (result != IPE_SUCCESS){
- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result); - dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
- } - }
- - }
- -
m_Job.NewPage(); m_Job.NewPage();
if (err != NO_ERROR) { if (err != NO_ERROR) {
break; break;
@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) @@ -823,11 +793,6 @@
rgbRaster = NULL; rgbRaster = NULL;
} }
-
- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
- {
- imageProcessorDestroy(imageProcessor); - imageProcessorDestroy(imageProcessor);
- - }
unlink(hpPreProcessedRasterFile); unlink(hpPreProcessedRasterFile);
return ret_status; return ret_status;
} }