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

[Ryan Hill (dirtyepic)]

dirtyepic    08/01/06 22:47:55

  Modified:             ChangeLog
  Added:                wxGTK-2.8.7.1-r1.ebuild
  Removed:              wxGTK-2.8.7.1.ebuild
  Log:
  Revision bump.
   - prevent segfault by configuring with --without-gnomevfs (Bug #203389)
   - don't build the mmedia contrib library (indirectly fixes Bug #174874)
  (Portage version: 2.1.4_rc14)

Revision  Changes    Path
1.175                x11-libs/wxGTK/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog	23 Dec 2007 18:28:42 -0000	1.174
+++ ChangeLog	6 Jan 2008 22:47:55 -0000	1.175
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/wxGTK
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.174 2007/12/23 18:28:42 dirtyepic Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.175 2008/01/06 22:47:55 dirtyepic Exp $
+
+*wxGTK-2.8.7.1-r1 (06 Jan 2008)
+
+  06 Jan 2008; Ryan Hill <dirtyepic@g.o>
+  +files/wxGTK-2.8.7-mmedia.patch, -wxGTK-2.8.7.1.ebuild,
+  +wxGTK-2.8.7.1-r1.ebuild:
+  Revision bump.
+   - prevent segfault by configuring with --without-gnomevfs (Bug #203389)
+   - don't build the mmedia contrib library (indirectly fixes Bug #174874)
 
   23 Dec 2007; Ryan Hill <dirtyepic@g.o> wxGTK-2.8.7.1.ebuild:
   Restore dropped ppc keyword for bug #199594.



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

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

Index: wxGTK-2.8.7.1-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.7.1-r1.ebuild,v 1.1 2008/01/06 22:47:55 dirtyepic Exp $

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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
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
				gnome-base/gnome-vfs
				)
		gstreamer? ( >=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_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
	epatch "${FILESDIR}"/${PN}-2.8.4-collision.patch
	epatch "${FILESDIR}"/${PN}-2.8.6-wxrc_link_fix.patch
	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch			# Bug #174874
}

src_compile() {
	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
			$(use_enable debug)
			$(use_enable pch precomp-headers)
			$(use_with sdl)
			$(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
			--with-libxpm
			--with-libjpeg
			--with-libtiff
			$(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."

	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}"

	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
}



-- 
gentoo-commits@l.g.o mailing list