haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-08 21:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gutenprint: fix gcc2 build.

Browse Source 
* fix #1570.
This commit is contained in:
Jerome Duval
2017-08-26 11:25:06 +02:00
parent b672b20366
commit 00bedd743e
2 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net-print/gutenprint/gutenprint-5.2.13.recipe
View File

@@ -13,7 +13,7 @@ and beyond."
HOMEPAGE="http://gimp-print.sourceforge.net"
COPYRIGHT="1999-2010 by the authors of Gutenprint"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="http://prdownloads.sourceforge.net/gimp-print/gutenprint-$portVersion.tar.bz2"
CHECKSUM_SHA256="d9a9745d83668096e89e762e380b40629ea2dcb44a1b7027b9068c543cd02742"
PATCHES="gutenprint-$portVersion.patchset"
@@ -53,12 +53,6 @@ BUILD_PREREQUIRES="
cmd:sed
"
PATCH()
{
# git doesn't handle correctly multilines with straybackspaces.
sed -i '/#define DECLARE_MODEUSES.*/ {N;N;N;N;N; s/#define DECLARE_MODEUSES.*\}/#define DECLARE_MODEUSES(name) static const canon_modeuselist_t name##_modeuselist = \{ #name, sizeof(name##_modeuses) \/ sizeof(canon_modeuse_t), name##_modeuses \}/g}' src/main/canon-media-mode.h
}
BUILD()
{
runConfigure ./configure

91
net-print/gutenprint/patches/gutenprint-5.2.13.patchset
View File

@@ -1,4 +1,4 @@
From 57702b7b3332aaae1098da83766356e48f091ba9 Mon Sep 17 00:00:00 2001
From 5677aa023b51e14cfb6d4f7d93120fea3b6e5dca Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 20 Jan 2017 19:56:14 +0100
Subject: undef PAGESIZE on HAIKU
@@ -6,7 +6,7 @@ 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 ca3d25d..fa19adf 100644
index fa3f7ae..b40cd09 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -37,6 +37,9 @@
@@ -79,7 +79,7 @@ index 3b89160..fc3b1c0 100644
2.7.0
From 50cf02a7c07bead3aff86aed1e15f22543a659d9 Mon Sep 17 00:00:00 2001
From 73327e59d32a1ddda5eae5915d20991399da0f3b Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 20 Jan 2017 19:58:12 +0100
Subject: strings.h fixes
@@ -87,7 +87,7 @@ 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 d552cc7..4c8a594 100644
index a833376..01136ab 100644
--- a/src/main/curve.c
+++ b/src/main/curve.c
@@ -31,6 +31,7 @@
@@ -111,7 +111,7 @@ 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 6a4a85f..4ef4a4e 100644
index 557f3a8..8d6650c 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -33,6 +33,7 @@
@@ -126,17 +126,37 @@ index 6a4a85f..4ef4a4e 100644
2.7.0
From acd95677fd3fc5452dc43f8617e74fa8d310e289 Mon Sep 17 00:00:00 2001
From 9f8f72a11ecc0524094fd469db7ab30bd9418a8b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 1 Apr 2017 15:24:54 +0200
Subject: Make gcc2 happy.
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index 7b1b1cc..5ca0dcf 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)
rather than calculated.
*/
unsigned char arg_ESCP_1 = (init->pt) ? canon_size_type(v,init->caps) : 0x03; /* default size A4 */
- stp_dprintf(STP_DBG_CANON, v,"setPageMargins2: arg_ESCP_1 = '%x'\n",arg_ESCP_1);
/* 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)
const char* input_slot = stp_get_string_parameter(v, "InputSlot");
int print_cd = (input_slot && (!strcmp(input_slot, "CD")));
+ stp_dprintf(STP_DBG_CANON, v,"setPageMargins2: arg_ESCP_1 = '%x'\n",arg_ESCP_1);
stp_dprintf(STP_DBG_CANON, v,"setPageMargins2: print_cd = %d\n",print_cd);
test_cd = 1;
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 59c8d0c..80f79c1 100644
index acfc1d1..3acca53 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -2792,9 +2792,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
@@ -2806,9 +2806,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "P95Gamma") == 0)
{
@@ -147,7 +167,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -2804,9 +2804,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
@@ -2818,9 +2818,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name;
description->is_active = 1;
} else if (strcmp(name, "Buzzer") == 0) {
@@ -158,7 +178,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -2816,9 +2816,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
@@ -2830,9 +2830,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
description->deflt.str = stp_string_list_param(description->bounds.str, 2)->name;
description->is_active = 1;
} else if (strcmp(name, "MediaCut") == 0) {
@@ -169,7 +189,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -2828,9 +2828,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
@@ -2842,9 +2842,9 @@ mitsu_p95d_load_parameters(const stp_vars_t *v, const char *name,
description->deflt.str = stp_string_list_param(description->bounds.str, 2)->name;
description->is_active = 1;
} else if (strcmp(name, "Comment") == 0) {
@@ -180,7 +200,40 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -3405,9 +3405,9 @@ mitsu9500_load_parameters(const stp_vars_t *v, const char *name,
@@ -3212,9 +3212,9 @@ mitsu_p93d_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "P93Gamma") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu_p93d_gamma_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_p93d_gamma_list;
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -3224,9 +3224,9 @@ mitsu_p93d_load_parameters(const stp_vars_t *v, const char *name,
description->deflt.str = stp_string_list_param(description->bounds.str, 0)->name;
description->is_active = 1;
} else if (strcmp(name, "Buzzer") == 0) {
+ const dyesub_stringlist_t *mlist = &mitsu_p95d_buzzer_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_p95d_buzzer_list;
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -3239,9 +3239,9 @@ mitsu_p93d_load_parameters(const stp_vars_t *v, const char *name,
description->deflt.boolean = 0;
description->is_active = 1;
} else if (strcmp(name, "Comment") == 0) {
+ const dyesub_stringlist_t *mlist = &mitsu_p95d_comment_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_p95d_comment_list;
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -3782,9 +3782,9 @@ mitsu9500_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "CP9500Contrast") == 0)
{
@@ -191,7 +244,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -3524,9 +3524,9 @@ mitsu9550_load_parameters(const stp_vars_t *v, const char *name,
@@ -3901,9 +3901,9 @@ mitsu9550_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "PrintSpeed") == 0)
{
@@ -202,7 +255,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -3839,9 +3839,9 @@ mitsu9810_load_parameters(const stp_vars_t *v, const char *name,
@@ -4216,9 +4216,9 @@ mitsu9810_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "PrintSpeed") == 0)
{
@@ -213,7 +266,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -4107,9 +4107,9 @@ mitsu70x_load_parameters(const stp_vars_t *v, const char *name,
@@ -4484,9 +4484,9 @@ mitsu70x_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "PrintSpeed") == 0)
{
@@ -224,7 +277,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -4370,9 +4370,9 @@ mitsu_k60_load_parameters(const stp_vars_t *v, const char *name,
@@ -4748,9 +4748,9 @@ mitsu_k60_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "PrintSpeed") == 0)
{
@@ -235,7 +288,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -4572,9 +4572,9 @@ mitsu_d90_load_parameters(const stp_vars_t *v, const char *name,
@@ -4950,9 +4950,9 @@ mitsu_d90_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "PrintSpeed") == 0)
{
@@ -246,7 +299,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -5021,9 +5021,9 @@ shinko_chcs1245_load_parameters(const stp_vars_t *v, const char *name,
@@ -5399,9 +5399,9 @@ shinko_chcs1245_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "DustRemoval") == 0)
{
@@ -257,7 +310,7 @@ index 59c8d0c..80f79c1 100644
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
@@ -6262,9 +6262,9 @@ ds820_load_parameters(const stp_vars_t *v, const char *name,
@@ -6644,9 +6644,9 @@ ds820_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "PrintSpeed") == 0)
{