* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.6.4.0-r2.ebuild
@ 2007-11-18 21:52 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2007-11-18 21:52 UTC (permalink / raw
To: gentoo-commits
dirtyepic 07/11/18 21:52:11
Modified: ChangeLog
Added: wxGTK-2.6.4.0-r2.ebuild
Log:
Revision bump using the wxwidgets eselect module. Masked until said module
is keyworded.
(Portage version: 2.1.3.19)
Revision Changes Path
1.160 x11-libs/wxGTK/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.159&r2=1.160
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog 4 Nov 2007 14:33:50 -0000 1.159
+++ ChangeLog 18 Nov 2007 21:52:10 -0000 1.160
@@ -1,6 +1,12 @@
# 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.159 2007/11/04 14:33:50 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.160 2007/11/18 21:52:10 dirtyepic Exp $
+
+*wxGTK-2.6.4.0-r2 (18 Nov 2007)
+
+ 18 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.6.4.0-r2.ebuild:
+ Revision bump using the wxwidgets eselect module. Masked until said module
+ is keyworded.
04 Nov 2007; Christoph Mende <angelos@gentoo.org> wxGTK-2.6.4.0-r1.ebuild:
Stable on amd64 wrt bug #197186
1.1 x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?rev=1.1&content-type=text/plain
Index: wxGTK-2.6.4.0-r2.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v 1.1 2007/11/18 21:52:10 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
# are released more frequently than wxGTK.
SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="X doc debug gnome joystick odbc opengl sdl unicode"
RDEPEND="
dev-libs/expat
odbc? ( dev-db/unixODBC )
sdl? ( media-libs/libsdl )
X? (
>=x11-libs/gtk+-2.0
>=dev-libs/glib-2.0
media-libs/jpeg
media-libs/tiff
x11-libs/libSM
x11-libs/libXinerama
x11-libs/libXxf86vm
gnome? ( gnome-base/libgnomeprintui )
opengl? ( virtual/opengl )
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
app-admin/eselect-wxwidgets
X? (
x11-proto/xproto
x11-proto/xineramaproto
x11-proto/xf86vidmodeproto
)"
SLOT="2.6"
LICENSE="wxWinLL-3
GPL-2
odbc? ( LGPL-2 )
doc? ( wxWinFDL-3 )"
S="${WORKDIR}/wxPython-src-${PV}"
HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
src_unpack() {
unpack ${A}
cd "${S}"
# General Patches
epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
epatch "${FILESDIR}"/${BASE_P}-collision.patch
# Patches Specific to this version
epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
epatch "${FILESDIR}"/${P}-g_free.patch
# Reverse apply patch in wxPython tarball that breaks ABI
EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
# wxBase has an automagic sdl dependency. short circuit it here.
# http://bugs.gentoo.org/show_bug.cgi?id=91574
use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
}
src_compile() {
local myconf
append-flags -fno-strict-aliasing
# X independent options
myconf="--enable-shared
--disable-optimise
--disable-rpath
--enable-compat24
--with-regex=builtin
--with-zlib=sys
--with-expat
$(use_enable joystick)
$(use_with sdl)
$(use_with odbc)"
# wxGTK only
use X && \
myconf="${myconf}
--enable-gui
--with-libpng
--with-libxpm
--with-libjpeg
--with-libtiff
$(use_enable opengl)
$(use_with opengl)
$(use_with gnome gnomeprint)"
# wxBase only
use X || \
myconf="${myconf}
--disable-gui"
# in 2.6 we always build ansi
# everything else is controlled by USE
if ! use debug; then
build_wx ansi
else
build_wx ansi-debug
fi
if use unicode; then
if ! use debug; then
build_wx unicode
else
build_wx unicode-debug
fi
fi
}
src_install() {
# Note - the last version to be installed becomes the default, so install
# ansi after unicode
install_wx unicode
install_wx unicode-debug
install_wx ansi
install_wx ansi-debug
dodoc "${S}"/docs/changes.txt
dodoc "${S}"/docs/gtk/readme.txt
if use doc; then
dohtml -r "${HTML_S}"/docs/html/*
fi
# We don't want this
rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo
}
pkg_postinst() {
if [[ ! -e /var/lib/wxwidgets/current \
|| $(grep 'WXCONFIG="none"' /var/lib/wxwidgets/current) ]]; then
local wxchar wxtoolkit wxdebug
[[ ${SLOT} == 2.6 ]] && wxchar=ansi || wxchar=unicode
use X && wxtoolkit=gtk2 || wxtoolkit=base
use debug && wxdebug=debug || wxdebug=release
eselect wxwidgets set ${wxtoolkit}-${wxchar}-${wxdebug}-${SLOT}
else
eselect wxwidgets update
fi
}
pkg_postrm() {
eselect wxwidgets update
}
build_wx() {
local build_wx_conf
case "$1" in
ansi)
build_wx_conf="${build_wx_conf}
--disable-unicode"
;;
ansi-debug)
build_wx_conf="${build_wx_conf}
--disable-unicode
--enable-debug_flag"
;;
unicode)
build_wx_conf="${build_wx_conf}
--enable-unicode"
;;
unicode-debug)
build_wx_conf="${build_wx_conf}
--enable-unicode
--enable-debug_flag"
;;
*)
eerror "wxlib.class: build_wx called with invalid argument(s)."
die "wxlib.class: build_wx called with invalid argument(s)."
;;
esac
mkdir -p build_$1
pushd build_$1
ECONF_SOURCE="${S}" econf \
${myconf} \
${build_wx_conf} \
|| die "Failed to configure $1."
emake || die "Failed to make $1."
if [[ -e contrib/src ]]; then
cd contrib/src
emake || die "Failed to make $1 contrib."
fi
popd
}
install_wx() {
if [[ -d build_$1 ]]; then
pushd build_$1
emake DESTDIR="${D}" install || die "Failed to install $1."
if [[ -e contrib/src ]]; then
cd contrib/src
emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
fi
popd
fi
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.6.4.0-r2.ebuild
@ 2007-11-24 16:14 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 2+ messages in thread
From: Ryan Hill (dirtyepic) @ 2007-11-24 16:14 UTC (permalink / raw
To: gentoo-commits
dirtyepic 07/11/24 16:14:18
Modified: ChangeLog wxGTK-2.6.4.0-r2.ebuild
Log:
Make --disable-precomp-headers the default since it also cuts 1/3 off the
build time.
(Portage version: 2.1.4_rc2)
Revision Changes Path
1.162 x11-libs/wxGTK/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.161&r2=1.162
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- ChangeLog 24 Nov 2007 14:35:05 -0000 1.161
+++ ChangeLog 24 Nov 2007 16:14:18 -0000 1.162
@@ -1,6 +1,10 @@
# 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.161 2007/11/24 14:35:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.162 2007/11/24 16:14:18 dirtyepic Exp $
+
+ 24 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r2.ebuild:
+ Make --disable-precomp-headers the default since it also cuts 1/3 off the
+ build time.
24 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.6.4.0-r2.ebuild:
Add pch USE flag to control precompiled header support as suggested by
1.3 x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild?r1=1.2&r2=1.3
Index: wxGTK-2.6.4.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wxGTK-2.6.4.0-r2.ebuild 24 Nov 2007 14:35:05 -0000 1.2
+++ wxGTK-2.6.4.0-r2.ebuild 24 Nov 2007 16:14:18 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v 1.2 2007/11/24 14:35:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r2.ebuild,v 1.3 2007/11/24 16:14:18 dirtyepic Exp $
inherit eutils versionator flag-o-matic
@@ -16,7 +16,7 @@
doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X doc debug gnome odbc opengl pch sdl unicode"
+IUSE="X doc debug gnome odbc opengl sdl unicode"
RDEPEND="
dev-libs/expat
@@ -82,13 +82,11 @@
# X independent options
myconf="--enable-shared
- --disable-optimise
- --disable-rpath
--enable-compat24
--with-regex=builtin
--with-zlib=sys
--with-expat
- $(use_enable pch precomp-headers)
+ --disable-precomp-headers
$(use_with sdl)
$(use_with odbc)"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-24 16:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-18 21:52 [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.6.4.0-r2.ebuild Ryan Hill (dirtyepic)
-- strict thread matches above, loose matches on Subject: below --
2007-11-24 16:14 Ryan Hill (dirtyepic)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox