From: Michael Januszewski <spock@gentoo.org>
Date: Wed, 14 Mar 2007 23:02:25 +0000 (+0000)
Subject: Fix bug #170822.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb4505598b4e370d6c6276f33a05b7d3c80f133e;p=gentoo.git

Fix bug #170822.
Package-Manager: portage-2.1.2.2
---

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index aa2ef979c487..294e34ffa3c6 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.75 2007/03/13 18:05:08 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.76 2007/03/14 23:02:25 spock Exp $
+
+  14 Mar 2007; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.3.1-boot_message-fix.patch, splashutils-1.3.1.ebuild:
+  Fix bug #170822.
 
   13 Mar 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3.1-boot_msg.patch, splashutils-1.3.1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index e2ae5f013e05..5c4beb5dd51c 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -29,6 +29,10 @@ AUX splashutils-1.3-r2.patch 4259 RMD160 e7479c4cccad9790309ac2c0904e711cce746c5
 MD5 978a508e464a56ba1c965979d47a8d5e files/splashutils-1.3-r2.patch 4259
 RMD160 e7479c4cccad9790309ac2c0904e711cce746c5d files/splashutils-1.3-r2.patch 4259
 SHA256 bccf05e2a746ab5c7d6a16b704c870715c306d64949e5661d2b92b710ae46916 files/splashutils-1.3-r2.patch 4259
+AUX splashutils-1.3.1-boot_message-fix.patch 421 RMD160 7348f75585fa4dba435b744d6c69c1e6e7fb3c05 SHA1 78a69346f424a68eaa5ad58853c79dd8d2cf2e83 SHA256 a60f286d80587de311631a35a0c7f59b3649654ca6b051220159d95ed58f630e
+MD5 04b55c296607209c01beeb23933021bd files/splashutils-1.3.1-boot_message-fix.patch 421
+RMD160 7348f75585fa4dba435b744d6c69c1e6e7fb3c05 files/splashutils-1.3.1-boot_message-fix.patch 421
+SHA256 a60f286d80587de311631a35a0c7f59b3649654ca6b051220159d95ed58f630e files/splashutils-1.3.1-boot_message-fix.patch 421
 AUX splashutils-1.3.1-boot_msg.patch 732 RMD160 286014c8892b7b72adfec00f61a1b1f8cbabf887 SHA1 c9c046e69206e6b40201c9f71e4183de7bb4dd0c SHA256 d5821315a98e6ed5c9fe6bab47d26114b0714dfba0159a0bdbb29dd47e47b70b
 MD5 c9394fe1e181acf24303e0baa1d97fcf files/splashutils-1.3.1-boot_msg.patch 732
 RMD160 286014c8892b7b72adfec00f61a1b1f8cbabf887 files/splashutils-1.3.1-boot_msg.patch 732
@@ -74,14 +78,14 @@ EBUILD splashutils-1.3-r3.ebuild 7153 RMD160 57e8f24564ec6bf98e635111c7354ee7ec2
 MD5 d67227ec2dc3875326716e83d57ee513 splashutils-1.3-r3.ebuild 7153
 RMD160 57e8f24564ec6bf98e635111c7354ee7ec24c270 splashutils-1.3-r3.ebuild 7153
 SHA256 5af03ce2260a32161d71868233f706dec96a8b99c58ba9159f9fa773d48623c1 splashutils-1.3-r3.ebuild 7153
