From: Marius Mauch <genone@gentoo.org>
Date: Sun, 8 Oct 2006 17:39:42 +0000 (+0000)
Subject: fix gcc-4.1 -Werror bug #148861
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=063373b979f1e0191e65edc83de42a90a1f6268d;p=gentoo.git

fix gcc-4.1 -Werror bug #148861
Package-Manager: portage-2.1.2_pre2-r6
---

diff --git a/app-editors/zoinks/ChangeLog b/app-editors/zoinks/ChangeLog
index 86698099d124..e97b6d2e1088 100644
--- a/app-editors/zoinks/ChangeLog
+++ b/app-editors/zoinks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/zoinks
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/ChangeLog,v 1.14 2006/01/22 20:56:18 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/ChangeLog,v 1.15 2006/10/08 17:39:42 genone Exp $
+
+  08 Oct 2006; Marius Mauch <genone@gentoo.org>
+  +files/zoinks-0.4.0-gcc-4.1-fix.diff, zoinks-0.4.0.ebuild:
+  fix gcc-4.1 -Werror bug #148861
 
 *zoinks-0.4.0 (22 Jan 2006)
 
diff --git a/app-editors/zoinks/Manifest b/app-editors/zoinks/Manifest
index 7cfdc74627fb..54861935e785 100644
--- a/app-editors/zoinks/Manifest
+++ b/app-editors/zoinks/Manifest
@@ -1,31 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a2f3920fb21c978a96902c7b4960d995 ChangeLog 1729
-RMD160 4fa365aeab001f24fd2f160626f222e3f220ae5d ChangeLog 1729
-SHA256 adcb94321579fdbdd6eb6cafc71042de2d820b395ac3003b4fb0f5354f165601 ChangeLog 1729
-MD5 1af095ae3adb70486d47e435646e985a files/digest-zoinks-0.3.8-r1 64
-RMD160 74ea472a69e4cfcc75bf022567cc0daa91933da5 files/digest-zoinks-0.3.8-r1 64
-SHA256 78310db6b09f8bd62d3b9c917729a3305a1a9b0f67d22013e190cf2cafcb9691 files/digest-zoinks-0.3.8-r1 64
-MD5 a8d22e5a94c6c6821ff0ec243c387016 files/digest-zoinks-0.4.0 64
-RMD160 667500cf346cabde5ae14b399d44abdc50661d40 files/digest-zoinks-0.4.0 64
-SHA256 22e8976c193e47936ff0f0754c75ffffb1e51a2368d4eed129401480700d7d3a files/digest-zoinks-0.4.0 64
+AUX xorg-library-configure.patch 296 RMD160 66131f0e2750c7dd1f9c9b6e6819b55cb12c8935 SHA1 8cfa0d3f6ca83974ee1757372a0f6a281d04d9af SHA256 922bc3fb3cbb7d84ddcc12eaf4c552a899b2c0677386e834f13acd418eb20107
 MD5 cb151c338962b02771f14ab6cd7cfda6 files/xorg-library-configure.patch 296
 RMD160 66131f0e2750c7dd1f9c9b6e6819b55cb12c8935 files/xorg-library-configure.patch 296
 SHA256 922bc3fb3cbb7d84ddcc12eaf4c552a899b2c0677386e834f13acd418eb20107 files/xorg-library-configure.patch 296
-MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
-RMD160 acb779723f771dc3d4e5342e21a12aea251ce9e7 metadata.xml 222
-SHA256 eb03ba63a8cd1782c6fd05ce15d3fb240f6c2755f91c9cc818fdff8b30c0ed97 metadata.xml 222
+AUX zoinks-0.4.0-gcc-4.1-fix.diff 471 RMD160 dfc3168b881bceb056d84b5c77e3429ffad29973 SHA1 01aa0e835e1dce500999f7229775954c9abe8680 SHA256 f0889ff98f06f8ce96047d024383152e322af46e59d2a7e69bbac83a208b7aa2
+MD5 350356726ce5b9e60087e081e4a20f8e files/zoinks-0.4.0-gcc-4.1-fix.diff 471
+RMD160 dfc3168b881bceb056d84b5c77e3429ffad29973 files/zoinks-0.4.0-gcc-4.1-fix.diff 471
+SHA256 f0889ff98f06f8ce96047d024383152e322af46e59d2a7e69bbac83a208b7aa2 files/zoinks-0.4.0-gcc-4.1-fix.diff 471
+DIST zoinks-0.3.8.tar.gz 330651
+DIST zoinks-0.4.0.tar.gz 334308 RMD160 3fa45e1bce45c5578d6231fc8d86f39d0dfe2c5c SHA1 37356d19a95ab1a5de5529b0f230a5be3ed0b5f1 SHA256 5b65e9b6c562be6c494d734a3b9f889d626fccc856dd51580389e64b7006deef
+EBUILD zoinks-0.3.8-r1.ebuild 888 RMD160 7c51852474de2386a34e5b22e9af68bff09336cd SHA1 7cba44efcbda8cc484719904354ef5ba04c7dde4 SHA256 a3b4d62cf4ca71b9e485357ff825df83c4b9e601a5df4d9b302e79d0968ed584
 MD5 dcc51bb15b01d7229e43f806c1f461d8 zoinks-0.3.8-r1.ebuild 888
 RMD160 7c51852474de2386a34e5b22e9af68bff09336cd zoinks-0.3.8-r1.ebuild 888
 SHA256 a3b4d62cf4ca71b9e485357ff825df83c4b9e601a5df4d9b302e79d0968ed584 zoinks-0.3.8-r1.ebuild 888
-MD5 e8a0bd9eed4138c6372ca2addc2f53a2 zoinks-0.4.0.ebuild 839
-RMD160 e8879ca7bcfc7805dc5b5fabd54a16c8b15ead20 zoinks-0.4.0.ebuild 839
-SHA256 f3f024a56b5126c70c23d904508cd1c4850d6a42e943d178359bc927b5f87ea1 zoinks-0.4.0.ebuild 839
+EBUILD zoinks-0.4.0.ebuild 912 RMD160 34ed90ce2b805410fd9874a3ddc5705d813b3330 SHA1 3cd7d4fe4b8b7382624eae0e8cfc8e0a8da3d63a SHA256 4a3111ae8e3cd64b62516ce7ca1b85a1601139fe6369eafbaa738b5fae8a808d
+MD5 a8f7a930ddcb5259a7e00c94d95b355c zoinks-0.4.0.ebuild 912
+RMD160 34ed90ce2b805410fd9874a3ddc5705d813b3330 zoinks-0.4.0.ebuild 912
+SHA256 4a3111ae8e3cd64b62516ce7ca1b85a1601139fe6369eafbaa738b5fae8a808d zoinks-0.4.0.ebuild 912
+MISC ChangeLog 1873 RMD160 6c1815069ae137c4620779f9fa1c9d03a37b33e7 SHA1 7f3a8f2881c087a68ff62dffdb878b8891d79376 SHA256 69c151194741cfd2358cab4775d0e438a0037e8ac5e2e561b3c0f81bfc8243e0
+MD5 324a77dc048340f7ce33c749cba0e12a ChangeLog 1873
+RMD160 6c1815069ae137c4620779f9fa1c9d03a37b33e7 ChangeLog 1873
+SHA256 69c151194741cfd2358cab4775d0e438a0037e8ac5e2e561b3c0f81bfc8243e0 ChangeLog 1873
+MISC metadata.xml 222 RMD160 acb779723f771dc3d4e5342e21a12aea251ce9e7 SHA1 4ea78b62f3093848c2ee5a72d51dacf569c5fccf SHA256 eb03ba63a8cd1782c6fd05ce15d3fb240f6c2755f91c9cc818fdff8b30c0ed97
+MD5 622720c5c5e309d4457ff037f8a4175f metadata.xml 222
+RMD160 acb779723f771dc3d4e5342e21a12aea251ce9e7 metadata.xml 222
+SHA256 eb03ba63a8cd1782c6fd05ce15d3fb240f6c2755f91c9cc818fdff8b30c0ed97 metadata.xml 222
+MD5 1af095ae3adb70486d47e435646e985a files/digest-zoinks-0.3.8-r1 64
+RMD160 74ea472a69e4cfcc75bf022567cc0daa91933da5 files/digest-zoinks-0.3.8-r1 64
+SHA256 78310db6b09f8bd62d3b9c917729a3305a1a9b0f67d22013e190cf2cafcb9691 files/digest-zoinks-0.3.8-r1 64
+MD5 1e14e96969b7410ee5c9894ea977ae7d files/digest-zoinks-0.4.0 238
+RMD160 2719b3c3602cb34e5b2280c6b17dc9feadb0b2b2 files/digest-zoinks-0.4.0 238
+SHA256 77ac046b1315bf808d4635020631b920984de5e4a1e945c249dd8acb294eb962 files/digest-zoinks-0.4.0 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFD1AEV6J2i8a8J4okRAg7lAKCx5tVaTZYmPCTjgFLLCeyFSyXirQCggNhd
-UGQEnWkoxspsfUWgitT0sdA=
-=qC0e
+iD8DBQFFKTll6J2i8a8J4okRAi/NAJ9f50F1D0BQfoI77Zo51GutZdfx5ACfceBW
+VOk1fNSl5Nt+GaWj1aXsbis=
+=aGgu
 -----END PGP SIGNATURE-----
