Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ryan Hill (dirtyepic)" <dirtyepic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/wxGTK: ChangeLog wxGTK-2.6.4.0-r4.ebuild
Date: Sun, 29 Jun 2008 04:32:05
Message-Id: E1KCoZz-00030h-Cv@stork.gentoo.org
1 dirtyepic 08/06/29 04:31:59
2
3 Modified: ChangeLog
4 Added: wxGTK-2.6.4.0-r4.ebuild
5 Log:
6 Stop installing the mmedia library which has an automagic dependency on
7 esd. Bug #174874 by Volker Hemmann.
8 (Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64)
9
10 Revision Changes Path
11 1.191 x11-libs/wxGTK/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.191&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.191&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.190&r2=1.191
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
20 retrieving revision 1.190
21 retrieving revision 1.191
22 diff -u -r1.190 -r1.191
23 --- ChangeLog 7 Jun 2008 19:12:16 -0000 1.190
24 +++ ChangeLog 29 Jun 2008 04:31:58 -0000 1.191
25 @@ -1,6 +1,13 @@
26 # ChangeLog for x11-libs/wxGTK
27 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.190 2008/06/07 19:12:16 dirtyepic Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.191 2008/06/29 04:31:58 dirtyepic Exp $
30 +
31 +*wxGTK-2.6.4.0-r4 (29 Jun 2008)
32 +
33 + 29 Jun 2008; Ryan Hill <dirtyepic@g.o>
34 + +files/wxGTK-2.6.4-mmedia.patch, +wxGTK-2.6.4.0-r4.ebuild:
35 + Stop installing the mmedia library which has an automagic dependency on
36 + esd. Bug #174874 by Volker Hemmann.
37
38 *wxGTK-2.8.7.1-r2 (07 Jun 2008)
39
40
41
42
43 1.1 x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild?rev=1.1&content-type=text/plain
47
48 Index: wxGTK-2.6.4.0-r4.ebuild
49 ===================================================================
50 # Copyright 1999-2008 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r4.ebuild,v 1.1 2008/06/29 04:31:58 dirtyepic Exp $
53
54 inherit eutils versionator flag-o-matic
55
56 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
57 HOMEPAGE="http://wxwidgets.org/"
58
59 BASE_PV="$(get_version_component_range 1-3)"
60 BASE_P="${PN}-${BASE_PV}"
61
62 # we use the wxPython tarballs because they include the full wxGTK sources and
63 # are released more frequently than wxGTK.
64 SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
65 doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
66
67 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
68 IUSE="X doc debug gnome odbc opengl pch sdl unicode"
69
70 RDEPEND="
71 dev-libs/expat
72 odbc? ( dev-db/unixODBC )
73 sdl? ( media-libs/libsdl )
74 X? (
75 >=x11-libs/gtk+-2.0
76 >=dev-libs/glib-2.0
77 media-libs/jpeg
78 media-libs/tiff
79 x11-libs/libSM
80 x11-libs/libXinerama
81 x11-libs/libXxf86vm
82 gnome? ( gnome-base/libgnomeprintui )
83 opengl? ( virtual/opengl )
84 )"
85
86 DEPEND="${RDEPEND}
87 dev-util/pkgconfig
88 X? (
89 x11-proto/xproto
90 x11-proto/xineramaproto
91 x11-proto/xf86vidmodeproto
92 )"
93
94 PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
95
96 SLOT="2.6"
97 LICENSE="wxWinLL-3
98 GPL-2
99 odbc? ( LGPL-2 )
100 doc? ( wxWinFDL-3 )"
101
102 S="${WORKDIR}/wxPython-src-${PV}"
103 HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
104
105 src_unpack() {
106 unpack ${A}
107 cd "${S}"
108
109 # General Patches
110
111 epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
112 epatch "${FILESDIR}"/${BASE_P}-collision.patch
113 epatch "${FILESDIR}"/${BASE_P}-mmedia.patch # Bug #174874
114
115 # Patches Specific to this version
116
117 epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
118 epatch "${FILESDIR}"/${P}-g_free.patch
119
120 # Reverse apply patch in wxPython tarball that breaks ABI
121 EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
122 EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
123
124 # wxBase has an automagic sdl dependency. short circuit it here.
125 # http://bugs.gentoo.org/show_bug.cgi?id=91574
126 use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
127 }
128
129 src_compile() {
130 local myconf
131
132 append-flags -fno-strict-aliasing
133
134 # X independent options
135 myconf="--enable-shared
136 --enable-compat24
137 --with-regex=builtin
138 --with-zlib=sys
139 --with-expat
140 $(use_enable pch precomp-headers)
141 $(use_with sdl)
142 $(use_with odbc)"
143
144 # wxGTK only
145 use X && \
146 myconf="${myconf}
147 --enable-gui
148 --with-libpng
149 --with-libxpm
150 --with-libjpeg
151 --with-libtiff
152 $(use_enable opengl)
153 $(use_with opengl)
154 $(use_with gnome gnomeprint)"
155
156 # wxBase only
157 use X || \
158 myconf="${myconf}
159 --disable-gui"
160
161 # in 2.6 we always build ansi
162 # everything else is controlled by USE
163 if ! use debug; then
164 build_wx ansi
165 else
166 build_wx ansi-debug
167 fi
168
169 if use unicode; then
170 if ! use debug; then
171 build_wx unicode
172 else
173 build_wx unicode-debug
174 fi
175 fi
176 }
177
178 src_install() {
179 # Note - the last version to be installed becomes the default, so install
180 # ansi after unicode
181 install_wx unicode
182 install_wx unicode-debug
183 install_wx ansi
184 install_wx ansi-debug
185
186 dodoc "${S}"/docs/changes.txt
187 dodoc "${S}"/docs/gtk/readme.txt
188
189 if use doc; then
190 dohtml -r "${HTML_S}"/docs/html/*
191 fi
192
193 # We don't want this
194 rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo
195 }
196
197 pkg_postinst() {
198 has_version app-admin/eselect-wxwidgets \
199 && eselect wxwidgets update
200 }
201
202 pkg_postrm() {
203 has_version app-admin/eselect-wxwidgets \
204 && eselect wxwidgets update
205 }
206
207 build_wx() {
208 local build_wx_conf
209
210 case "$1" in
211 ansi)
212 build_wx_conf="${build_wx_conf}
213 --disable-unicode"
214 ;;
215
216 ansi-debug)
217 build_wx_conf="${build_wx_conf}
218 --disable-unicode
219 --enable-debug_flag"
220 ;;
221
222 unicode)
223 build_wx_conf="${build_wx_conf}
224 --enable-unicode"
225 ;;
226
227 unicode-debug)
228 build_wx_conf="${build_wx_conf}
229 --enable-unicode
230 --enable-debug_flag"
231 ;;
232
233 *)
234 eerror "wxlib.class: build_wx called with invalid argument(s)."
235 die "wxlib.class: build_wx called with invalid argument(s)."
236 ;;
237 esac
238
239 mkdir -p build_$1
240 pushd build_$1
241
242 ECONF_SOURCE="${S}" econf \
243 ${myconf} \
244 ${build_wx_conf} \
245 || die "Failed to configure $1."
246
247 emake || die "Failed to make $1."
248
249 if [[ -e contrib/src ]]; then
250 cd contrib/src
251 emake || die "Failed to make $1 contrib."
252 fi
253
254 popd
255 }
256
257 install_wx() {
258 if [[ -d build_$1 ]]; then
259 pushd build_$1
260 emake DESTDIR="${D}" install || die "Failed to install $1."
261 if [[ -e contrib/src ]]; then
262 cd contrib/src
263 emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
264 fi
265 popd
266 fi
267 }
268
269
270
271 --
272 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups