Update patch for fbsplash compile.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

3 files changed, 32 insertions, 9 deletions

diff --git a/sys-apps/tuxonice-userui/ChangeLog b/sys-apps/tuxonice-userui/ChangeLog
index 824cc58b317f..a7e28d947aaf 100644
--- a/sys-apps/tuxonice-userui/ChangeLog
+++ b/sys-apps/tuxonice-userui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tuxonice-userui
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.12 2009/04/04 11:40:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tuxonice-userui/ChangeLog,v 1.13 2009/04/05 12:20:23 nelchael Exp $
+
+  05 Apr 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  files/tuxonice-userui-1.0-Makefiles.patch:
+  Update patch for fbsplash compile.
 
 *tuxonice-userui-1.0 (04 Apr 2009)
 
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
index d7267595a06d..448f8d4eba0e 100644
--- a/sys-apps/tuxonice-userui/Manifest
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX tuxonice-userui-0.7.3-Makefiles.patch 1454 RMD160 826303ed469c4acaea2b8a72c5f066b594058e13 SHA1 9e9972923d599d93b55ce775a1e457ba32441600 SHA256 fd638d8405033e9b763c20619beb25dedf803e55ba3603b9f7f6e6912e5255e7
-AUX tuxonice-userui-1.0-Makefiles.patch 553 RMD160 7260055988699c389621338d198f10216d4bd385 SHA1 1c6f7f5efd3e133b12815866970f497d17cfdeed SHA256 9cc30ff75d3c5cc1173c6afe89e16145b7abf2810cd116145379df90592052de
+AUX tuxonice-userui-1.0-Makefiles.patch 1438 RMD160 4178677bbf596c2db145dfc4de8bf6840ac7a5b5 SHA1 7f4a0894eba5463757d1f6a8918bd0f70fd620da SHA256 a615252845a09af805b12c987cad459162dc98b6987c25123e68113d12339223
 DIST suspend2-userui-0.7.2-fbsplash.patch.bz2 36614 RMD160 1cb0286bc0c0beb0ccf11516b3c641a2a3e3ccb8 SHA1 cf9e981f01fd43a747fbd5d2cb6d6bd2ad735867 SHA256 3e9821c303632b6abbe5759d7bbbd2c24f591fafc1c530791b83f1827c4dcb5c
 DIST suspend2-userui-0.7.2.tar.gz 2850261 RMD160 4d5033ff5fa250792837b50e17eba299808e53ba SHA1 1057ec4088450b34a936a6c500167440d461a988 SHA256 7b3afb0c4bc2c1b2668d01413b1aa0bb1fd971fe59c3001aa829db0ebe04384e
 DIST tuxonice-userui-0.7.3.tar.gz 66229 RMD160 76e5e2fe3a27b585704d08c632089563abb16c1e SHA1 a0c468662c61cfb5680e9b3ab70cab44030beb4e SHA256 7222a30231f3b11d7ce931c9bbf4ae1197a4d4be24eafc6c8ab2ec2d92b0e139
@@ -10,12 +10,12 @@ DIST tuxonice-userui-1.0.tar.gz 66922 RMD160 b6e7708e5f1f3368c96833346e19d2c9127
 EBUILD tuxonice-userui-0.7.2.ebuild 1552 RMD160 5d4019ad71a3e180981a5ac4742016a842aaebf7 SHA1 3c0f92780e266e0cf3c2a8265d89ccd887fa53e1 SHA256 9fb350a7c7fc0cf3e1b3977b41ba8ae2d827ff3a3772ecf5a2d0d43258c19316
 EBUILD tuxonice-userui-0.7.3.ebuild 1509 RMD160 373be06a18851e3d4cf1232279391e6fc61ac3e1 SHA1 da7d51046233c815fa80f53f0c9537ac0ee3e344 SHA256 4af1c1f284e4a87823a95c727f7d6766ea0c0d85d94bd27d9a41f3bbdc181977
 EBUILD tuxonice-userui-1.0.ebuild 1507 RMD160 5470167df39b2e81b7bf5fa6e21f2219d8e7abe9 SHA1 37ffffef0d5d43fd16edefe80e9c6f03c7436099 SHA256 d01f0f0eb0a4d855243a387aaa56d009885c12cbc3cbb7634d7b19326dd0e8fe
