Version bump + errno bugfix

5 files changed, 167 insertions, 3 deletions

diff --git a/media-gfx/xpaint/ChangeLog b/media-gfx/xpaint/ChangeLog
index 81a2915aadf6..c8055a401195 100644
--- a/media-gfx/xpaint/ChangeLog
+++ b/media-gfx/xpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xpaint
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.3 2003/05/27 02:28:27 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.4 2003/07/23 09:54:17 phosphan Exp $
+
+*xpaint-2.7.0 (23 Jul 2003)
+
+  23 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> xpaint-2.7.0.ebuild,
+  files/xpaint-2.7.0.patch:
+  Version bump + attempt to fix the errno problem (bug 25084)
 
 *xpaint-2.6.9 (27 May 2003)
 
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index eea57cd50189..ef868b3f8bfb 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1,7 +1,7 @@
 MD5 7726af76b7e0fd130791d94f7fd8e7e0 xpaint-2.6.2-r1.ebuild 897
-MD5 646b4a4d4478d350aa4fd0affd59c038 xpaint-2.7.0.ebuild 1406
+MD5 cf28044bb88f0111c6a58226df0cb373 xpaint-2.7.0.ebuild 1409
 MD5 4e82371728d245936fea197083401fb7 xpaint-2.6.9.ebuild 1315
-MD5 742871630554874dcce1d76846f6e11f ChangeLog 781
+MD5 95c533ee8acee31f1813b0b5018d1e1c ChangeLog 784
 MD5 cc2d31e2b0dd3d23351d9a7083e30438 files/xpaint-2.7.0.patch 3104
 MD5 a5a84ca3757c5b7c1c548fcc6e4fa4d2 files/digest-xpaint-2.6.9 65
 MD5 3c20cc0f202977da7d96cadc7557b9d2 files/digest-xpaint-2.7.0 65
