Fixed amule and pgadmin3 crash while using broken wxGTK-2.6.2 with unicode support...

Package-Manager: portage-2.0.53_rc7

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 4355131ac6cf03f76d4776a12e6457d736e09c0e..9fcc0b9b76d85407fe7f58a8328c77cee387ebd4 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.94 2005/10/15 19:35:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.95 2005/11/26 17:32:08 sekretarz Exp $
+
+*wxGTK-2.6.2-r1 (26 Nov 2005)
+
+  26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> +files/intl.cpp.diff,
+  wxGTK-2.6.2.ebuild, +wxGTK-2.6.2-r1.ebuild:
+  Fixed amule and pgadmin3 crash while using broken wxGTK-2.6.2 with unicode
+  support, bug #109483 and #109218
 
   15 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   wxGTK-2.6.2.ebuild:

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 2dac22be82078c0c1a0f1feb39dc676204de537b..371a267a58468f3acb66b25816e4c373681b764c 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,13 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9993d84e63445b5aac164e43463c6817 ChangeLog 15006
+MD5 57a8a08627f7e44983f126aea59fc511 ChangeLog 15271
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
 MD5 d3163f84f4f7dbabab06613667542f9b files/digest-wxGTK-2.5.3 65
 MD5 c8ab55f4ce498e00d800d420ba86ea08 files/digest-wxGTK-2.6.0-r1 143
 MD5 ddd05c3f9a18148cc4359579d4ad8a8a files/digest-wxGTK-2.6.1 143
 MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2 143
+MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2-r1 143
+MD5 b6791baa55fc6dd087489f4a917c7758 files/intl.cpp.diff 1274
 MD5 574b30817d120dcaf7e94832c64b003a files/wxGTK-2.4.1-contrib.patch 572
 MD5 522f6b3a771ea33a1af7ede9c795ab4c files/wxGTK-2.4.1-wxpython1.patch 1102
 MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
@@ -20,11 +22,12 @@ MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733
 MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
 MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273
 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922
-MD5 53867162494521159243b3dc55df6da6 wxGTK-2.6.2.ebuild 1454
+MD5 7a7a6e86253922af888b557dd6c92be9 wxGTK-2.6.2-r1.ebuild 1534
+MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDUVolOpjtAl+gMRURAu9eAJ9jizi1ZPWDZurfPnnZsDO+uhK29wCguLyU
-MwzfGQzbMVR8PDqXmzGlRrg=
-=TuFe
+iD8DBQFDiKt0Z/iYVBmujdURAk2wAKDCtDgtIY37DYeJgF1cPlhS1X3ENACg6s9l
+JXB7QxnNM3WJk3zsJlWpyJc=
+=GzJo
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1
new file mode 100644 (file)
index 0000000..a78f07f
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.2-r1
@@ -0,0 +1,2 @@
+MD5 1e2bbd9d858c426ae667b017d8bdd4f6 wxWidgets-2.6.2-HTML.tar.gz 1440455
+MD5 ee0aa211febd992c8540e6c9df749b51 wxWidgets-2.6.2.tar.bz2 13060077

diff --git a/x11-libs/wxGTK/files/intl.cpp.diff b/x11-libs/wxGTK/files/intl.cpp.diff
new file mode 100644 (file)
index 0000000..1e64b18
--- /dev/null
+++ b/x11-libs/wxGTK/files/intl.cpp.diff
@@ -0,0 +1,33 @@
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
+retrieving revision 1.166
+retrieving revision 1.166.2.1
+diff -u -r1.166 -r1.166.2.1
+--- src/common/intl.cpp        2005/09/18 23:38:06     1.166
++++ src/common/intl.cpp        2005/09/28 09:48:03     1.166.2.1
+@@ -5,7 +5,7 @@
+ // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
+ //              (2003/09/30 - PluralForms support)
+ // Created:     29/01/98
+-// RCS-ID:      $Id: intl.cpp.diff,v 1.1 2005/11/26 17:32:08 sekretarz Exp $
++// RCS-ID:      $Id: intl.cpp.diff,v 1.1 2005/11/26 17:32:08 sekretarz Exp $
+ // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+ // Licence:     wxWindows licence
+ /////////////////////////////////////////////////////////////////////////////
+@@ -1260,9 +1260,14 @@
+             inputConv =
+             csConv = new wxCSConv(m_charset);
+     }
+-    else // no conversion needed
++    else // no need to convert the encoding
+     {
++        // we still need the conversion for Unicode build
++#if wxUSE_UNICODE
++        inputConv = wxConvCurrent;
++#else // !wxUSE_UNICODE
+         inputConv = NULL;
++#endif
+     }
+ 
+     // conversion to apply to msgid strings before looking them up: we only
+

diff --git a/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
new file mode 100644 (file)
index 0000000..33ae6c9
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2-r1.ebuild,v 1.1 2005/11/26 17:32:08 sekretarz Exp $
+
+inherit wxlib gnuconfig
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit and
+wxbase non-gui library"
+
+SLOT="2.6"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome joystick odbc opengl sdl X"
+RDEPEND="${RDEPEND}
+       opengl? ( virtual/opengl )
+       >=x11-libs/gtk+-2.0
+       >=dev-libs/glib-2.0
+       media-libs/tiff
+       odbc? ( dev-db/unixODBC )
+       !mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )"
+
+DEPEND="${RDEPEND}
+       ${DEPEND}
+       dev-util/pkgconfig"
+S=${WORKDIR}/wxWidgets-${PV}
+
+pkg_setup() {
+       einfo "To install only wxbase (non-gui libs) use USE=-X"
+}
+
+src_unpack() {
+               unpack ${A}
+               cd ${S}
+
+               epatch ${FILESDIR}/intl.cpp.diff
+}
+
+src_compile() {
+       gnuconfig_update
+       myconf="${myconf}
+               --with-png
+               --with-jpeg
+               --with-tiff
+               $(use_enable opengl)
+               $(use_with opengl)
+               $(use_with gnome gnomeprint)
+               $(use_with sdl)
+               $(use_enable joystick)"
+
+       use X && configure_build gtk2 unicode "${myconf} --with-gtk=2"
+       use X || configure_build base unicode "--disable-gui"
+}
+
+src_install() {
+       use X && install_build gtk2
+       use X || install_build base
+
+       wxlib_src_install
+}
+
+pkg_postinst() {
+       einfo "dev-libs/wxbase has been removed from portage and can be"
+       einfo "installed with wxGTK by specifying the USE flags"
+       einfo "-X"
+}

diff --git a/x11-libs/wxGTK/wxGTK-2.6.2.ebuild b/x11-libs/wxGTK/wxGTK-2.6.2.ebuild
index d67af22637d79a3eefdb02dae4170ec530018dd2..83d02a758ff240b70ce2eb5b0ed81e60632573b5 100644 (file)
--- a/x11-libs/wxGTK/wxGTK-2.6.2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2.ebuild,v 1.2 2005/10/15 19:35:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.2.ebuild,v 1.3 2005/11/26 17:32:08 sekretarz Exp $
 
 inherit wxlib gnuconfig
 
@@ -27,6 +27,13 @@ pkg_setup() {
        einfo "To install only wxbase (non-gui libs) use USE=-X"
 }
 
+src_unpack() {
+               unpack ${A}
+               cd ${S}
+
+               epatch ${FILESDIR}/intl.cpp.diff
+}
+
 src_compile() {
        gnuconfig_update
        myconf="${myconf}