summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-03-05 23:56:15 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-03-06 00:07:46 +0100
commitae2231559c8d33c222aa9a3b8cdb6aa5d49c8931 (patch)
tree559d8507c824edd2012c5dbc6c01bd970a25713d
parent04d780b5c64c0e1aed08b33936f1e3b2789f784d (diff)
gnu: hplip: Update to 3.21.2.
* gnu/packages/cups.scm (hplip): Update to 3.21.2. * gnu/packages/patches/hplip-remove-imageprocessor.patch: Adapt.
-rw-r--r--gnu/packages/cups.scm6
-rw-r--r--gnu/packages/patches/hplip-remove-imageprocessor.patch41
2 files changed, 30 insertions, 17 deletions
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 51efee5157..e12c1a0689 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; 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>
;;;
;;; 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
(package
(name "hplip")
- (version "3.20.11")
+ (version "3.21.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/hplip/hplip/" version
"/hplip-" version ".tar.gz"))
(sha256
(base32
- "04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb"))
+ "0hbwx9d4c8177vi0gavz9pxi7rc97jciacndp90ms8327shj2121"))
(modules '((guix build utils)))
(patches (search-patches "hplip-remove-imageprocessor.patch"))
(snippet
diff --git a/gnu/packages/patches/hplip-remove-imageprocessor.patch b/gnu/packages/patches/hplip-remove-imageprocessor.patch
index cde3ecba2d..c9d27a4d1d 100644
--- a/gnu/packages/patches/hplip-remove-imageprocessor.patch
+++ b/gnu/packages/patches/hplip-remove-imageprocessor.patch
@@ -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
@@ -175,55 +176,67 @@ index 5b282d8..0bacfaf 100644
#include <signal.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);
-- 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))
{
-
-- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
+- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
+- 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)
+@@ -764,14 +750,6 @@
color_raster = rgbRaster;
black_raster = kRaster;
+- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
+- {
- 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)
+@@ -801,14 +779,6 @@
}
} // for() loop end
+- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
+- {
- 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)
+@@ -823,11 +793,6 @@
rgbRaster = NULL;
}
+-
+- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
+- {
- imageProcessorDestroy(imageProcessor);
--
+- }
unlink(hpPreProcessedRasterFile);
return ret_status;
}