-MISC ChangeLog 6660 RMD160 fdb9142d78b0f53c0532545fd7df1280e2e207d0 SHA1 4e3d4d359aee1e767f554ffca2ef63255ed34d23 SHA256 b355cc57b7b78ac5a7564872972deba432b2ddcfa8bb598e58ff34643add3023
+MISC ChangeLog 6796 RMD160 649621c880b503ccfdf8259e421dfd150bb69b61 SHA1 5484e4f805d0f44fb013e5a6a2433e302a505f5b SHA256 e668fbde28d7a15021d8ae345b0f81adc78ab133cf6f9e0b9a9959b646e87e39
 MISC metadata.xml 338 RMD160 d3ae9ef88f8d10bc999ada3df1671dc59689881e SHA1 1a36f5e5060e3e5bf56c32b288f18c61bc7d836c SHA256 5423523fae713a53028e4bdc76e4f3be5fcae848d3bcb62990bfab4782f242eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknXRz0ACgkQgo/w9rxVVVH8VgCghZPVRlr60/1xGlDSCUJ2gLeH
-ppgAoIVEZy1EhUK2yqT9QyeWmZPZJzQX
-=syJV
+iEYEARECAAYFAknYogwACgkQgo/w9rxVVVFz1wCgh/sfU9+93C1fCLuStASWkRa0
+8NUAnRZ0AE8oQd/C7YRDYPhcUNqu0xnf
+=ldMZ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch
index eee62228b460..8cc315f92082 100644
--- a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch
@@ -1,6 +1,7 @@
---- tuxonice-userui-1.0.vanilla/Makefile	2009-04-04 12:37:13.000000000 +0100
-+++ tuxonice-userui-1.0/Makefile	2009-04-04 12:37:54.000000000 +0100
-@@ -32,10 +32,10 @@
+diff -Nru tuxonice-userui-1.0.vanilla/Makefile tuxonice-userui-1.0/Makefile
+--- tuxonice-userui-1.0.vanilla/Makefile	2009-04-04 13:37:13.000000000 +0200
++++ tuxonice-userui-1.0/Makefile	2009-04-05 14:13:23.000000000 +0200
+@@ -32,15 +32,15 @@
  all: $(TARGETS)
  
  fbsplash:
@@ -13,6 +14,12 @@
  
  tuxoniceui_text: $(CORE_OBJECTS) userui_text.o
  	$(CC) $(LDFLAGS) -static $^ -o $@
+ 
+-tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS) fbsplash/userui_fbsplash.o
++tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS)
+ 	$(CC) $(LDFLAGS) -static $(CORE_OBJECTS) fbsplash/userui_fbsplash.o -o $@ $(FBSPLASH_LIBS)
+ 
+ tuxoniceui_usplash: usplash $(CORE_OBJECTS) usplash/userui_usplash.o
 @@ -48,8 +48,8 @@
  
  clean:
@@ -24,3 +31,15 @@
  
  $(INSTDIR)/%: %
  	strip $<
+diff -Nru tuxonice-userui-1.0.vanilla/fbsplash/Makefile tuxonice-userui-1.0/fbsplash/Makefile
+--- tuxonice-userui-1.0.vanilla/fbsplash/Makefile	2009-04-04 13:37:13.000000000 +0200
++++ tuxonice-userui-1.0/fbsplash/Makefile	2009-04-05 14:14:53.000000000 +0200
+@@ -6,7 +6,7 @@
+ 		parse.o mng_callbacks.o mng_render.o render.o ttf.o
+ SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
+ 
+-all: $(TARGET)
++all: $(TARGET) $(OBJECTS)
+ 
+ userui_fbsplash.o: $(OBJECTS)
+ 	$(CC) $(LDFLAGS) -r -nostdlib -nostartfiles $(SPLASH_LDLIBS) $^ -o $@