Fix compilation issues with gcc4 (bug #143703).

Package-Manager: portage-2.1.1_pre5

4 files changed, 174 insertions, 13 deletions

diff --git a/dev-util/biew/ChangeLog b/dev-util/biew/ChangeLog
index 4a2cb41fdea4..b301de4633bc 100644
--- a/dev-util/biew/ChangeLog
+++ b/dev-util/biew/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/biew
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.15 2006/08/08 21:13:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.16 2006/08/13 10:58:43 spock Exp $
+
+  13 Aug 2006; Michał Januszewski <spock@gentoo.org>
+  +files/biew-562-lvalue-casts.patch, biew-5.6.2.ebuild:
+  Fix compilation issues with gcc4 (bug #143703).
 
   08 Aug 2006; Michał Januszewski <spock@gentoo.org> biew-5.5.0.ebuild,
   biew-5.6.1.ebuild, biew-5.6.2.ebuild:
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
index fa674354aacc..30db0785dc1a 100644
--- a/dev-util/biew/Manifest
+++ b/dev-util/biew/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX biew-562-lvalue-casts.patch 5531 RMD160 fd994fa1c4104023b1644a5a8cb53adbafe4b7cf SHA1 b579bbfc6fb8e3a6d8e572e6dc5b16caf7597415 SHA256 1a9090cd036ee0c32d4e36a8db6fd10238e6011d0daf579041a3079912dad5c3
+MD5 3d051ee6de13bec510f70b237b8e213a files/biew-562-lvalue-casts.patch 5531
+RMD160 fd994fa1c4104023b1644a5a8cb53adbafe4b7cf files/biew-562-lvalue-casts.patch 5531
+SHA256 1a9090cd036ee0c32d4e36a8db6fd10238e6011d0daf579041a3079912dad5c3 files/biew-562-lvalue-casts.patch 5531
 DIST biew-550.tar.bz2 526883
 DIST biew561.tar.bz2 600398
 DIST biew562.tar.bz2 594367 RMD160 413f2c72a70056adbebd5e79d541201d6e3b27cb SHA1 44435c0815a59d38c9a6c74d09c0f495e71e23fe SHA256 82263fdd9f9854a9326889b8d4e138c0dba3f08460922d4683f659873313e46a
@@ -12,14 +16,14 @@ EBUILD biew-5.6.1.ebuild 1431 RMD160 46e50d59e2f8d49957a465a9e1ba11263a49c12a SH
 MD5 37c98bc5c8316da290dac4b78872abf1 biew-5.6.1.ebuild 1431
 RMD160 46e50d59e2f8d49957a465a9e1ba11263a49c12a biew-5.6.1.ebuild 1431
 SHA256 995586136acf0f954dd0a0943b1a496f61d87ffd79c1a48b80455f8fe0af887d biew-5.6.1.ebuild 1431
-EBUILD biew-5.6.2.ebuild 1556 RMD160 da2544f11c62690a068db2cbdfdc681327918a23 SHA1 b285d933e55c39c8493187c5d22c432683d5072b SHA256 dedae86aaf7ff12662eb119b7960cdaa4e1e96ad056e75d97549fe4037adb737
-MD5 814f43d76fa5a56ae0d194a17f12f28b biew-5.6.2.ebuild 1556
-RMD160 da2544f11c62690a068db2cbdfdc681327918a23 biew-5.6.2.ebuild 1556
-SHA256 dedae86aaf7ff12662eb119b7960cdaa4e1e96ad056e75d97549fe4037adb737 biew-5.6.2.ebuild 1556
-MISC ChangeLog 1897 RMD160 0a12d9059ed76eb1feade8c46526bcf09ca99eee SHA1 1d2b75526502ce4e0003e4465ea5a7d457329a87 SHA256 4726ebdab0437f2c9b65b69d7e0c43f76b9e8c95013094f904276b86352a5ae1
-MD5 6d799947be855688fd2a61433925ef05 ChangeLog 1897
-RMD160 0a12d9059ed76eb1feade8c46526bcf09ca99eee ChangeLog 1897
-SHA256 4726ebdab0437f2c9b65b69d7e0c43f76b9e8c95013094f904276b86352a5ae1 ChangeLog 1897
+EBUILD biew-5.6.2.ebuild 1604 RMD160 47140deb3693da144eebf068e0b1aaf3ec721a1f SHA1 1ce75522d632c0e76349c58c21a0e86826951bd9 SHA256 7ab3e999ba78cffbf25056dc06e810d08ad1e00a421c513c2b913c6032bf3a79
+MD5 25bbd031dd83f004d25858887cb66c09 biew-5.6.2.ebuild 1604
+RMD160 47140deb3693da144eebf068e0b1aaf3ec721a1f biew-5.6.2.ebuild 1604
+SHA256 7ab3e999ba78cffbf25056dc06e810d08ad1e00a421c513c2b913c6032bf3a79 biew-5.6.2.ebuild 1604
+MISC ChangeLog 2059 RMD160 2233827e3a8c3c3601e7a5c57451ca6d8fcecf3d SHA1 1e944057b21a011f55bbb3a0bd70de8975fae71a SHA256 d1d7dfa18b31eb73e18c8a906bcbf7a2da5e29db7a6d184e75767423362b344f
+MD5 1696a420c2a2e0eb3f682ff52bcf8287 ChangeLog 2059
+RMD160 2233827e3a8c3c3601e7a5c57451ca6d8fcecf3d ChangeLog 2059
+SHA256 d1d7dfa18b31eb73e18c8a906bcbf7a2da5e29db7a6d184e75767423362b344f ChangeLog 2059
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -36,7 +40,7 @@ SHA256 226c1259e7f01013165fb579f3fd3a13fab721a5a0cf41d1da29ed6a31777893 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE2P6Tchej4aZK9/cRAhxhAJ0bNfg6kbE3pvj/tgyTuvqOuAuNHgCbBuAr
-SUXEh69dhcMravSnU//Dhj0=
-=2rgD
+iD8DBQFE3wX2chej4aZK9/cRAuO5AJ0TzFGDPlKYBbATBAAduVpWYxlUcgCcCx8M
+jVACVVErpxslA0Dksck0aTs=
+=a3gL
 -----END PGP SIGNATURE-----
diff --git a/dev-util/biew/biew-5.6.2.ebuild b/dev-util/biew/biew-5.6.2.ebuild
index 0e725236e326..33bf29ad7481 100644
--- a/dev-util/biew/biew-5.6.2.ebuild
+++ b/dev-util/biew/biew-5.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-5.6.2.ebuild,v 1.5 2006/08/08 21:13:48 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-5.6.2.ebuild,v 1.6 2006/08/13 10:58:43 spock Exp $
 
 inherit flag-o-matic
 IUSE="slang ncurses"
@@ -20,6 +20,7 @@ S="${WORKDIR}/${PN}-${PV//./}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/biew-562-lvalue-casts.patch
 
 	sed -i "s/USE_MOUSE=.*/USE_MOUSE=y/" makefile
 	sed -i 's:/usr/local:/usr:' biewlib/sysdep/generic/unix/os_dep.c
diff --git a/dev-util/biew/files/biew-562-lvalue-casts.patch b/dev-util/biew/files/biew-562-lvalue-casts.patch
new file mode 100644
index 000000000000..d3ade95a8cb8
--- /dev/null
+++ b/dev-util/biew/files/biew-562-lvalue-casts.patch
@@ -0,0 +1,152 @@
+diff -Naurp biew-562-orig/biewlib/file_ini.c biew-562/biewlib/file_ini.c
+--- biew-562-orig/biewlib/file_ini.c	2006-08-12 21:56:49.000000000 +0200
++++ biew-562/biewlib/file_ini.c	2006-08-13 12:01:32.000000000 +0200
+@@ -1295,7 +1295,7 @@ static tBool __NEAR__ __FASTCALL__ __add
+   void __HUGE__ *found;
+   ini_cache __HUGE__ *it;
+   ini_cache ic;
+-  (const char *)ic.item = section;
++  ic.item = section;
+   ic.flags = 0;
+   if(!(found =la_Find((linearArray *)opening->cache,&ic,__full_compare_cache)))
+   {
+@@ -1325,7 +1325,7 @@ static tBool __NEAR__ __FASTCALL__ __add
+   {
+     do_subsect:
+       it = (ini_cache __HUGE__ *)found;
+-      (const char *)ic.item = subsection;
++      ic.item = subsection;
+       if(!(found=la_Find(it->v.leaf,&ic,__full_compare_cache)))
+       {
+         ic.item = PMalloc(strlen(subsection)+1);
+@@ -1354,7 +1354,7 @@ static tBool __NEAR__ __FASTCALL__ __add
+       {
+         do_item:
+         it = (ini_cache __HUGE__ *)found;
+-        (const char *)ic.item = item;
++        ic.item = item;
+         ic.flags = IC_STRING;
+         if(!(found=la_Find(it->v.leaf,&ic,__full_compare_cache)))
+         {
+@@ -1589,15 +1589,15 @@ unsigned __FASTCALL__ iniReadProfileStri
+           ini_cache ic;
+           void __HUGE__ *found,__HUGE__ *foundi,__HUGE__ *foundv;
+           ini_cache __HUGE__ *fi;
+-          (const char *)ic.item = section;
++          ic.item = section;
+           ic.flags = 0;
+           if((found=la_Find(ini->cache,&ic,__full_compare_cache))!=NULL)
+           {
+-            (const char *)ic.item=subsection;
++            ic.item=subsection;
+             fi = (ini_cache __HUGE__ *)found;
+             if((foundi=la_Find(fi->v.leaf,&ic,__full_compare_cache))!=NULL)
+             {
+-               (const char *)ic.item = _item;
++               ic.item = _item;
+                ic.flags = IC_STRING;
+                fi = (ini_cache __HUGE__ *)foundi;
+                if((foundv=la_Find(fi->v.leaf,&ic,__full_compare_cache))!=NULL)
+diff -Naurp biew-562-orig/biewlib/sysdep/ia16/cmn_ix86.c biew-562/biewlib/sysdep/ia16/cmn_ix86.c
+--- biew-562-orig/biewlib/sysdep/ia16/cmn_ix86.c	2006-08-12 21:56:49.000000000 +0200
++++ biew-562/biewlib/sysdep/ia16/cmn_ix86.c	2006-08-13 12:01:32.000000000 +0200
+@@ -47,7 +47,7 @@ static unsigned long __NEAR__ __FASTCALL
+   ctrl_arr = c_arr;
+   /* align pointer on 16-byte boundary */
+ 
+-  if((tUInt32)ctrl_arr & 15) ((tUInt32)ctrl_arr) += 16-((tUInt32)ctrl_arr&15);
++  if((tUInt32)ctrl_arr & 15) ctrl_arr += 16-((tUInt32)ctrl_arr&15);
+ 
+   memset(ctrl_arr,0,sizeof(ctrl_arr));
+   if(time_interval)
+diff -Naurp biew-562-orig/biewlib/sysdep/ia32/aclib_template.c biew-562/biewlib/sysdep/ia32/aclib_template.c
+--- biew-562-orig/biewlib/sysdep/ia32/aclib_template.c	2006-08-12 21:56:49.000000000 +0200
++++ biew-562/biewlib/sysdep/ia32/aclib_template.c	2006-08-13 12:03:54.000000000 +0200
+@@ -159,8 +159,8 @@ static void * RENAME(fast_memcpy)(void *
+ 		"movntps %%xmm2, 32(%1)\n"
+ 		"movntps %%xmm3, 48(%1)\n"
+ 		:: "r" (from), "r" (to) : "memory");
+-		((const unsigned char *)from)+=64;
+-		((unsigned char *)to)+=64;
++		from += 64;
++		to += 64;
+ 	}
+ 	else
+ 	/*
+@@ -181,8 +181,8 @@ static void * RENAME(fast_memcpy)(void *
+ 		"movntps %%xmm2, 32(%1)\n"
+ 		"movntps %%xmm3, 48(%1)\n"
+ 		:: "r" (from), "r" (to) : "memory");
+-		((const unsigned char *)from)+=64;
+-		((unsigned char *)to)+=64;
++		from += 64;
++		to+=64;
+ 	}
+ #else
+ 	// Align destination at BLOCK_SIZE boundary
+@@ -209,8 +209,8 @@ static void * RENAME(fast_memcpy)(void *
+ 		MOVNTQ" %%mm6, 48(%1)\n"
+ 		MOVNTQ" %%mm7, 56(%1)\n"
+ 		:: "r" (from), "r" (to) : "memory");
+-		((const unsigned char *)from)+=64;
+-		((unsigned char *)to)+=64;
++		from+=64;
++		to+=64;
+ 	}
+ 
+ 	// Pure Assembly cuz gcc is a bit unpredictable ;)
+@@ -297,8 +297,8 @@ static void * RENAME(fast_memcpy)(void *
+ 		MOVNTQ" %%mm6, 48(%1)\n"
+ 		MOVNTQ" %%mm7, 56(%1)\n"
+ 		:: "r" (from), "r" (to) : "memory");
+-		((const unsigned char *)from)+=64;
+-		((unsigned char *)to)+=64;
++		from+=64;
++		to+=64;
+ 	}
+ 
+ #endif /* Have SSE */
+@@ -367,7 +367,7 @@ static void * RENAME(fast_memset)(void *
+ 		"movntps %%xmm0, 96(%0)\n"
+ 		"movntps %%xmm0, 112(%0)\n"
+ 		:: "r" (to) : "memory");
+-		((unsigned char *)to)+=128;
++		to+=128;
+ 	}
+ #else
+ 	__asm__ __volatile__(
+@@ -393,7 +393,7 @@ static void * RENAME(fast_memset)(void *
+ 		MOVNTQ" %%mm0, 112(%0)\n"
+ 		MOVNTQ" %%mm0, 120(%0)\n"
+ 		:: "r" (to) : "memory");
+-		((unsigned char *)to)+=128;
++		to+=128;
+ 	}
+ #endif /* Have SSE */
+ #ifdef HAVE_MMX2
+diff -Naurp biew-562-orig/biewlib/tw_class.c biew-562/biewlib/tw_class.c
+--- biew-562-orig/biewlib/tw_class.c	2006-08-12 21:56:50.000000000 +0200
++++ biew-562/biewlib/tw_class.c	2006-08-13 12:01:32.000000000 +0200
+@@ -71,6 +71,6 @@ void __FASTCALL__ twcDestroyClassSet(voi
+ TwClass * __FASTCALL__ twcFindClass(const char *name)
+ {
+  TwClass key;
+- (const char *)(key.name) = name;
++ key.name = name;
+  return (TwClass *)la_Find(class_set,&key, comp_class);
+ }
+diff -Naurp biew-562-orig/biewlib/twin.c biew-562/biewlib/twin.c
+--- biew-562-orig/biewlib/twin.c	2006-08-12 21:56:50.000000000 +0200
++++ biew-562/biewlib/twin.c	2006-08-13 12:01:32.000000000 +0200
+@@ -1891,9 +1891,9 @@ int __FASTCALL__ twPutS(const char *str)
+        strcpy(__nls,str);
+        __nls_OemToOsdep((unsigned char *)__nls,len);
+      }
+-     else (const char *)__nls = str;
++     else __nls = str;
+   }
+-  else (const char *)__nls = str;
++  else __nls = str;
+   __nls_ptr = __nls;
+   __oem_ptr = str;
+   vidx = active->cur_x + active->cur_y*active->wwidth;