Patch for 0.9.13-r1. Resolves bug #82598.

Package-Manager: portage-2.0.51.19

4 files changed, 49 insertions, 4 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 8b0ef1f6685a..205d89838b7a 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.12 2005/03/20 21:26:00 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.13 2005/03/21 01:35:10 leonardop Exp $
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org>
+  tuxpaint-0.9.13-r1.ebuild,
+  files/tuxpaint-0.9.13-fix_error_directives.patch:
+  Added a patch to remove a few useless #error directives that were breaking
+  compilation. Resolves bug #82598.
 
 *tuxpaint-0.9.14 (20 Mar 2005)
 
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index ffcd62efcdf5..5ee0631e03cb 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,7 +1,8 @@
-MD5 080677e9222822a72ed9c2416cb5f79a ChangeLog 1817
+MD5 3169b7bd368f6450fd70a9287ce7d64d ChangeLog 2067
 MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
-MD5 6a7ad58d4291efcadf8478d4122535e6 tuxpaint-0.9.13-r1.ebuild 1317
+MD5 7aee18cb989be7a6cf2751bc47e45ea8 tuxpaint-0.9.13-r1.ebuild 1445
 MD5 83d4ae8d732ae19d3323855a234c0e1e tuxpaint-0.9.14.ebuild 1476
 MD5 6c694aa3e9399a07cdaa7f82a162b222 files/digest-tuxpaint-0.9.14 68
 MD5 ac7dc281a67f1db989d39470aa12ea8e files/digest-tuxpaint-0.9.13-r1 142
 MD5 b12d971848124691a60da9265ecb86ba files/tuxpaint-0.9.14-gentoo.patch 4511
+MD5 195f5bf3e6bddb622dff7e4c30b81edb files/tuxpaint-0.9.13-fix_error_directives.patch 1300
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.13-fix_error_directives.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.13-fix_error_directives.patch
new file mode 100644
index 000000000000..f63f4d42e27d
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.13-fix_error_directives.patch
@@ -0,0 +1,36 @@
+diff -NurdB tuxpaint-0.9.13-orig/src/tuxpaint.c tuxpaint-0.9.13/src/tuxpaint.c
+--- tuxpaint-0.9.13-orig/src/tuxpaint.c	2005-03-20 20:19:44.000000000 -0500
++++ tuxpaint-0.9.13/src/tuxpaint.c	2005-03-20 20:20:17.000000000 -0500
+@@ -165,32 +165,11 @@
+ #endif
+ 
+ #include "SDL_image.h"
+-#ifndef _IMG_h
+-#error "---------------------------------------------------"
+-#error "If you installed SDL_image from a package, be sure"
+-#error "to get the development package, as well!"
+-#error "(e.g., 'libsdl-image1.2-devel.rpm')"
+-#error "---------------------------------------------------"
+-#endif
+ 
+ #include "SDL_ttf.h"
+-#ifndef _SDLttf_h
+-#error "---------------------------------------------------"
+-#error "If you installed SDL_ttf from a package, be sure"
+-#error "to get the development package, as well!"
+-#error "(e.g., 'libsdl-ttf1.2-devel.rpm')"
+-#error "---------------------------------------------------"
+-#endif
+ 
+ #ifndef NOSOUND
+ #include "SDL_mixer.h"
+-#ifndef _MIXER_H_
+-#error "---------------------------------------------------"
+-#error "If you installed SDL_mixer from a package, be sure"
+-#error "to get the development package, as well!"
+-#error "(e.g., 'libsdl-mixer1.2-devel.rpm')"
+-#error "---------------------------------------------------"
+-#endif
+ #endif
+ 
+ #ifndef SAVE_AS_BMP
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
index 7dc8f4938592..fdb2a45f39fa 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild,v 1.3 2005/03/20 21:26:00 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild,v 1.4 2005/03/21 01:35:10 leonardop Exp $
 
 inherit eutils
 
@@ -30,6 +30,8 @@ src_unpack() {
 
 	# Sanitize the hack that is its Makefile
 	epatch ${DISTDIR}/${P}-makefile.patch
+	# Remove outdated error directives that break compilation. See bug #82598.
+	epatch ${FILESDIR}/${P}-fix_error_directives.patch
 }
 
 src_compile() {