diff --git a/media-gfx/xpaint/files/digest-xpaint-2.7.0 b/media-gfx/xpaint/files/digest-xpaint-2.7.0
new file mode 100644
index 000000000000..62837b07a23b
--- /dev/null
+++ b/media-gfx/xpaint/files/digest-xpaint-2.7.0
@@ -0,0 +1 @@
+MD5 596be813d83922fc4e802bdec19469b3 xpaint-2.7.0.tar.bz2 548641
diff --git a/media-gfx/xpaint/files/xpaint-2.7.0.patch b/media-gfx/xpaint/files/xpaint-2.7.0.patch
new file mode 100644
index 000000000000..065f728097b6
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.7.0.patch
@@ -0,0 +1,101 @@
+diff -ur xpaint-2.7.0/rw/libpnmrw.c xpaint-2.7.0new/rw/libpnmrw.c
+--- xpaint-2.7.0/rw/libpnmrw.c	2003-07-23 11:35:54.000000000 +0200
++++ xpaint-2.7.0new/rw/libpnmrw.c	2003-07-23 11:36:19.000000000 +0200
+@@ -49,7 +49,7 @@
+ 
+ void *malloc(int);
+ void free(void *);
+-#if defined(__EMX__) || defined(__CYGWIN__)
++#if defined(__EMX__) || defined(__STDC__) || defined(__CYGWIN__)
+ #include <errno.h>
+ #endif
+ 
+@@ -147,12 +147,12 @@
+ #endif
+ #endif
+ #endif
+-#if !defined(__EMX__) || defined(__CYGWIN__)
++#if (!defined(__EMX__) && !defined(__STDC__)) || defined(__CYGWIN__) 
+     extern int errno;
+ #endif
+     char *e;
+ 
+-    e = (char *)sys_errlist[errno];
++    e = (char *)strerror(errno);
+ 
+     if (reason != 0 && reason[0] != '\0')
+ 	fprintf(stderr, "%s: %s - %s\n", progname, reason, e);
+diff -ur xpaint-2.7.0/rw/writeGIF.c xpaint-2.7.0new/rw/writeGIF.c
+--- xpaint-2.7.0/rw/writeGIF.c	2003-07-23 11:35:54.000000000 +0200
++++ xpaint-2.7.0new/rw/writeGIF.c	2003-07-23 11:40:59.000000000 +0200
+@@ -40,7 +40,7 @@
+ #include <stdio.h>
+ #include "image.h"
+ #include "rwTable.h"
+-#ifdef __EMX__
++#if defined(__EMX__) || defined(__STDC__)
+ #include <errno.h>
+ #endif
+ 
+@@ -84,7 +84,7 @@
+ int
+ WriteGIF(char *file, Image * outImage)
+ {
+-#ifndef __EMX__
++#if defined(__EMX__) && !defined(__STDC__)
+     extern int errno;
+ #endif
+     int r[MAXCOLORS], g[MAXCOLORS], b[MAXCOLORS];
+diff -ur xpaint-2.7.0/xaw95-1.1.4/AsciiSrc.c xpaint-2.7.0new/xaw95-1.1.4/AsciiSrc.c
+--- xpaint-2.7.0/xaw95-1.1.4/AsciiSrc.c	2003-07-23 11:35:54.000000000 +0200
++++ xpaint-2.7.0new/xaw95-1.1.4/AsciiSrc.c	2003-07-23 11:36:19.000000000 +0200
+@@ -984,6 +984,7 @@
+ {
+     char * open_mode = NULL;
+     FILE * file;
++    int tmpfd;
+     char fileName[TMPSIZ];
+ 
+     if (src->ascii_src.type == XawAsciiString) {
+@@ -1030,7 +1031,8 @@
+     case XawtextEdit:
+ 	if (src->ascii_src.string == NULL) {
+ 	    src->ascii_src.string = fileName;
+-	    (void) tmpnam(src->ascii_src.string);
++	    tmpfd=mkstemp(src->ascii_src.string);
++            if(tmpfd == -1) perror("mkstemp failed");
+ 	    src->ascii_src.is_tempfile = TRUE;
+ 	    open_mode = "w";
+ 	} else
+diff -ur xpaint-2.7.0/xaw95-1.1.4/MultiSrc.c xpaint-2.7.0new/xaw95-1.1.4/MultiSrc.c
+--- xpaint-2.7.0/xaw95-1.1.4/MultiSrc.c	2003-07-23 11:35:54.000000000 +0200
++++ xpaint-2.7.0new/xaw95-1.1.4/MultiSrc.c	2003-07-23 11:36:19.000000000 +0200
+@@ -122,7 +122,7 @@
+ static void (MyWStrncpy)();
+ #endif
+ 
+-extern char *tmpnam();
++#include <stdlib.h>
+ #ifdef X_NOT_STDC_ENV
+ extern int errno; 
+ #endif
+@@ -1077,7 +1077,8 @@
+ {
+     char * open_mode = NULL;
+     FILE * file;
+-    char fileName[TMPSIZ];
++    int tmpfd;
++    char fileName[TMPSIZ]="xpaintXXXXXX";
+     Display *d = XtDisplayOfObject((Widget)src);
+ 
+     if (src->multi_src.type == XawAsciiString) {
+@@ -1137,7 +1138,8 @@
+             src->multi_src.allocated_string = False;
+ 	    src->multi_src.string = fileName;
+ 
+-	    (void) tmpnam(src->multi_src.string);
++	    tmpfd=mkstemp(src->multi_src.string);
++            if(tmpfd == -1) perror("mkstemp failed");
+ 	    src->multi_src.is_tempfile = TRUE;
+ 	    open_mode = "w";
+ 	} else
diff --git a/media-gfx/xpaint/xpaint-2.7.0.ebuild b/media-gfx/xpaint/xpaint-2.7.0.ebuild
new file mode 100644
index 000000000000..3d8cb28135e7
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.7.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.7.0.ebuild,v 1.1 2003/07/23 09:54:17 phosphan Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="XPaint is an image editor which supports most standard paint program options."
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=media-libs/tiff-3.2 
+	virtual/x11 
+	media-libs/jpeg
+	media-libs/libpng"
+
+src_unpack() {
+	unpack ${A}
+	patch -p0 < ${FILESDIR}/${P}.patch || die "patch failed"
+}
+
+src_compile() {
+	xmkmf -a || die
+	# It demands Xaw95 libs now even if the docs
+	# say somthing else (own version is included)
+	make xaw95static || die
+}
+
+src_install() {
+	# make install causes tons of sanbox violations
+	# even if it uses DESTDIR so we do it the hard way
+
+	insinto /etc/X11/app-defaults
+	doins app-defaults/out/*
+
+	dobin xpaint
+
+	insinto /usr/share/xpaint/help
+	doins share/help/*
+	insinto /usr/share/xpaint/messages
+	doins share/messages/*
+	insinto /usr/share/xpaint/filters
+	doins share/filters/*
+	insinto /usr/share/xpaint/include
+	doins image.h
+
+	insinto /usr/share/pixmaps
+	doins XPaintIcon.xpm
+
+	newman xpaint._man xpaint.1
+
+	dodoc ChangeLog INSTALL README README.PNG README.old TODO \
+	      Doc/Operator.doc Doc/sample.Xdefaults
+}