Add patch to fix compilation with gcc-4.1 by Robert Führicht <the_master_of_disaster AT gmx DOT at>; bug #130825

Package-Manager: portage-2.1_pre10

5 files changed, 83 insertions, 17 deletions

diff --git a/x11-misc/fbdesk/ChangeLog b/x11-misc/fbdesk/ChangeLog
index 8fef03bc3c61..b18c613f222e 100644
--- a/x11-misc/fbdesk/ChangeLog
+++ b/x11-misc/fbdesk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/fbdesk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.16 2006/01/30 19:21:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.17 2006/05/02 00:49:39 halcy0n Exp $
+
+  02 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/fbdesk-1.2.1-gcc41.patch, fbdesk-1.2.1.ebuild:
+  Add patch to fix compilation with gcc-4.1 by Robert Führicht
+  <the_master_of_disaster AT gmx DOT at>; bug #130825
 
   30 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> fbdesk-1.2.1.ebuild:
   Modular-X fixing.
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index 90c1cff3defe..9c2c8a2d3694 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -1,21 +1,42 @@
-MD5 8f75560e94ee7a8d8d5d6404f96c45c4 ChangeLog 2093
-RMD160 82f21972fbadf28d0d403faac0035d7fd88a50d7 ChangeLog 2093
-SHA256 bab9b2f9e881e0ca2190749402ddeb120ed2d10ed8ea7b5536d9c190ff2c1158 ChangeLog 2093
-MD5 fe8932509357e388b8132cd283f57e6d fbdesk-1.1.5.ebuild 687
-RMD160 d3ffc35ea122ac669c8e7b8abec42b488557ad7a fbdesk-1.1.5.ebuild 687
-SHA256 4304c76de53483ed77876848ef78caaded6048421d8f34d2df4c01867bc18c0d fbdesk-1.1.5.ebuild 687
-MD5 6135758d28613c58242c6c5bcc28b8b9 fbdesk-1.2.1.ebuild 894
-RMD160 1b5e176249509151cbeac8706d4fb3cb080e33c8 fbdesk-1.2.1.ebuild 894
-SHA256 f7a86865888b1e75b2d729820a5d8a6c2c71259e0c79ee8cb85fca81c885817a fbdesk-1.2.1.ebuild 894
-MD5 39b789020c286f3f1239d3fb96d00aa0 files/digest-fbdesk-1.1.5 64
-RMD160 2203da5585a92651135490817da0abd22b8a85d9 files/digest-fbdesk-1.1.5 64
-SHA256 38fadd0506f9b17e5fe98a308aec8d39fac83e240ad6048a2d8c3c726fba7246 files/digest-fbdesk-1.1.5 64
-MD5 c9802bbcd01212346c3bff9690a74759 files/digest-fbdesk-1.2.1 64
-RMD160 ce5ea2454267191567a6e8d804d37d7ef6a74020 files/digest-fbdesk-1.2.1 64
-SHA256 f00b8dd3b41a256d299c7fd574f3385718588e28a9185d72e292d3ca2a144f49 files/digest-fbdesk-1.2.1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fbdesk-1.1.5-gcc34.patch 2462 RMD160 d9e28afad3487834dce89e699ccccdf33e8f10f4 SHA1 4a4b2b18f1bcf65fbfd6ce878f856e614a0edc63 SHA256 1f4e036f0150478fc3fcbefd56d314b1580c40202a8704520b569f6f1489ff07 size 2462
 MD5 6c03b221f71103953d36a49670e85246 files/fbdesk-1.1.5-gcc34.patch 2462
 RMD160 d9e28afad3487834dce89e699ccccdf33e8f10f4 files/fbdesk-1.1.5-gcc34.patch 2462
 SHA256 1f4e036f0150478fc3fcbefd56d314b1580c40202a8704520b569f6f1489ff07 files/fbdesk-1.1.5-gcc34.patch 2462
