2.6.1-r1 revision bump with patch for bug 105189. Fixes undefined symbol: pango_x_get_context problem.

Package-Manager: portage-2.0.54

6 files changed, 114 insertions, 4 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f6e16fc9354d..9ed8a872bfed 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.99 2006/01/22 03:09:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.100 2006/01/26 20:34:24 vanquirius Exp $
+
+*wxGTK-2.6.1-r1 (26 Jan 2006)
+
+  26 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/wxGTK-2.6.1-windowcpp.diff, +wxGTK-2.6.1-r1.ebuild:
+  2.6.1-r1 revision bump with patch for bug 105189. Fixes undefined symbol:
+  pango_x_get_context problem. Thanks to Alex Rostovtsev <tetromino at gmail
+  dot com>, Mart Raudsepp <leioat dustbite dot net>, Sander Sweers
+  <Sander.Sweers at gmail dot com> and others.
 
   22 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>;
   wxGTK-2.4.2-r4.ebuild:
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 2929bdc1ab41..253ef7d4300f 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,10 +1,11 @@
-MD5 249050a60008d3afa156e7d4ac863e60 ChangeLog 15786
+MD5 0d3e1a94dbb3d5d0daedd55b34c2f0b1 ChangeLog 16200
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r2 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r3 65
 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r4 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 06af19e58230a2522d69be12f667feeb files/digest-wxGTK-2.6.1 143
+MD5 06af19e58230a2522d69be12f667feeb files/digest-wxGTK-2.6.1-r1 143
 MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2 143
 MD5 697d7fa6ade210b6af8747e4cc5816cf files/digest-wxGTK-2.6.2-r1 143
 MD5 b0a51d86a603a6aa6b8447cd7ad8cc9b files/intl.cpp.diff 581
@@ -15,6 +16,7 @@ MD5 6c8af85a3bfec0c477a778258368de56 files/wxGTK-2.4.2-cleanup.patch 18162
 MD5 798d3d05c7adb28f00834aa4ea1f304b files/wxGTK-2.4.2-contrib_animate.patch 442
 MD5 f3bc3ab73cb31c91683e3ed58f8ffabb files/wxGTK-2.4.2-menu.cpp.patch 2253
 MD5 568639b28866f0c708c091d2e28f982e files/wxGTK-2.4.2-pango_fix.patch 618
+MD5 c3c62ee98a766258cba534c13104010a files/wxGTK-2.6.1-windowcpp.diff 568
 MD5 a7173de92807f66492cda98731156932 files/wxWidgets-2.6.2-gcc41.patch 559
 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249
@@ -22,6 +24,7 @@ MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733
 MD5 db521265c417bb0d2b3649310a19f2cc wxGTK-2.4.2-r4.ebuild 4827
 MD5 b8d2d1196e6c7f31335748286b926533 wxGTK-2.5.3.ebuild 4812
 MD5 b2544e112108097113205b4559e87ce7 wxGTK-2.6.0-r1.ebuild 2273
+MD5 0194daba237d437afdcd8de1b97f53b4 wxGTK-2.6.1-r1.ebuild 2046
 MD5 56de842cb982e2aeb27abbfe3cb3d2ff wxGTK-2.6.1.ebuild 1922
 MD5 fff55dd575a0f802b5891f02372bee3a wxGTK-2.6.2-r1.ebuild 1575
 MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
index 67363e9d1b44..d6db8b2302c3 100644
--- a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1
@@ -1,2 +1,2 @@
-MD5 045f0edad0988620a4aa36096bb16e28 wxWidgets-2.6.1.tar.bz2 12649487
 MD5 e05d64b92ba352cad4417b75082bc2be wxWidgets-2.6.1-HTML.tar.gz 1437702
+MD5 045f0edad0988620a4aa36096bb16e28 wxWidgets-2.6.1.tar.bz2 12649487
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.6.1-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1-r1
new file mode 100644
index 000000000000..d6db8b2302c3
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.6.1-r1
@@ -0,0 +1,2 @@
+MD5 e05d64b92ba352cad4417b75082bc2be wxWidgets-2.6.1-HTML.tar.gz 1437702
+MD5 045f0edad0988620a4aa36096bb16e28 wxWidgets-2.6.1.tar.bz2 12649487
diff --git a/x11-libs/wxGTK/files/wxGTK-2.6.1-windowcpp.diff b/x11-libs/wxGTK/files/wxGTK-2.6.1-windowcpp.diff
new file mode 100644
index 000000000000..e3c14d613041
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.6.1-windowcpp.diff
@@ -0,0 +1,17 @@
+--- wxWidgets-2.6.1.orig/src/gtk/window.cpp	2006-01-26 17:29:21.000000000 -0200
++++ wxWidgets-2.6.1/src/gtk/window.cpp	2006-01-26 17:30:21.000000000 -0200
+@@ -4279,12 +4279,10 @@
+     return gtk_widget_get_pango_context( m_widget );
+ }
+ 
++// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x
+ PangoContext *wxWindowGTK::GtkGetPangoX11Context()
+ {
+-    if (!m_x11Context)
+-        m_x11Context = pango_x_get_context( gdk_display );
+-
+-    return m_x11Context;
++    return gtk_widget_get_pango_context( m_widget );
+ }
+ #endif
+  
diff --git a/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..0fa00184065a
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.1-r1.ebuild,v 1.1 2006/01/26 20:34:24 vanquirius 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 gtk2 joystick odbc opengl sdl wxgtk1"
+RDEPEND="${RDEPEND}
+	opengl? ( virtual/opengl )
+	gtk2? ( >=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0 )
+	wxgtk1? ( =x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2* )
+	wxgtk1? ( gtk2? ( media-libs/libpng
+		media-libs/jpeg
+		media-libs/tiff ) )
+	odbc? ( dev-db/unixODBC )
+	!mips? ( !arm? ( !hppa? ( !ia64? ( !ppc64? ( !alpha? ( !sparc? ( sdl? ( media-libs/sdl-sound ) ) ) ) ) ) ) )"
+
+DEPEND="${RDEPEND}
+	${DEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+S="${WORKDIR}/wxWidgets-${PV}"
+
+pkg_setup() {
+	einfo "To install only wxbase (non-gui libs) use -gtk2 -wxgtk1"
+	if use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# bug 105189 - upstream in 2.6.2
+	epatch "${FILESDIR}"/${P}-windowcpp.diff
+}
+
+src_compile() {
+	gnuconfig_update
+	if use wxgtk1 || use gtk2; then
+		myconf="${myconf}
+			--with-png
+			--with-jpeg
+			--with-tiff
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)
+			$(use_with sdl)
+			$(use_enable joystick)"
+	fi
+
+	use wxgtk1 && \
+		configure_build gtk1 "" "${myconf} --with-gtk=1"
+
+	use gtk2 && \
+		configure_build gtk2 unicode "${myconf} --with-gtk=2"
+
+	! use gtk2 && ! use wxgtk1 && \
+		configure_build base unicode "--disable-gui"
+}
+
+src_install() {
+	use wxgtk1 && install_build gtk1
+	use gtk2 && install_build gtk2
+	! use gtk2 && ! use wxgtk1 && 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 "-gtk2 and -wxgtk1"
+}