[gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.8.9.2.ebuild wxGTK-2.8.9.2-r1.ebuild wxGTK-2.8.9.1-r3.ebuild

[Ryan Hill (dirtyepic)]

dirtyepic    09/04/25 02:25:44

  Modified:             ChangeLog wxGTK-2.8.9.2.ebuild
                        wxGTK-2.8.9.1-r3.ebuild
  Added:                wxGTK-2.8.9.2-r1.ebuild
  Log:
  - Fix nested HTML tables (bug #264544, Ivan Trombley)
  - Add missing gconf dependency with USE=gstreamer (bug #267022, Morten Lied
    Johansen)
  (Portage version: 2.2_rc31/cvs/Linux x86_64)

Revision  Changes    Path
1.221                x11-libs/wxGTK/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.221&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.221&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.220&r2=1.221

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- ChangeLog	21 Feb 2009 22:20:39 -0000	1.220
+++ ChangeLog	25 Apr 2009 02:25:43 -0000	1.221
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.220 2009/02/21 22:20:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.221 2009/04/25 02:25:43 dirtyepic Exp $
+
+*wxGTK-2.8.9.2-r1 (25 Apr 2009)
+
+  25 Apr 2009; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.9.2-nestedtables.patch, wxGTK-2.8.9.1-r3, wxGTK-2.8.9.2,
+  +wxGTK-2.8.9.2-r1.ebuild:
+  - Fix nested HTML tables (bug #264544, Ivan Trombley)
+  - Add missing gconf dependency with USE=gstreamer (bug #267022, Morten Lied 
+    Johansen)
 
 *wxGTK-2.8.9.2 (21 Feb 2009)
 



1.2                  x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild?r1=1.1&r2=1.2

Index: wxGTK-2.8.9.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wxGTK-2.8.9.2.ebuild	21 Feb 2009 22:20:39 -0000	1.1
+++ wxGTK-2.8.9.2.ebuild	25 Apr 2009 02:25:43 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild,v 1.1 2009/02/21 22:20:39 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2.ebuild,v 1.2 2009/04/25 02:25:43 dirtyepic Exp $
 
 EAPI="2"
 
@@ -32,7 +32,9 @@
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
 		gnome?  ( gnome-base/libgnomeprintui )
-		gstreamer? ( >=media-libs/gstreamer-0.10 )
+		gstreamer? (
+			>=gnome-base/gconf-2.0
+			>=media-libs/gstreamer-0.10 )
 		opengl? ( virtual/opengl )
 		)"
 



1.9                  x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild?r1=1.8&r2=1.9

Index: wxGTK-2.8.9.1-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wxGTK-2.8.9.1-r3.ebuild	15 Feb 2009 15:19:44 -0000	1.8
+++ wxGTK-2.8.9.1-r3.ebuild	25 Apr 2009 02:25:43 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild,v 1.8 2009/02/15 15:19:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.1-r3.ebuild,v 1.9 2009/04/25 02:25:43 dirtyepic Exp $
 
 EAPI="2"
 
@@ -32,7 +32,9 @@
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
 		gnome?  ( gnome-base/libgnomeprintui )
-		gstreamer? ( >=media-libs/gstreamer-0.10 )
+		gstreamer? (
+			>=gnome-base/gconf-2.0
+			>=media-libs/gstreamer-0.10 )
 		opengl? ( virtual/opengl )
 		)"
 



1.1                  x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: wxGTK-2.8.9.2-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.9.2-r1.ebuild,v 1.1 2009/04/25 02:25:43 dirtyepic Exp $

EAPI="2"

inherit eutils versionator flag-o-matic

DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
HOMEPAGE="http://wxwidgets.org/"

BASE_PV="$(get_version_component_range 1-3)"
BASE_P="${PN}-${BASE_PV}"

# we use the wxPython tarballs because they include the full wxGTK sources and
# docs, and are released more frequently than wxGTK.
SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"

KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="X doc debug gnome gstreamer odbc opengl pch sdl"

RDEPEND="
	dev-libs/expat
	odbc?   ( dev-db/unixODBC )
	sdl?    ( media-libs/libsdl )
	X?  (
		>=x11-libs/gtk+-2.4
		>=dev-libs/glib-2.4
		media-libs/jpeg
		media-libs/tiff
		x11-libs/libSM
		x11-libs/libXinerama
		x11-libs/libXxf86vm
		gnome?  ( gnome-base/libgnomeprintui )
		gstreamer? (
			>=gnome-base/gconf-2.0
			>=media-libs/gstreamer-0.10 )
		opengl? ( virtual/opengl )
		)"

DEPEND="${RDEPEND}
		dev-util/pkgconfig
		X?  (
			x11-proto/xproto
			x11-proto/xineramaproto
			x11-proto/xf86vidmodeproto
			)"

PDEPEND=">=app-admin/eselect-wxwidgets-0.7"

SLOT="2.8"
LICENSE="wxWinLL-3
		GPL-2
		odbc?	( LGPL-2 )
		doc?	( wxWinFDL-3 )"

S="${WORKDIR}/wxPython-src-${PV}"

src_prepare() {
	cd "${S}"
	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
	epatch "${FILESDIR}"/${PN}-2.8.8-collision.patch
	epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
	epatch "${FILESDIR}"/${P}-nestedtables.patch               # Bug #264544
}

src_configure() {
	local myconf

	append-flags -fno-strict-aliasing

	# X independent options
	myconf="--enable-compat26
			--enable-shared
			--enable-unicode
			--with-regex=builtin
			--with-zlib=sys
			--with-expat=sys
			$(use_enable debug)
			$(use_enable pch precomp-headers)
			$(use_with sdl)"

	use odbc \
		&& myconf="${myconf} --with-odbc=sys" \
		|| myconf="${myconf} $(use_with odbc)"

	# wxGTK options
	#   --enable-graphics_ctx - needed for webkit, editra
	#   --without-gnomevfs - bug #203389

	use X && \
		myconf="${myconf}
			--enable-graphics_ctx
			--enable-gui
			--with-libpng=sys
			--with-libxpm=sys
			--with-libjpeg=sys
			--with-libtiff=sys
			$(use_enable gstreamer mediactrl)
			$(use_enable opengl)
			$(use_with opengl)
			$(use_with gnome gnomeprint)
			--without-gnomevfs"

	# wxBase options
	use X || \
		myconf="${myconf}
			--disable-gui"

	mkdir "${S}"/wxgtk_build
	cd "${S}"/wxgtk_build

	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
}

src_compile() {
	cd "${S}"/wxgtk_build

	emake || die "make failed."

	if [[ -d contrib/src ]]; then
		cd contrib/src
		emake || die "make contrib failed."
	fi
}

src_install() {
	cd "${S}"/wxgtk_build

	emake DESTDIR="${D}" install || die "install failed."

	if [[ -d contrib/src ]]; then
		cd contrib/src
		emake DESTDIR="${D}" install || die "install contrib failed."
	fi

	cd "${S}"/docs
	dodoc changes.txt readme.txt todo30.txt
	newdoc base/readme.txt base_readme.txt
	newdoc gtk/readme.txt gtk_readme.txt

	if use doc; then
		dohtml -r "${S}"/docs/html/*
	fi

	# We don't want this
	rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
}

pkg_postinst() {
	has_version app-admin/eselect-wxwidgets \
		&& eselect wxwidgets update
}

pkg_postrm() {
	has_version app-admin/eselect-wxwidgets \
		&& eselect wxwidgets update
}