Gutenprint 5.2.14 recipe and patchset (#2579)

net-print/gutenprint/gutenprint-5.2.14.recipe

@@ -10,22 +10,22 @@ replacing the Gimp-Print 4.2-based plugin supplied with GIMP 1.2, \
 2.0, and 2.2, and offering an alternative with additional \
 capabilities to the GtkPrint-based plugin supplied with GIMP 2.4 \
 and beyond."
-HOMEPAGE="http://gimp-print.sourceforge.net"
-COPYRIGHT="1999-2010 by the authors of Gutenprint"
+HOMEPAGE="http://gimp-print.sourceforge.net/"
+COPYRIGHT="1999-2018 The authors of Gutenprint"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://prdownloads.sourceforge.net/gimp-print/gutenprint-$portVersion.tar.bz2"
-CHECKSUM_SHA256="d9a9745d83668096e89e762e380b40629ea2dcb44a1b7027b9068c543cd02742"
+REVISION="1"
+SOURCE_URI="https://downloads.sourceforge.net/gimp-print/gutenprint-$portVersion.tar.bz2"
+CHECKSUM_SHA256="45bf0766f196a764c113bfad7ab1ea748f1d5ff9ebb0d3a2206705fe52e82389"
 PATCHES="gutenprint-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	gutenprint$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:escputil$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:testpattern$secondaryArchSuffix = $portVersion compat >= 5
-	lib:libgutenprint$secondaryArchSuffix = 2.6.0 compat >= 2
+	lib:libgutenprint$secondaryArchSuffix = 2.7.0 compat >= 2
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -33,7 +33,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	gutenprint${secondaryArchSuffix}_devel = $portVersion compat >= 5
-	devel:libgutenprint$secondaryArchSuffix = 2.6.0 compat >= 2
+	devel:libgutenprint$secondaryArchSuffix = 2.7.0 compat >= 2
 	"
 REQUIRES_devel="
 	gutenprint$secondaryArchSuffix == $portVersion base
@@ -48,7 +48,7 @@ BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"

net-print/gutenprint/patches/gutenprint-5.2.14.patchset

@@ -6,10 +6,10 @@ Subject: undef PAGESIZE on HAIKU
 Update patch by Jerome Duval to new release.
 
 diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
-index fa3f7ae..b40cd09 100644
+index 3543d5d..3983142 100644
 --- a/src/testpattern/testpattern.c
 +++ b/src/testpattern/testpattern.c
-@@ -37,6 +37,9 @@
+@@ -36,6 +36,9 @@
  #include <stdio.h>
  #include <math.h>
  #include <string.h>
@@ -20,7 +20,7 @@ index fa3f7ae..b40cd09 100644
  #include <gutenprint/gutenprint-intl.h>
  #include <errno.h>
 diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
-index 0c3b20b..d203cac 100644
+index 380de09..dee7209 100644
 --- a/src/testpattern/testpatternl.c
 +++ b/src/testpattern/testpatternl.c
 @@ -20,6 +20,9 @@
@@ -34,10 +34,10 @@ index 0c3b20b..d203cac 100644
  /* end standard C headers. */
  
 diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
-index a340ce6..e5e7e42 100644
+index 386a62f..c464e35 100644
 --- a/src/testpattern/testpatternl.l
 +++ b/src/testpattern/testpatternl.l
-@@ -28,6 +28,9 @@
+@@ -27,6 +27,9 @@
  #include <string.h>
  #include <stdio.h>
  #include <stdlib.h>
@@ -48,7 +48,7 @@ index a340ce6..e5e7e42 100644
  
  #pragma GCC diagnostic ignored "-Wredundant-decls"
 diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
-index da90dcc..70173f2 100644
+index 7c42f1d..fb9b0fb 100644
 --- a/src/testpattern/testpatterny.c
 +++ b/src/testpattern/testpatterny.c
 @@ -74,6 +74,9 @@
@@ -62,10 +62,10 @@ index da90dcc..70173f2 100644
  
  extern int mylineno;
 diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
-index 3b89160..fc3b1c0 100644
+index 72b93d4..ddb78de 100644
 --- a/src/testpattern/testpatterny.y
 +++ b/src/testpattern/testpatterny.y
-@@ -29,6 +29,9 @@
+@@ -28,6 +28,9 @@
  #include <strings.h>
  #include <stdio.h>
  #include <stdlib.h>
@@ -87,10 +87,10 @@ Subject: strings.h fixes
 Update patch by Jerome Duval to new release.
 
 diff --git a/src/main/curve.c b/src/main/curve.c
-index a833376..01136ab 100644
+index a5a3885..79a0bfc 100644
 --- a/src/main/curve.c
 +++ b/src/main/curve.c
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
  #include <ieeefp.h>
  #endif
  #include <string.h>
@@ -99,10 +99,10 @@ index a833376..01136ab 100644
  #include <limits.h>
  #include <unistd.h>
 diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
-index 5eebc49..c288749 100644
+index b85ccad..88b509c 100644
 --- a/src/main/escp2-papers.c
 +++ b/src/main/escp2-papers.c
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,7 @@
  #ifdef HAVE_CONFIG_H
  #include <config.h>
  #endif
@@ -111,10 +111,10 @@ index 5eebc49..c288749 100644
  #include "gutenprint-internal.h"
  #include <gutenprint/gutenprint-intl-internal.h>
 diff --git a/src/main/print-ps.c b/src/main/print-ps.c
-index 557f3a8..8d6650c 100644
+index d650152..02e522b 100644
 --- a/src/main/print-ps.c
 +++ b/src/main/print-ps.c
-@@ -33,6 +33,7 @@
+@@ -32,6 +32,7 @@
  #include "gutenprint-internal.h"
  #include <time.h>
  #include <string.h>
@@ -133,10 +133,10 @@ Subject: Make gcc2 happy.
 
 
 diff --git a/src/main/print-canon.c b/src/main/print-canon.c
-index 7b1b1cc..5ca0dcf 100644
+index aafacf3..6043d70 100644
 --- a/src/main/print-canon.c
 +++ b/src/main/print-canon.c
-@@ -3798,7 +3798,6 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_privdata_t *init)
+@@ -3797,7 +3797,6 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_privdata_t *init)
       rather than calculated.
    */
    unsigned char arg_ESCP_1 = (init->pt) ? canon_size_type(v,init->caps) : 0x03; /* default size A4 */