-EBUILD splashutils-1.3.1.ebuild 6979 RMD160 d0ad073a631b0a88fb2b86e6b67bf0690c2f2ae0 SHA1 41c3e021b301438683ce4de4cb28400041b454e8 SHA256 1c5c4ca4600d15fbbfb51b04077b391ce2ef76a4ca2774b60adf85150ae2b5ff
-MD5 6f22aed1f8cf0110dfc96c1b6ed3c062 splashutils-1.3.1.ebuild 6979
-RMD160 d0ad073a631b0a88fb2b86e6b67bf0690c2f2ae0 splashutils-1.3.1.ebuild 6979
-SHA256 1c5c4ca4600d15fbbfb51b04077b391ce2ef76a4ca2774b60adf85150ae2b5ff splashutils-1.3.1.ebuild 6979
-MISC ChangeLog 15639 RMD160 413333001157789512bbd1e316361c610d6cc2f2 SHA1 c324f4441ce6ddfac1b5204b0545cc8ae0d20269 SHA256 19a15db8ea147e7267179a1b4b95c816f3d164880cddb8e38b24aad2b04c484e
-MD5 5479a606de47069835e3da3e560b8b17 ChangeLog 15639
-RMD160 413333001157789512bbd1e316361c610d6cc2f2 ChangeLog 15639
-SHA256 19a15db8ea147e7267179a1b4b95c816f3d164880cddb8e38b24aad2b04c484e ChangeLog 15639
+EBUILD splashutils-1.3.1.ebuild 7027 RMD160 3a70efeb8d1cf3000500849344790294d769badc SHA1 7ea029354f009a1ee2d3d65723cd5390e6647350 SHA256 a9540fa99b2c73f4fd19cfbbe5cd69bc58f2c8c02249faff23dcbbbc5793a147
+MD5 2aee8b0362725938339a6037dfc76b27 splashutils-1.3.1.ebuild 7027
+RMD160 3a70efeb8d1cf3000500849344790294d769badc splashutils-1.3.1.ebuild 7027
+SHA256 a9540fa99b2c73f4fd19cfbbe5cd69bc58f2c8c02249faff23dcbbbc5793a147 splashutils-1.3.1.ebuild 7027
+MISC ChangeLog 15790 RMD160 a938522ce1d1a9813c2757348d17a95e23941d57 SHA1 a35992f0ae7d003fef4cd553705a1acff131dc0d SHA256 419c231efe3c0f186cced33f3e1aac304ef3cfa91af7a7437dc2a1da53114f61
+MD5 9d4879ab6a0d9fc473fa4c182ccfc3a4 ChangeLog 15790
+RMD160 a938522ce1d1a9813c2757348d17a95e23941d57 ChangeLog 15790
+SHA256 419c231efe3c0f186cced33f3e1aac304ef3cfa91af7a7437dc2a1da53114f61 ChangeLog 15790
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -104,7 +108,7 @@ SHA256 20dc274189e8c25ee3bf459573da4a263e9ada3eedbe816283c53c28f200e0c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9ufkchej4aZK9/cRAi8BAJ4nptsiQsPTDWBwv9EbNXhdlHeNvQCfR9cy
-KXrCX1ltBg1eUIIaQWcUeaI=
-=0HlT
+iD8DBQFF+H8Hchej4aZK9/cRAjUfAJ9v4N4sK24mAeyLn2Zcf5L9tavwAACePD00
+jU8Z8P8CZpFafOdbHQNKkVI=
+=1e/l
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.3.1-boot_message-fix.patch b/media-gfx/splashutils/files/splashutils-1.3.1-boot_message-fix.patch
new file mode 100644
index 000000000000..3cb4ae8c9cb9
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.3.1-boot_message-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/core/splash.c b/core/splash.c
+index 3792ed9..459f5a7 100644
+--- a/core/splash.c
++++ b/core/splash.c
+@@ -122,9 +122,10 @@ int main(int argc, char **argv)
+ 	arg_vc = -1;
+ 
+ 	verbose_img.cmap.red = silent_img.cmap.red = NULL;
+-	boot_message = getenv("BOOT_MSG");
+ 
+ #ifdef CONFIG_TTF
++	boot_message = getenv("BOOT_MSG");
++
+ 	if (TTF_Init() < 0) {
+ 		fprintf(stderr, "Couldn't initialize TTF.\n");
+ 		return -1;
diff --git a/media-gfx/splashutils/splashutils-1.3.1.ebuild b/media-gfx/splashutils/splashutils-1.3.1.ebuild
index 527141205481..428dc7d665cd 100644
--- a/media-gfx/splashutils/splashutils-1.3.1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3.1.ebuild,v 1.2 2007/03/13 18:05:08 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3.1.ebuild,v 1.3 2007/03/14 23:02:25 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -69,6 +69,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-boot_msg.patch
 
 	cd ${S}
+	epatch ${FILESDIR}/${P}-boot_message-fix.patch
 
 	# Make sure the static version of splash_util is linked against the nptl
 	# libraries and not the linuxthreads ones.