Added a patch to fix compilation problems with gcc4 (bug #114724).

Package-Manager: portage-2.0.53

5 files changed, 57 insertions, 12 deletions

diff --git a/media-gfx/bootsplash/ChangeLog b/media-gfx/bootsplash/ChangeLog
index 4a8a296e9d7c..1105c26f6652 100644
--- a/media-gfx/bootsplash/ChangeLog
+++ b/media-gfx/bootsplash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/bootsplash
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.60 2005/06/05 12:04:18 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/ChangeLog,v 1.61 2005/12/10 16:58:19 spock Exp $
+
+  10 Dec 2005; Michał Januszewski <spock@gentoo.org>
+  +files/bootsplash-gcc4-fix.patch, bootsplash-0.6.1-r7.ebuild:
+  Added a patch to fix compilation problems with gcc4 (bug #114724).
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   bootsplash-0.6.1-r7.ebuild:
diff --git a/media-gfx/bootsplash/Manifest b/media-gfx/bootsplash/Manifest
index 61c927d4f7a3..f730794a19a7 100644
--- a/media-gfx/bootsplash/Manifest
+++ b/media-gfx/bootsplash/Manifest
@@ -1,11 +1,22 @@
-MD5 01b612a01dc3cb3bbf01a16c6ead3930 bootsplash-0.6.1-r6.ebuild 3076
-MD5 a93cb3db61c532b39e8c461c713a25f8 bootsplash-0.6.1-r4.ebuild 2973
-MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 01dfc98e2b6dcd453785a77e52adfaf5 ChangeLog 12047
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1a805eda3e71ba56cc27370c8d07b300 ChangeLog 12234
 MD5 e82fa0ea2fa87ab46e6c42f200791134 bootsplash-0.6-r16.ebuild 6690
-MD5 e69c477baeb2fde1ce0b76bd640efda9 bootsplash-0.6.1-r7.ebuild 3235
+MD5 a93cb3db61c532b39e8c461c713a25f8 bootsplash-0.6.1-r4.ebuild 2973
+MD5 01b612a01dc3cb3bbf01a16c6ead3930 bootsplash-0.6.1-r6.ebuild 3076
+MD5 874ef39c015514f1ec4810a01679020d bootsplash-0.6.1-r7.ebuild 3324
 MD5 62e182a70b6535d721dffdf34051c48e files/0.6.1-r7-default_theme.patch 406
-MD5 3f2697605cd4c22d7ec6a8a56e562da4 files/digest-bootsplash-0.6.1-r4 232
+MD5 5be185bdc05784f2c883e17043abb465 files/bootsplash-gcc4-fix.patch 762
 MD5 e07733044709e48e34df036d69dc9f3a files/digest-bootsplash-0.6-r16 71
-MD5 00168dc069b71a54b9a8fcb10e0c4752 files/digest-bootsplash-0.6.1-r7 232
+MD5 3f2697605cd4c22d7ec6a8a56e562da4 files/digest-bootsplash-0.6.1-r4 232
 MD5 00168dc069b71a54b9a8fcb10e0c4752 files/digest-bootsplash-0.6.1-r6 232
+MD5 5c26bfaea2b292570606b499e4efdb53 files/digest-bootsplash-0.6.1-r7 232
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDmwlHchej4aZK9/cRAsgpAJ4rRUZVbiER5iXWgA1RA+Du9jfHiQCfZAcc
+WLuoeH9vk1lCmEcLg+W6xc4=
+=dfQ0
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild b/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
index 2f48c0ae687e..32a993cb103f 100644
--- a/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild
+++ b/media-gfx/bootsplash/bootsplash-0.6.1-r7.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/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.6 2005/06/05 12:04:18 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/bootsplash/bootsplash-0.6.1-r7.ebuild,v 1.7 2005/12/10 16:58:19 spock Exp $
 
 inherit eutils
 
@@ -20,7 +20,13 @@ DEPEND=">=media-libs/freetype-2
 	media-libs/lcms
 	!media-gfx/splashutils"
 
-PATCHS="${FILESDIR}/0.6.1-r7-default_theme.patch"
+PATCHES="${FILESDIR}/0.6.1-r7-default_theme.patch"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/bootsplash-gcc4-fix.patch
+}
 
 src_compile() {
 	# compile utils
@@ -37,7 +43,7 @@ src_compile() {
 
 src_install() {
 	# applying patchs
-	epatch ${PATCHS} || die "error applying patch(s) [${PATCHS}]"
+	epatch ${PATCHES} || die "error applying patch(es) [${PATCHES}]"
 	# Splash utilities
 	exeinto /sbin
 	doexe utils/fbmngplay/fbmngplay{,.static}
diff --git a/media-gfx/bootsplash/files/bootsplash-gcc4-fix.patch b/media-gfx/bootsplash/files/bootsplash-gcc4-fix.patch
new file mode 100644
index 000000000000..cd57a466ee42
--- /dev/null
+++ b/media-gfx/bootsplash/files/bootsplash-gcc4-fix.patch
@@ -0,0 +1,24 @@
+diff -uNr bootsplash.old/utils/fbmngplay/mng.c bootsplash/utils/fbmngplay/mng.c
+--- utils/fbmngplay/mng.c	2005-12-07 11:53:20.000000000 +0100
++++ utils/fbmngplay/mng.c	2005-12-07 12:00:20.000000000 +0100
+@@ -226,7 +226,8 @@
+ 		a = a * mymng->alpha / 100;
+ 		switch (mymng->fbbpp) {
+ 		case 16:
+-			input = *((unsigned short *) background)++;
++			input = *((unsigned short *) background);
++			background += 2;
+ 
+ 			br = (input >> mng->fbredo) << (8-mng->fbredl);
+ 			bg = (input >> mng->fbgreeno) << (8-mng->fbgreenl);
+@@ -273,7 +274,9 @@
+ 
+ 			output = (r << mng->fbredo) | (g << mng->fbgreeno) | (b << mng->fbblueo);
+ 
+-			*((unsigned short *) dest)++ = output;
++			*((unsigned short *) dest) = output;
++			dest += 2;
++
+ 			break;
+ 		case 24:
+ 			*dest++ = b;
diff --git a/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7 b/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7
index 42c1b61a6556..1ff076217525 100644
--- a/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7
+++ b/media-gfx/bootsplash/files/digest-bootsplash-0.6.1-r7
@@ -1,3 +1,3 @@
 MD5 3ec34e6cc47d7e47825658f1f71e718f bootsplash-core-0.6.1-r6.tar.bz2 130805
-MD5 1d93157ac8796a86cc269b24bb882769 bootsplash-themes-0.6.1.tar.bz2 416892
 MD5 61ad5145876db963402bcf166a01f94a bootsplash-kernel-0.6.1-r6.tar.bz2 177574
+MD5 1d93157ac8796a86cc269b24bb882769 bootsplash-themes-0.6.1.tar.bz2 416892