@@ -144,7 +144,7 @@ index 7b1b1cc..5ca0dcf 100644
  
    /* TOFIX: what exactly is to be sent?
     * Is it the printable length or the bottom border?
-@@ -3812,6 +3811,7 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_privdata_t *init)
+@@ -3811,6 +3810,7 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_privdata_t *init)
    const char* input_slot = stp_get_string_parameter(v, "InputSlot");
    int print_cd = (input_slot && (!strcmp(input_slot, "CD")));
  
@@ -153,7 +153,7 @@ index 7b1b1cc..5ca0dcf 100644
  
    test_cd = 1;
 diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
-index acfc1d1..3acca53 100644
+index f2f9d22..86716cb 100644
 --- a/src/main/print-olympus.c
 +++ b/src/main/print-olympus.c
 @@ -2806,9 +2806,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
@@ -299,7 +299,7 @@ index acfc1d1..3acca53 100644
        for (i = 0; i < mlist->n_items; i++)
          {
  	  const dyesub_stringitem_t *m = &(mlist->item[i]);
-@@ -5399,9 +5399,9 @@ shinko_chcs1245_load_parameters(const stp_vars_t *v, const char *name,
+@@ -5406,9 +5406,9 @@ shinko_chcs1245_load_parameters(const stp_vars_t *v, const char *name,
  
    if (strcmp(name, "DustRemoval") == 0)
      {
@@ -310,7 +310,7 @@ index acfc1d1..3acca53 100644
        for (i = 0; i < mlist->n_items; i++)
          {
  	  const dyesub_stringitem_t *m = &(mlist->item[i]);
-@@ -6644,9 +6644,9 @@ ds820_load_parameters(const stp_vars_t *v, const char *name,
+@@ -6661,9 +6661,9 @@ ds820_load_parameters(const stp_vars_t *v, const char *name,
  
    if (strcmp(name, "PrintSpeed") == 0)
      {
@@ -324,3 +324,31 @@ index acfc1d1..3acca53 100644
 -- 
 2.7.0
 
+
+From 585e3f7a01956a451afa27b6e1b28a5635eee644 Mon Sep 17 00:00:00 2001
+From: Schrijvers Luc <Begasus@users.noreply.github.com>
+Date: Mon, 21 May 2018 07:42:56 +0200
+Subject: Make gcc2 happy, suite.
+
+
+diff --git a/src/main/channel.c b/src/main/channel.c
+index 93d8439..b3d9464 100644
+--- a/src/main/channel.c
++++ b/src/main/channel.c
+@@ -1192,6 +1192,7 @@ stp_channel_get_output_8bit(const stp_vars_t *v)
+   if (! cg->output_data_8bit)
+     cg->output_data_8bit = stp_malloc(sizeof(unsigned char) * 
+ 				      cg->total_channels * cg->width);
++  {
+   int i;
+   (void) memset(cg->output_data_8bit, 0, sizeof(unsigned char) * 
+ 		cg->total_channels * cg->width);
+@@ -1199,4 +1200,5 @@ stp_channel_get_output_8bit(const stp_vars_t *v)
+     cg->output_data_8bit[i] = cg->output_data[i] / (unsigned short) 257;
+   cg->valid_8bit = 1;
+   return cg->output_data_8bit;
++  }
+ }
+-- 
+2.16.2
+