+AUX fbdesk-1.2.1-gcc41.patch 608 RMD160 6d31030523151dbd2b9afc74851fc5650ffef8b5 SHA1 93989176a37ebc4fe472e2be0898537603d5fda4 SHA256 4ef23c4d5a7b00d918127a14c044cd0cc19b431450c10211907c6d3e7a769f04 size 608
+MD5 a3e11679dbd415890ce60e6af7948c59 files/fbdesk-1.2.1-gcc41.patch 608
+RMD160 6d31030523151dbd2b9afc74851fc5650ffef8b5 files/fbdesk-1.2.1-gcc41.patch 608
+SHA256 4ef23c4d5a7b00d918127a14c044cd0cc19b431450c10211907c6d3e7a769f04 files/fbdesk-1.2.1-gcc41.patch 608
+DIST fbdesk-1.1.5.tar.gz 253057 size 253057
+DIST fbdesk-1.2.1.tar.gz 388679 RMD160 a3ae892c5c733351b1525e874875c09078ac5aa7 SHA256 64366e367c0bd8c29fc9a96eb095c15b4f839d2c83819e744d809127d6be5016 size 388679
+EBUILD fbdesk-1.1.5.ebuild 687 RMD160 d3ffc35ea122ac669c8e7b8abec42b488557ad7a SHA1 8d52b507b6477d6aefc636cde23443932f5ffb0e SHA256 4304c76de53483ed77876848ef78caaded6048421d8f34d2df4c01867bc18c0d size 687
+MD5 fe8932509357e388b8132cd283f57e6d fbdesk-1.1.5.ebuild 687
+RMD160 d3ffc35ea122ac669c8e7b8abec42b488557ad7a fbdesk-1.1.5.ebuild 687
+SHA256 4304c76de53483ed77876848ef78caaded6048421d8f34d2df4c01867bc18c0d fbdesk-1.1.5.ebuild 687
+EBUILD fbdesk-1.2.1.ebuild 992 RMD160 130290fb4be4150eea82d1d962daf88d39408484 SHA1 e693e0a78b467e1cd265b1c2588f13ab12343102 SHA256 bab0862994660c7662e663295d27b48376c4591ab5687eaf400a86a50845a901 size 992
+MD5 ec735c1d9eee2d22279367112ad26a2e fbdesk-1.2.1.ebuild 992
+RMD160 130290fb4be4150eea82d1d962daf88d39408484 fbdesk-1.2.1.ebuild 992
+SHA256 bab0862994660c7662e663295d27b48376c4591ab5687eaf400a86a50845a901 fbdesk-1.2.1.ebuild 992
+MISC ChangeLog 2316 RMD160 0c26c3236233bc9ef4a621fa5fd39fe24e98c9df SHA1 2dbda7102f90eb2e31c7b1ee8402a7eb516be826 SHA256 33fffb4e550c7980f75be6398525859732a29742cf98be93cc73a8a084f51ca0 size 2316
+MD5 0fc53dd156b6e229ae2cdb85da6feb8b ChangeLog 2316
+RMD160 0c26c3236233bc9ef4a621fa5fd39fe24e98c9df ChangeLog 2316
+SHA256 33fffb4e550c7980f75be6398525859732a29742cf98be93cc73a8a084f51ca0 ChangeLog 2316
+MISC metadata.xml 162 RMD160 703446c6272f12116290b48cf1edb105392e19d5 SHA1 57738825f99b27d6f85e18693ccf1167206f79e9 SHA256 98f3695fbdfbde0e5c6c81ebc87af8db70d4a62eadaea2125cfa50956860266d size 162
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
 RMD160 703446c6272f12116290b48cf1edb105392e19d5 metadata.xml 162
 SHA256 98f3695fbdfbde0e5c6c81ebc87af8db70d4a62eadaea2125cfa50956860266d metadata.xml 162
+MD5 39b789020c286f3f1239d3fb96d00aa0 files/digest-fbdesk-1.1.5 64
+RMD160 2203da5585a92651135490817da0abd22b8a85d9 files/digest-fbdesk-1.1.5 64
+SHA256 38fadd0506f9b17e5fe98a308aec8d39fac83e240ad6048a2d8c3c726fba7246 files/digest-fbdesk-1.1.5 64
+MD5 3e15f3493545c4d123b901b722d02c5e files/digest-fbdesk-1.2.1 238
+RMD160 39e896bf428ec13efd9c2422adbbdf5559fe862f files/digest-fbdesk-1.2.1 238
+SHA256 feca53ba7eecaa561feb3f88bbbcc8bffb297e735ffdfa4eb006a9f8f6d1953f files/digest-fbdesk-1.2.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEVqyqCRZPokWLroQRAulEAKDfkRN0Z8tupcjzlB5eP3g8+rLhyQCgybRt
+QEtSD2i6ffxBfKmxRSlXaUo=
+=vhcN
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/fbdesk/fbdesk-1.2.1.ebuild b/x11-misc/fbdesk/fbdesk-1.2.1.ebuild
index a310dd2d79b8..829364c16796 100644
--- a/x11-misc/fbdesk/fbdesk-1.2.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.2.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.2.1.ebuild,v 1.6 2006/01/30 19:21:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.2.1.ebuild,v 1.7 2006/05/02 00:49:39 halcy0n Exp $
+
+inherit eutils
 
 DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
 HOMEPAGE="http://www.fluxbox.org/fbdesk/"
@@ -16,6 +18,13 @@ RDEPEND="png? ( media-libs/libpng )
 DEPEND="${RDEPEND}
 		|| ( ( x11-proto/xextproto ) virtual/x11 )"
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
+
 src_compile() {
 	econf \
 	    $(use_enable debug) \
diff --git a/x11-misc/fbdesk/files/digest-fbdesk-1.2.1 b/x11-misc/fbdesk/files/digest-fbdesk-1.2.1
index 29af04e6b60d..8ff051103f1f 100644
--- a/x11-misc/fbdesk/files/digest-fbdesk-1.2.1
+++ b/x11-misc/fbdesk/files/digest-fbdesk-1.2.1
@@ -1 +1,3 @@
 MD5 382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz 388679
+RMD160 a3ae892c5c733351b1525e874875c09078ac5aa7 fbdesk-1.2.1.tar.gz 388679
+SHA256 64366e367c0bd8c29fc9a96eb095c15b4f839d2c83819e744d809127d6be5016 fbdesk-1.2.1.tar.gz 388679
diff --git a/x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch b/x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch
new file mode 100644
index 000000000000..917b8687dc18
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.2.1-gcc41.patch
@@ -0,0 +1,29 @@
+--- src/FbDesk.cc.org	2006-04-22 14:29:20.000000000 +0200
++++ src/FbDesk.cc	2006-04-22 14:37:45.000000000 +0200
+@@ -43,6 +43,8 @@
+ using namespace std;
+ using namespace FbTk;
+ 
++namespace FbTk {
++
+ template <>
+ void Resource<int>::setFromString(const char *str) {
+     sscanf(str, "%d", &*(*this));
+@@ -65,8 +67,6 @@
+     return (*this)->c_str();
+ }
+ 
+-
+-
+ template <>
+ std::string Resource<FbDesk::Icon::TextPlacement>::getString() {
+     switch (*(*this)) {
+@@ -97,6 +97,8 @@
+         *(*this) = FbDesk::Icon::TEXTPLACE_BOTTOM;
+ }
+ 
++}
++
+ namespace FbDesk {
+ 
+ FbDesk::FbDesk(const char *config_filename):