From 368c159fd4c8c01450fe9b214dd89defe74efc79 Mon Sep 17 00:00:00 2001 From: Rob Cakebread Date: Wed, 23 Jun 2004 05:41:53 +0000 Subject: Disable unicode for gtk. Closes bug# 52495 --- x11-libs/wxGTK/ChangeLog | 7 ++- x11-libs/wxGTK/Manifest | 4 +- x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1 | 1 + x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild | 85 ++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1 create mode 100644 x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild (limited to 'x11-libs/wxGTK') diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 3bd0e1ffc258..0e1eeaf36b39 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.50 2004/06/23 03:41:33 pythonhead Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.51 2004/06/23 05:41:53 pythonhead Exp $ + +*wxGTK-2.4.2-r1 (22 Jun 2004) + + 22 Jun 2004; Rob Cakebread +wxGTK-2.4.2-r1.ebuild: + Disable unicode for gtk. Closes bug# 52495 22 Jun 2004; Rob Cakebread wxGTK-2.4.2.ebuild: Marked stable on x86 diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index f9b7bb00d761..e4b4ba05fd34 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -1,9 +1,10 @@ -MD5 a228faf094c6c8b9ee34e0b13c4bc998 ChangeLog 8687 +MD5 bde199dc893835aa8bada89f217d7192 ChangeLog 8841 MD5 4fca175f747a090fd2b7b8ce22fbc06d metadata.xml 162 MD5 dd40f4e0398ee262dcc21841066e7ad5 wxGTK-2.4.0.ebuild 2737 MD5 31a40c001a92ca965f115684ca5ecd6c wxGTK-2.4.1-r1.ebuild 2736 MD5 4ccd49442e177aba841cf88d7f1b6fde wxGTK-2.4.2.ebuild 2498 MD5 da02d941bf633b892b23bd369643247c wxGTK-2.5.1.ebuild 2130 +MD5 bb2eb846affe85b03adc15e339162e9e wxGTK-2.4.2-r1.ebuild 2662 MD5 16ea0622454512339b2c613af61a9aa4 files/digest-wxGTK-2.4.0 65 MD5 86ee1d94ec752953d445a824f643fef5 files/digest-wxGTK-2.4.1-r1 65 MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2 65 @@ -13,3 +14,4 @@ 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 3abee1465abb2d1d0275ad2b2adfd4ef files/digest-wxGTK-2.5.1 65 +MD5 5087298be841a84071ea67830f5d6a2b files/digest-wxGTK-2.4.2-r1 65 diff --git a/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1 b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1 new file mode 100644 index 000000000000..81bb0e836695 --- /dev/null +++ b/x11-libs/wxGTK/files/digest-wxGTK-2.4.2-r1 @@ -0,0 +1 @@ +MD5 cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2 5381935 diff --git a/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild new file mode 100644 index 000000000000..695e45cb827e --- /dev/null +++ b/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.2-r1.ebuild,v 1.1 2004/06/23 05:41:53 pythonhead Exp $ + +inherit eutils + +DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit." +HOMEPAGE="http://www.wxwindows.org/" +SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" + +LICENSE="wxWinLL-3" +SLOT="0" +KEYWORDS="x86 ppc ~sparc alpha arm amd64 ia64" +IUSE="odbc opengl gtk2 unicode debug" + +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 ) + !gtk2? ( =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 wxWindows +# has its own implementation of it +# Note 2: We disable unicode support because otherwise it breaks with +# some poorly implemented wxWindows apps like xmule and lmule. +# Note 3: PCX support is enabled if the correct libraries are detected. +# There is no USE flag for this. + +src_unpack() { + unpack ${A} + # fix xml contrib makefile problems + EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.4.1-contrib.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 +} + +src_compile() { + local myconf + + export LANG='C' + + myconf="${myconf} `use_with opengl`" + myconf="${myconf} --with-gtk" + myconf="${myconf} `use_enable debug`" + + # here we disable unicode support even thought gtk2 supports it + # because too many apps just don't follow the wxWindows guidelines + # for unicode support. + # + # http://www.wxwindows.org/manuals/2.4.0/wx458.htm#unicode + # + # bug #20116 - liquidx@gentoo.org (07 May 2003) + + use gtk2 && myconf="${myconf} --enable-gtk2" + # only allow unicode if using gtk2 + if ! use gtk2 && use unicode; then + ewarn "gtk does not support unicode" + ewarn "If you need unicode support use gtk2" + die "Only gtk2 supports unicode." + fi + use gtk2 && use unicode && myconf="${myconf} --enable-unicode" + # only enable odbc if unicode is not enabled. + ! use gtk2 && ! use unicode && myconf="${myconf} `use_with odbc`" + + econf ${myconf} || die "econf failed" + emake || die "make failed" + + cd ${S}/contrib/src + emake || die "make contrib failed" +} + +src_install() { + einstall || die "install failed" + dodoc *.txt + + cd ${S}/contrib/src + einstall || die "install contrib failed" +} -- cgit v1.2.3-65-gdbad