From 33f443343ac8d1b3362cd200999fd844412c8045 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sun, 16 May 2004 22:06:38 +0000 Subject: [PATCH] Rene Rebe: fixed scribus for compilation with gcc-2.3.4 [2004051600473402172] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2991 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jsaw/scribus/glibc234.patch | 35 +++++++++++++++++++++++++++++ package/jsaw/scribus/scribus.conf | 2 +- package/jsaw/scribus/scribus.desc | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/jsaw/scribus/glibc234.patch diff --git a/package/jsaw/scribus/glibc234.patch b/package/jsaw/scribus/glibc234.patch new file mode 100644 index 000000000..4977b94b6 --- /dev/null +++ b/package/jsaw/scribus/glibc234.patch @@ -0,0 +1,35 @@ +# --- 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/jsaw/scribus/glibc234.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 --- + + +A trival fix for compilation with gcc-2.3.4 ... + + - Rene Rebe + +--- scribus-1.1.6/scribus/page.cpp.orig 2004-05-15 23:16:48.585516928 +0200 ++++ scribus-1.1.6/scribus/page.cpp 2004-05-15 23:17:39.016850200 +0200 +@@ -15,6 +15,8 @@ + * * + ***************************************************************************/ + ++#include // unlink ++ + #include "page.h" + #include "page.moc" + #include "pageitem.h" diff --git a/package/jsaw/scribus/scribus.conf b/package/jsaw/scribus/scribus.conf index 7e5c9a707..3df1f560a 100644 --- a/package/jsaw/scribus/scribus.conf +++ b/package/jsaw/scribus/scribus.conf @@ -7,7 +7,7 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/jsaw/scribus/scribus.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# 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/jsaw/scribus/scribus.desc b/package/jsaw/scribus/scribus.desc index 781924756..a8dc5f917 100644 --- a/package/jsaw/scribus/scribus.desc +++ b/package/jsaw/scribus/scribus.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/jsaw/scribus/scribus.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[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