diff --git a/app-editors/zoinks/files/digest-zoinks-0.4.0 b/app-editors/zoinks/files/digest-zoinks-0.4.0
index d4f9d33c07a9..6663c1b3147e 100644
--- a/app-editors/zoinks/files/digest-zoinks-0.4.0
+++ b/app-editors/zoinks/files/digest-zoinks-0.4.0
@@ -1 +1,3 @@
 MD5 e6f5b77f54003f7c2019b0463776cee0 zoinks-0.4.0.tar.gz 334308
+RMD160 3fa45e1bce45c5578d6231fc8d86f39d0dfe2c5c zoinks-0.4.0.tar.gz 334308
+SHA256 5b65e9b6c562be6c494d734a3b9f889d626fccc856dd51580389e64b7006deef zoinks-0.4.0.tar.gz 334308
diff --git a/app-editors/zoinks/files/zoinks-0.4.0-gcc-4.1-fix.diff b/app-editors/zoinks/files/zoinks-0.4.0-gcc-4.1-fix.diff
new file mode 100644
index 000000000000..8cd2cc059346
--- /dev/null
+++ b/app-editors/zoinks/files/zoinks-0.4.0-gcc-4.1-fix.diff
@@ -0,0 +1,11 @@
+--- zoinks-0.4.0/fw/TTextView.cpp.org	2006-10-08 19:04:24.278148250 +0200
++++ zoinks-0.4.0/fw/TTextView.cpp	2006-10-08 19:04:51.283836000 +0200
+@@ -462,7 +462,7 @@
+ 		{
+ 			if (offset < fSelectionAnchor)
+ 			{
+-				selectionStart = selectionStart = fLayout->GetLineOffset(fLayout->OffsetToLine(offset));
++				selectionStart = fLayout->GetLineOffset(fLayout->OffsetToLine(offset));
+ 				selectionEnd = fSelectionAnchorEnd;
+ 			}
+ 			else if (offset > fSelectionAnchorEnd)
diff --git a/app-editors/zoinks/zoinks-0.4.0.ebuild b/app-editors/zoinks/zoinks-0.4.0.ebuild
index a2fc1951e77a..f3523904a3dd 100644
--- a/app-editors/zoinks/zoinks-0.4.0.ebuild
+++ b/app-editors/zoinks/zoinks-0.4.0.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/app-editors/zoinks/zoinks-0.4.0.ebuild,v 1.1 2006/01/22 20:56:18 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/zoinks-0.4.0.ebuild,v 1.2 2006/10/08 17:39:42 genone Exp $
 
 inherit eutils
 
@@ -21,6 +21,11 @@ DEPEND="nls? ( sys-devel/gettext )
 		x11-libs/libXt )
 		virtual/x11 )"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc-4.1-fix.diff
+}
+
 src_compile() {
 	econf \
 		`use_enable nls` \