Fixed linking problems with pango, bug #113410

(Portage version: 2.0.53_rc7)

5 files changed, 178 insertions, 12 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 1a225326d949..b6ef53e1ffdf 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,10 @@
 # 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.96 2005/11/26 18:39:50 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.97 2005/11/26 20:02:59 sekretarz Exp $
+
+  26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/wxGTK-2.4.2-pango_fix.patch, +wxGTK-2.4.2-r4.ebuild:
+  Fixed linking problems with pango, bug #113410
 
   26 Nov 2005; Karol Wojtaszek <sekretarz@gentoo.org> files/intl.cpp.diff:
   Fixed unicode patch not to expand cvs tag
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index cfac8d86cfd4..b33dec854afe 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 28a2ebe75ed70b9286468ac45968d1b4 ChangeLog 15391
+MD5 73b952b158f6e02116130e717845ba31 ChangeLog 15557
 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
@@ -16,18 +14,13 @@ MD5 1e85c1c970da32626580dfef7228b314 files/wxGTK-2.4.1-wxpython2.patch 8459
 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 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162
 MD5 62be82618a657fca19a51e0825e5e4e9 wxGTK-2.4.2-r2.ebuild 4249
 MD5 58a128b966a8c93bd4b1fbef17e044ed wxGTK-2.4.2-r3.ebuild 4733
+MD5 5db76a5261bbd067428fd263ca64c67f wxGTK-2.4.2-r4.ebuild 4838
 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 7a7a6e86253922af888b557dd6c92be9 wxGTK-2.6.2-r1.ebuild 1534
 MD5 5160fec1fb87f760b1cd6cc0a25860b8 wxGTK-2.6.2.ebuild 1531
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDiLtSZ/iYVBmujdURAnypAJ4+KpQn1x4rqmAM2VmPsPfc3QA1VQCbB9HW
-UWdS7tJ6MmDISkBhX1mDZ9k=
-=svQg
------END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
new file mode 100644
index 000000000000..81bb0e836695
--- /dev/null
+++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r4
@@ -0,0 +1 @@
+MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935
diff --git a/x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch b/x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch
new file mode 100644
index 000000000000..2cec83f7f3a1
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.4.2-pango_fix.patch
@@ -0,0 +1,14 @@
+--- wx-config.in.orig	2003-09-21 18:31:27.000000000 +0700
++++ wx-config.in	2005-11-24 04:56:18.313149073 +0600
+@@ -145,9 +145,9 @@
+       fi
+ 
+       if test $static_flag = yes ; then
+-          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
++          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@ -lpangox-1.0 "
+       else
+-          echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
++          echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ -lpangox-1.0 "
+       fi
+ 
+       ;;
diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
new file mode 100644
index 000000000000..f2a8f8d42c18
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.4.2-r4.ebuild
@@ -0,0 +1,154 @@
+# 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.4.2-r4.ebuild,v 1.4 2005/11/26 20:02:59 sekretarz Exp $
+
+inherit flag-o-matic eutils gnuconfig multilib toolchain-funcs
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://www.wxwidgets.org/"
+SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2"
+
+LICENSE="wxWinLL-3"
+SLOT="2.4"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="debug wxgtk1 gtk2 odbc opengl unicode"
+
+RDEPEND="virtual/x11
+	sys-libs/zlib
+	media-libs/libpng
+	media-libs/jpeg
+	media-libs/tiff
+	!unicode? ( odbc? ( dev-db/unixODBC ) )
+	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* )"
+DEPEND="${RDEPEND}
+	gtk2? ( dev-util/pkgconfig )"
+
+# Note 1: Gettext is not runtime dependency even if nls? because wxWidgets
+#         has its own implementation of it
+# Note 2: PCX support is enabled if the correct libraries are detected.
+#         There is no USE flag for this.
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PN}-2.4.2-menu.cpp.patch || \
+		die "Failed to patch menu.cpp"
+	# fix xml contrib makefile problems
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.patch
+
+	# fix pango_x_get_context stuff
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-pango_fix.patch
+
+	# disable contrib/src/animate
+	EPATCH_OPTS="-d ${S}/contrib/src" epatch ${FILESDIR}/${PN}-2.4.2-contrib_animate.patch
+	use amd64 && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.2-cleanup.patch
+	gnuconfig_update
+}
+
+pkg_setup() {
+	einfo "New in >=wxGTK-2.4.2-r2:"
+	einfo "------------------------"
+	einfo "You can now have gtk, gtk2 and unicode versions installed"
+	einfo "simultaneously. Use wxgtk1 if you would like a gtk1 lib."
+	einfo "Put gtk2 and unicode in your USE flags to get those"
+	einfo "additional versions."
+	einfo "NOTE:"
+	einfo "You can also get debug versions of any of those, but not debug"
+	einfo "and normal installed at the same time."
+	if  use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
+	fi
+	if ! use wxgtk1 && ! use gtk2; then
+		die "You must have at least gtk2 or wxgtk1 in your USE"
+	fi
+}
+
+src_compile() {
+	local myconf
+	export LANG='C'
+	filter-flags -fvisibility-inlines-hidden
+	myconf="${myconf} `use_with opengl`"
+	myconf="${myconf} --with-gtk"
+	myconf="${myconf} `use_enable debug`"
+	myconf="${myconf} --libdir=/usr/$(get_libdir)"
+
+	if use wxgtk1 ; then
+		mkdir build_gtk
+		einfo "Building gtk version"
+		cd build_gtk
+		../configure ${myconf} `use_with odbc`\
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk failed"
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk contrib failed"
+	fi
+	cd ${S}
+
+	if use gtk2 ; then
+		myconf="${myconf} --enable-gtk2"
+		einfo "Building gtk2 version"
+		mkdir build_gtk2
+		cd build_gtk2
+		../configure ${myconf} `use_with odbc` \
+			--host=${CHOST} \
+			--prefix=/usr \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man || die "./configure failed"
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 failed"
+		cd contrib/src
+		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make gtk2 contrib failed"
+
+		cd ${S}
+
+		if use unicode ; then
+			myconf="${myconf} --enable-unicode"
+			einfo "Building unicode version"
+			mkdir build_unicode
+			cd build_unicode
+			../configure ${myconf} \
+				--host=${CHOST} \
+				--prefix=/usr \
+				--infodir=/usr/share/info \
+				--mandir=/usr/share/man || die "./configure failed"
+
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode failed"
+
+			cd contrib/src
+			emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" || die "make unicode contrib failed"
+		fi
+	fi
+}
+
+src_install() {
+	if [ -e ${S}/build_gtk ] ; then
+		cd ${S}/build_gtk
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk contrib failed"
+	fi
+
+	if [ -e ${S}/build_gtk2 ] ; then
+		cd ${S}/build_gtk2
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install gtk2 contrib failed"
+	fi
+
+	if [ -e ${S}/build_unicode ] ; then
+		cd ${S}/build_unicode
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode failed"
+		cd contrib/src
+		einstall libdir="${D}/usr/$(get_libdir)" || die "install unicode contrib failed"
+	fi
+
+	# twp 20040830 wxGTK-2.4.2 forgets to install htmlproc.h; copy it manually
+	insinto /usr/include/wx/html
+	doins ${S}/include/wx/html/htmlproc.h
+
+	cd ${S}
+	dodoc *.txt
+}