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 
Fixes #1109.
This commit is contained in:
Adrien Destugues
2017-04-01 15:25:57 +02:00
parent a373923312
commit 89393edcb3
2 changed files with 151 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net-print/gutenprint/gutenprint-5.2.12.recipe
View File

@@ -13,13 +13,13 @@ 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="a42489fd7d6f2e4320811754bb80b0cd845db6632b52f819fbc2b4b75057341b"
PATCHES="gutenprint-5.2.12.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
PROVIDES="
gutenprint$secondaryArchSuffix = $portVersion compat >= 5

150
net-print/gutenprint/patches/gutenprint-5.2.12.patchset
View File

@@ -1,4 +1,4 @@
From f9160c2bfdca75bafed242aaa7782f80a7e00693 Mon Sep 17 00:00:00 2001
From 57702b7b3332aaae1098da83766356e48f091ba9 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
@@ -79,7 +79,7 @@ index 3b89160..fc3b1c0 100644
2.7.0
From 6382c589b05b34566d3ec27cf95df7a93e07f198 Mon Sep 17 00:00:00 2001
From 50cf02a7c07bead3aff86aed1e15f22543a659d9 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
@@ -125,3 +125,149 @@ index 6a4a85f..4ef4a4e 100644
--
2.7.0
From acd95677fd3fc5452dc43f8617e74fa8d310e289 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-olympus.c b/src/main/print-olympus.c
index 59c8d0c..80f79c1 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,
if (strcmp(name, "P95Gamma") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu_p95d_gamma_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_p95d_gamma_list;
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,
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]);
@@ -2816,9 +2816,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) {
+ const dyesub_stringlist_t *mlist = &mitsu_p95d_cutter_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_p95d_cutter_list;
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,
description->deflt.str = stp_string_list_param(description->bounds.str, 2)->name;
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]);
@@ -3405,9 +3405,9 @@ mitsu9500_load_parameters(const stp_vars_t *v, const char *name,
if (strcmp(name, "CP9500Contrast") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu9500_contrast_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu9500_contrast_list;
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,
if (strcmp(name, "PrintSpeed") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu9550_quality_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu9550_quality_list;
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,
if (strcmp(name, "PrintSpeed") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu9810_quality_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu9810_quality_list;
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,
if (strcmp(name, "PrintSpeed") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu70x_quality_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu70x_quality_list;
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,
if (strcmp(name, "PrintSpeed") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu_k60_quality_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_k60_quality_list;
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,
if (strcmp(name, "PrintSpeed") == 0)
{
+ const dyesub_stringlist_t *mlist = &mitsu_d90_quality_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &mitsu_d90_quality_list;
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,
if (strcmp(name, "DustRemoval") == 0)
{
+ const dyesub_stringlist_t *mlist = &shinko_chcs1245_dust_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &shinko_chcs1245_dust_list;
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,
if (strcmp(name, "PrintSpeed") == 0)
{
+ const dyesub_stringlist_t *mlist = &dnpds820_printspeeds_list;
description->bounds.str = stp_string_list_create();
- const dyesub_stringlist_t *mlist = &dnpds820_printspeeds_list;
for (i = 0; i < mlist->n_items; i++)
{
const dyesub_stringitem_t *m = &(mlist->item[i]);
--
2.7.0