Fix gcc-4.1 compilation problems (#197045).

Package-Manager: portage-2.1.3.9

4 files changed, 96 insertions, 16 deletions

diff --git a/net-dialup/fbgetty/ChangeLog b/net-dialup/fbgetty/ChangeLog
index 8b3a32f28bd8..3490ee404a46 100644
--- a/net-dialup/fbgetty/ChangeLog
+++ b/net-dialup/fbgetty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/fbgetty
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fbgetty/ChangeLog,v 1.8 2006/03/12 10:37:23 mrness Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fbgetty/ChangeLog,v 1.9 2007/10/27 08:40:57 mrness Exp $
+
+  27 Oct 2007; Alin Năstac <mrness@gentoo.org>
+  +files/fbgetty-0.1.698-gcc41.patch, fbgetty-0.1.698.ebuild:
+  Fix gcc-4.1 compilation problems (#197045).
 
   12 Mar 2006; Alin Nastac <mrness@gentoo.org> fbgetty-0.1.698.ebuild:
   Remove virtual/libc dependency.
diff --git a/net-dialup/fbgetty/Manifest b/net-dialup/fbgetty/Manifest
index e17e3c568c12..8e83e006aa6e 100644
--- a/net-dialup/fbgetty/Manifest
+++ b/net-dialup/fbgetty/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fbgetty-0.1.698-gcc41.patch 2549 RMD160 a849149e1611aea4f842fb117404751d3cae6fbe SHA1 e258371e1c61c3ff55374070ef637322621bb52a SHA256 b23e7fda7900a380b8fc1015ca126715624bf1192622e9d9856ac8d44b44ebde
+MD5 4e50dc6c3a2a08ed1db6142c9bba92f2 files/fbgetty-0.1.698-gcc41.patch 2549
+RMD160 a849149e1611aea4f842fb117404751d3cae6fbe files/fbgetty-0.1.698-gcc41.patch 2549
+SHA256 b23e7fda7900a380b8fc1015ca126715624bf1192622e9d9856ac8d44b44ebde files/fbgetty-0.1.698-gcc41.patch 2549
 DIST fbgetty-0.1.698.tar.gz 279751 RMD160 29be676ae3af995bdec9793bfae85e42d15b4e03 SHA1 1b48582aded714eb0bfd1c7936f6e81ffdcafbaf SHA256 332cbffa7c489b39a7d13d12d581c27dfc57ba098041431a6845b44785cf2d35
-EBUILD fbgetty-0.1.698.ebuild 513 RMD160 d9bab3b3fab1441edb2f4655ec38469a3b2fa55d SHA1 471bdc4dc5aca4c4e3d18f225ff4c10f03f79982 SHA256 cdd2872d929930093019790d2056673079f9f5c247c7559a0505b66eff3ed3b4
-MD5 c0b4bb05b99d8a48f77a86d4e8593c10 fbgetty-0.1.698.ebuild 513
-RMD160 d9bab3b3fab1441edb2f4655ec38469a3b2fa55d fbgetty-0.1.698.ebuild 513
-SHA256 cdd2872d929930093019790d2056673079f9f5c247c7559a0505b66eff3ed3b4 fbgetty-0.1.698.ebuild 513
-MISC ChangeLog 870 RMD160 a23a2ed353d6405492f867aaaef097b16f0b62d7 SHA1 9570c0016d223e80f23b6f11b0528c89ea623e30 SHA256 f0de4efed7cf3079e18d82444f9f400a318efd4fc28f76adbf1213217a8c8ee9
-MD5 46283b6bb60a359ac913810cd83ef41e ChangeLog 870
-RMD160 a23a2ed353d6405492f867aaaef097b16f0b62d7 ChangeLog 870
-SHA256 f0de4efed7cf3079e18d82444f9f400a318efd4fc28f76adbf1213217a8c8ee9 ChangeLog 870
+EBUILD fbgetty-0.1.698.ebuild 600 RMD160 3b0d8228333ada46f56da816d406853f465bec9c SHA1 479ee0c7e8fc31c50f8ac15780a7733ff002d7f0 SHA256 182ec4a2fc047c8b616c394014c03fceded7aaa2acd16a86d17633aa09c18ff0
+MD5 7b3ec3c5f8e573be78894eb65b0d5407 fbgetty-0.1.698.ebuild 600
+RMD160 3b0d8228333ada46f56da816d406853f465bec9c fbgetty-0.1.698.ebuild 600
+SHA256 182ec4a2fc047c8b616c394014c03fceded7aaa2acd16a86d17633aa09c18ff0 fbgetty-0.1.698.ebuild 600
+MISC ChangeLog 1027 RMD160 4cb9098aa80d157c5ed9db5b2dff1aca2dc4a28e SHA1 921e2c6e7171df97cff00e4abcf490d7969156cc SHA256 9615a15bab5ba9710bdadc7341dc950fc48d8f509bcf69b000652eb4dce269ef
+MD5 99021d30b3b1455aaa9fbd2f26652357 ChangeLog 1027
+RMD160 4cb9098aa80d157c5ed9db5b2dff1aca2dc4a28e ChangeLog 1027
+SHA256 9615a15bab5ba9710bdadc7341dc950fc48d8f509bcf69b000652eb4dce269ef ChangeLog 1027
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -18,9 +22,9 @@ MD5 f3a19f5b1dd684befb02ca47071c23e4 files/digest-fbgetty-0.1.698 247
 RMD160 b20046868af17cf27393081bb470edf97bde3fd3 files/digest-fbgetty-0.1.698 247
 SHA256 56feb01425c799d80ac4c1d552833eeaf9382b4e8659561a664a30800656a1e6 files/digest-fbgetty-0.1.698 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFFFOl73sf9c6kjmR8RAi4YAKCl1EO+JYq628yqu31yvTVu/59TCwCfdigZ
-+pXc4lHd+Zew5H9gTH5sjlU=
-=hfGJ
+iD8DBQFHIvmjVSA5X31g7/gRArc6AKCbYd8Z57r6UHVchkootBr6yIGexwCfU/UA
+B+2i8yuAdy/2rf2PqwNpAg0=
+=u0nk
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/fbgetty/fbgetty-0.1.698.ebuild b/net-dialup/fbgetty/fbgetty-0.1.698.ebuild
index 151b5345404d..3b3efef589dd 100644
--- a/net-dialup/fbgetty/fbgetty-0.1.698.ebuild
+++ b/net-dialup/fbgetty/fbgetty-0.1.698.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fbgetty/fbgetty-0.1.698.ebuild,v 1.10 2006/03/12 10:37:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fbgetty/fbgetty-0.1.698.ebuild,v 1.11 2007/10/27 08:40:57 mrness Exp $
+
+inherit eutils
 
 DESCRIPTION="An extended getty for the framebuffer console"
 HOMEPAGE="http://projects.meuh.org/fbgetty/"
@@ -11,6 +13,12 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_install() {
 	einstall || die "make install failed"
 }
diff --git a/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch b/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch
new file mode 100644
index 000000000000..a9722f12c115
--- /dev/null
+++ b/net-dialup/fbgetty/files/fbgetty-0.1.698-gcc41.patch
@@ -0,0 +1,64 @@
+diff -Nru fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk
+--- fbgetty-0.1.698.orig/include/fbgetty/generated/fgoptions.awk	2001-07-11 23:01:15.000000000 +0300
++++ fbgetty-0.1.698/include/fbgetty/generated/fgoptions.awk	2007-10-27 11:29:50.000000000 +0300
+@@ -45,8 +45,7 @@
+   name = $3;
+   type = $2;
+ 
+-  printf("#define OFFSET_%s (offsetof(struct fbgetty_options_t, %s))\n", name, name);
+-  printf(" %s %s;\n\n", type, name);     
++  printf(" %s %s;\n", type, name);     
+ }
+ 
+ END {
+diff -Nru fbgetty-0.1.698.orig/src/options.c fbgetty-0.1.698/src/options.c
+--- fbgetty-0.1.698.orig/src/options.c	2001-12-17 22:55:42.000000000 +0200
++++ fbgetty-0.1.698/src/options.c	2007-10-27 11:32:53.000000000 +0300
+@@ -27,7 +27,7 @@
+  */
+ 
+ #include <fbgetty/global.h>
+-
++#include <stddef.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -141,7 +141,7 @@
+ #define ENV_BINARY  0x04
+ #define ENV_LEDS    0x08
+ 
+-#define ENV_ENTRY(name, type, ptr) { name, type, OFFSET_ ## ptr }
++#define ENV_ENTRY(name, type, ptr) { name, type, offsetof(struct fbgetty_options_t, ptr) }
+ 
+ static struct env_entry
+ {
+@@ -899,20 +899,20 @@
+ } 
+ merge_option_list[] = 
+ {
+-  { OFFSET_tty_device ,    MERGE_STR, NULL, -1 },
++  { offsetof(struct fbgetty_options_t, tty_device) ,    MERGE_STR, NULL, -1 },
+ #ifdef USE_FRAME_BUFFER
+-  { OFFSET_fb_device,      MERGE_STR, NULL, -1 },
++  { offsetof(struct fbgetty_options_t, fb_device),      MERGE_STR, NULL, -1 },
+ #endif
+ 
+-  { OFFSET_login_program,  MERGE_STR, LOGIN_PROGRAM, -1 },
+-  { OFFSET_login_prompt,   MERGE_STR, LOGIN_PROMPT, -1 },
+-  { OFFSET_issue_filename, MERGE_STR, ISSUE_FILE, -1 },
++  { offsetof(struct fbgetty_options_t, login_program),  MERGE_STR, LOGIN_PROGRAM, -1 },
++  { offsetof(struct fbgetty_options_t, login_prompt),   MERGE_STR, LOGIN_PROMPT, -1 },
++  { offsetof(struct fbgetty_options_t, issue_filename), MERGE_STR, ISSUE_FILE, -1 },
+ 
+-  { OFFSET_login_timeout,  MERGE_INT, NULL, LOGIN_TIMEOUT },
+-  { OFFSET_issue_refresh,  MERGE_INT, NULL, ISSUE_REFRESH },
+-  { OFFSET_screen_clear,   MERGE_INT, NULL, TRUE },
++  { offsetof(struct fbgetty_options_t, login_timeout),  MERGE_INT, NULL, LOGIN_TIMEOUT },
++  { offsetof(struct fbgetty_options_t, issue_refresh),  MERGE_INT, NULL, ISSUE_REFRESH },
++  { offsetof(struct fbgetty_options_t, screen_clear),   MERGE_INT, NULL, TRUE },
+ 
+-  { OFFSET_leds,           MERGE_INT, NULL, 0 },
++  { offsetof(struct fbgetty_options_t, leds),           MERGE_INT, NULL, 0 },
+   { 0, 0, NULL, -1 }
+ };
+