Prevent crashes, bug #382033 by Nico R. Drop broken version.

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

4 files changed, 46 insertions, 10 deletions

diff --git a/dev-util/biew/ChangeLog b/dev-util/biew/ChangeLog
index c1cc1f2dde69..33ed997f564b 100644
--- a/dev-util/biew/ChangeLog
+++ b/dev-util/biew/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/biew
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.32 2011/12/28 08:08:40 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.33 2012/03/04 09:54:46 pacho Exp $
+
+*biew-6.1.0-r2 (04 Mar 2012)
+
+  04 Mar 2012; Pacho Ramos <pacho@gentoo.org> +biew-6.1.0-r2.ebuild,
+  +files/biew-610-crash.patch, -biew-6.1.0-r1.ebuild:
+  Prevent crashes, bug #382033 by Nico R. Drop broken version.
 
   28 Dec 2011; Michael Weber <xmw@gentoo.org> metadata.xml:
   taking maint
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
index c0286bda978a..918d766f1f6e 100644
--- a/dev-util/biew/Manifest
+++ b/dev-util/biew/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX biew-562-lvalue-casts.patch 5531 RMD160 fd994fa1c4104023b1644a5a8cb53adbafe4b7cf SHA1 b579bbfc6fb8e3a6d8e572e6dc5b16caf7597415 SHA256 1a9090cd036ee0c32d4e36a8db6fd10238e6011d0daf579041a3079912dad5c3
+AUX biew-610-crash.patch 1254 RMD160 22638c503f6e371e6fe5ee9d497443a4c31c5f0c SHA1 c3431ebe88ce4aba98c9459a976b1048b0251e27 SHA256 efa6a17d7d03a3a0bc15dab21df308c825b42de193a7f1bc89675786d69c65d9
 AUX biew-610-fix_localedep-1.patch 1003 RMD160 c8e02644c7b6f9d00aa0b013930b280f489af7bd SHA1 7d136a2179c254058b3fe04fb57e5127ac11af33 SHA256 094fd29bcfa683ae4fa449bf53d17fe53d9239806f1831e70bbecd75ec7996b3
 AUX biew-610-portable_configure-1.patch 4932 RMD160 5f8e0f5dd684e3dfbd1b9e34aef848fe5f602f7a SHA1 27cbc84d424f01cf99ca85ce1b9f4eba64460b88 SHA256 b306d264e94ae47ce843668aea5f59470cdbad81250a7de32858e02dc3cfc0e2
 DIST biew-610-src.tar.bz2 860517 RMD160 c728c8e165c2e16edcc4c25ddef063379b32049d SHA1 332b45580cdee134ee42c48bec652fcba96cd99a SHA256 2e85f03c908dd6ec832461fbfbc79169a33f4caccf48c8fe60cbd29f5fb06d17
 DIST biew562.tar.bz2 594367 RMD160 413f2c72a70056adbebd5e79d541201d6e3b27cb SHA1 44435c0815a59d38c9a6c74d09c0f495e71e23fe SHA256 82263fdd9f9854a9326889b8d4e138c0dba3f08460922d4683f659873313e46a
 EBUILD biew-5.6.2.ebuild 1555 RMD160 ad7c69643c772863741c8d18042b03043856a3f2 SHA1 6a5099cc03f7e54ee76ea2456d0e984ffaa32d79 SHA256 91590f47083f4d6d23761c79e22f719c4c1a9fd18104ab57906e19819525023f
