From 3abe798565d908bd39fec8391ba3248bdd777150 Mon Sep 17 00:00:00 2001 From: "Juergen \"George\" Sawinski" Date: Sat, 10 Apr 2004 18:46:07 +0000 Subject: [PATCH] Juergen Sawinski: rene/transfig: -gcc33 compilation fixes -copy.patch [2004033012404223489] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2705 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../rene/transfig/multi-line-string-fix.patch | 42 +++++++++++++++++++ package/rene/transfig/transfig.conf | 4 +- package/rene/transfig/transfig.desc | 4 +- .../transfig/use-stdarg-h-gcc33-fix.patch | 30 +++++++++++++ 4 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 package/rene/transfig/multi-line-string-fix.patch create mode 100644 package/rene/transfig/use-stdarg-h-gcc33-fix.patch diff --git a/package/rene/transfig/multi-line-string-fix.patch b/package/rene/transfig/multi-line-string-fix.patch new file mode 100644 index 000000000..f82c79d79 --- /dev/null +++ b/package/rene/transfig/multi-line-string-fix.patch @@ -0,0 +1,42 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/rene/transfig/multi-line-string-fix.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- transfig.3.2.4/fig2dev/dev/gensvg.c 2002-12-18 23:38:18.000000000 +0100 ++++ transfig.3.2.4-jsaw/fig2dev/dev/gensvg.c 2004-03-30 12:40:30.000000000 +0200 +@@ -692,16 +692,16 @@ + if (t->angle != 0) { + fprintf (tfp, "\n", + (int) (t->base_x * mag), (int) (t->base_y * mag), degrees (t->angle)); +- fprintf (tfp, "\n", ++ fprintf (tfp, "\n", + rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)], + (t->font % 2 == 0 ? "normal" : "italic"), + (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)), + anchor[t->type]); + } + else +- fprintf (tfp, "\n", ++ fprintf (tfp, "\n", + (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal (t->color), + family[(int) ceil ((t->font + 1) / 4)], + (t->font % 2 == 0 ? "normal" : "italic"), diff --git a/package/rene/transfig/transfig.conf b/package/rene/transfig/transfig.conf index fb8bf55ae..abccabac7 100644 --- a/package/rene/transfig/transfig.conf +++ b/package/rene/transfig/transfig.conf @@ -5,8 +5,8 @@ # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/rene/transfix/transfix.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux: rock-src/package/rene/transfig/transfig.conf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/package/rene/transfig/transfig.desc b/package/rene/transfig/transfig.desc index b1e172deb..4076c1115 100644 --- a/package/rene/transfig/transfig.desc +++ b/package/rene/transfig/transfig.desc @@ -6,8 +6,8 @@ [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] -[COPY] ROCK Linux: rock-src/package/rene/transfix/transfix.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux: rock-src/package/rene/transfig/transfig.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by diff --git a/package/rene/transfig/use-stdarg-h-gcc33-fix.patch b/package/rene/transfig/use-stdarg-h-gcc33-fix.patch new file mode 100644 index 000000000..d2cc755aa --- /dev/null +++ b/package/rene/transfig/use-stdarg-h-gcc33-fix.patch @@ -0,0 +1,30 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/rene/transfig/use-stdarg-h-gcc33-fix.patch +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- transfig.3.2.4/fig2dev/fig2dev.h 2002-12-18 23:45:28.000000000 +0100 ++++ transfig.3.2.4-jsaw/fig2dev/fig2dev.h 2004-03-30 12:28:56.000000000 +0200 +@@ -22,7 +22,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include