-EBUILD biew-6.1.0-r1.ebuild 1716 RMD160 478d4c09868a0b81460e931c8d7a29b67a25a3ad SHA1 b32d011f822cc93124b4b36bcc87bf4e99d0740c SHA256 ec2abf8a7020d330adc8d72bde638247fcee1995615a901c7f301a7500088a55
-MISC ChangeLog 4795 RMD160 8639c4fee38497b3456a92e1ae93340646ceed1b SHA1 7e90a347fb2b1952bab4759cadbc4ae749be9125 SHA256 c620fca2e7efb0c21c1fa6fdf1580f1ae89d402a6ff8b6055481cd7fc1beb3a0
+EBUILD biew-6.1.0-r2.ebuild 1758 RMD160 c8d883cf901558da043c6b7835a68ec58fea088d SHA1 d5a222ea39ae2df7513d4125ae4fc74511f036cd SHA256 1e62bfa8834adee057c87fa62e95d21d7ed105e59625b506f974c7ba4ae08911
+MISC ChangeLog 5014 RMD160 bb393c58e23e7b4aa2ed02c490b6b80cca2d672c SHA1 2a45f89e85e9cdcd336409c18f0368c225c058bf SHA256 3fbd69c792b2aca6c58a6647cc64a6e5d2f4b12e1358fc4d67e93e60e410057d
 MISC metadata.xml 227 RMD160 f18bbfe82aaac18aef3c7e12941c8f53689fd242 SHA1 b288834b3bdad503a3ac014a0197b1e4415fe58f SHA256 fcb66e58430a86927d7db32c22b24050d6761fa06b8aef883ee15f2d8d8a17fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk76zo4ACgkQknrdDGLu8JDo/wD/c90GuRuMfwvTtds5ilQBNLFV
-VdNaKzkJezh5g5GMRG4A/RpeMcd05XlOLM6ZsCu6klo3YXr0DZfWEJPWsgFLIgeL
-=CS1i
+iEYEARECAAYFAk9TO+wACgkQCaWpQKGI+9QBUACePE22S3rnTc9KjBxFrQ+Uu1kE
+nzwAn3RDHSllY2Ybm+TiDPMcXBlwv70N
+=9J2G
 -----END PGP SIGNATURE-----
diff --git a/dev-util/biew/biew-6.1.0-r1.ebuild b/dev-util/biew/biew-6.1.0-r2.ebuild
index c1be1d2e9c40..7912e6029934 100644
--- a/dev-util/biew/biew-6.1.0-r1.ebuild
+++ b/dev-util/biew/biew-6.1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r1.ebuild,v 1.3 2011/04/05 15:30:44 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r2.ebuild,v 1.1 2012/03/04 09:54:46 pacho Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs versionator
@@ -28,6 +28,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-610-fix_localedep-1.patch"
 	epatch "${FILESDIR}/${PN}-610-portable_configure-1.patch"
+	epatch "${FILESDIR}/${PN}-610-crash.patch"
 	sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile || die "Failed to edit makefile."
 }
 
diff --git a/dev-util/biew/files/biew-610-crash.patch b/dev-util/biew/files/biew-610-crash.patch
new file mode 100644
index 000000000000..244f94a7ad53
--- /dev/null
+++ b/dev-util/biew/files/biew-610-crash.patch
@@ -0,0 +1,28 @@
+If .biewrc does not exist, the setup dialog appears at program start. If you try
+to click a checkbox with the mouse, biew tries to dereference a null pointer
+(because the MainWindow is not yet set).
+
+This patch adds a workaround. Note that you actually cannot click a checkbox.
+But that is what users might expect. (Maybe the biew code should be changed to
+handle this properly.) Well, it is better not to crash, even if the checkboxes
+are not clickable.
+
+ –nico
+
+
+diff -Naur biew-610.orig/events.c biew-610/events.c
+--- biew-610.orig/events.c	2009-09-03 16:57:40.000000000 +0000
++++ biew-610/events.c	2011-09-06 09:41:01.000000000 +0000
+@@ -118,7 +118,11 @@
+                     }
+                     else
+                     {
+-                      X1 = 0; X2 = twGetClientWidth(MainWnd); Y1 = 1; Y2 = twGetClientHeight(MainWnd) - 1;
++                      TWindow *wnd =
++                              MainWnd ? MainWnd :  /*XXX:drop this line?*/
++                              twGetWinAtPos(mx, my);
++                      if(!wnd) return KE_MOUSE;
++                      X1 = 0; X2 = twGetClientWidth(wnd); Y1 = 1; Y2 = twGetClientHeight(wnd) - 1;
+                     }
+                     wdh = X2 - X1;
+                     hght = Y2 - Y1;