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.8.10.1-r3.ebuild wxGTK-2.6.4.0-r6.ebuild
Date: Thu, 06 Aug 2009 04:56:09
Message-Id: E1MYv1L-00059F-I3@stork.gentoo.org
1 dirtyepic 09/08/06 04:56:07
2
3 Modified: ChangeLog
4 Added: wxGTK-2.8.10.1-r3.ebuild wxGTK-2.6.4.0-r6.ebuild
5 Log:
6 Add patch from upstream to fix symbol conflict with GSocket struct from
7 developmental glib currently in gnome-overlay. Bug #278778.
8 (Portage version: 2.2_rc35/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.239 x11-libs/wxGTK/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.239&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.239&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.238&r2=1.239
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
20 retrieving revision 1.238
21 retrieving revision 1.239
22 diff -u -r1.238 -r1.239
23 --- ChangeLog 29 Jul 2009 21:43:35 -0000 1.238
24 +++ ChangeLog 6 Aug 2009 04:56:07 -0000 1.239
25 @@ -1,6 +1,14 @@
26 # ChangeLog for x11-libs/wxGTK
27 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.238 2009/07/29 21:43:35 maekke Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.239 2009/08/06 04:56:07 dirtyepic Exp $
30 +
31 +*wxGTK-2.8.10.1-r3 (06 Aug 2009)
32 +*wxGTK-2.6.4.0-r6 (06 Aug 2009)
33 +
34 + 06 Aug 2009; Ryan Hill <dirtyepic@g.o> +wxGTK-2.6.4.0-r6.ebuild,
35 + +wxGTK-2.8.10.1-r3.ebuild, +files/wxGTK-2.8.10.1-gsocket.patch:
36 + Add patch from upstream to fix symbol conflict with GSocket struct from
37 + developmental glib currently in gnome-overlay. Bug #278778.
38
39 29 Jul 2009; Markus Meier <maekke@g.o> wxGTK-2.6.4.0-r5.ebuild,
40 wxGTK-2.8.10.1-r1.ebuild:
41
42
43
44 1.1 x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild?rev=1.1&content-type=text/plain
48
49 Index: wxGTK-2.8.10.1-r3.ebuild
50 ===================================================================
51 # Copyright 1999-2009 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r3.ebuild,v 1.1 2009/08/06 04:56:07 dirtyepic Exp $
54
55 EAPI="2"
56
57 inherit eutils versionator flag-o-matic
58
59 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
60 HOMEPAGE="http://wxwidgets.org/"
61
62 BASE_PV="$(get_version_component_range 1-3)"
63 BASE_P="${PN}-${BASE_PV}"
64
65 # we use the wxPython tarballs because they include the full wxGTK sources and
66 # docs, and are released more frequently than wxGTK.
67 SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
68
69 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
70 IUSE="X doc debug gnome gstreamer odbc opengl pch sdl"
71
72 RDEPEND="
73 dev-libs/expat
74 odbc? ( dev-db/unixODBC )
75 sdl? ( media-libs/libsdl )
76 X? (
77 >=x11-libs/gtk+-2.4
78 >=dev-libs/glib-2.4
79 media-libs/jpeg
80 media-libs/tiff
81 x11-libs/libSM
82 x11-libs/libXinerama
83 x11-libs/libXxf86vm
84 gnome? ( gnome-base/libgnomeprintui )
85 gstreamer? (
86 >=gnome-base/gconf-2.0
87 >=media-libs/gstreamer-0.10 )
88 opengl? ( virtual/opengl )
89 )"
90
91 DEPEND="${RDEPEND}
92 dev-util/pkgconfig
93 X? (
94 x11-proto/xproto
95 x11-proto/xineramaproto
96 x11-proto/xf86vidmodeproto
97 )"
98
99 PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
100
101 SLOT="2.8"
102 LICENSE="wxWinLL-3
103 GPL-2
104 odbc? ( LGPL-2 )
105 doc? ( wxWinFDL-3 )"
106
107 S="${WORKDIR}/wxPython-src-${PV}"
108
109 src_prepare() {
110 epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
111 epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch
112 epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874
113 # this version only:
114 epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch # Bug #277722
115 epatch "${FILESDIR}"/${P}-gsocket.patch # Bug #278778
116 }
117
118 src_configure() {
119 local myconf
120
121 append-flags -fno-strict-aliasing
122
123 # X independent options
124 myconf="--enable-compat26
125 --enable-shared
126 --enable-unicode
127 --with-regex=builtin
128 --with-zlib=sys
129 --with-expat=sys
130 $(use_enable debug)
131 $(use_enable pch precomp-headers)
132 $(use_with sdl)"
133
134 use odbc \
135 && myconf="${myconf} --with-odbc=sys" \
136 || myconf="${myconf} $(use_with odbc)"
137
138 # wxGTK options
139 # --enable-graphics_ctx - needed for webkit, editra
140 # --without-gnomevfs - bug #203389
141
142 use X && \
143 myconf="${myconf}
144 --enable-graphics_ctx
145 --enable-gui
146 --with-libpng=sys
147 --with-libxpm=sys
148 --with-libjpeg=sys
149 --with-libtiff=sys
150 $(use_enable gstreamer mediactrl)
151 $(use_enable opengl)
152 $(use_with opengl)
153 $(use_with gnome gnomeprint)
154 --without-gnomevfs"
155
156 # wxBase options
157 use X || \
158 myconf="${myconf}
159 --disable-gui"
160
161 mkdir "${S}"/wxgtk_build
162 cd "${S}"/wxgtk_build
163
164 ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
165 }
166
167 src_compile() {
168 cd "${S}"/wxgtk_build
169
170 emake || die "make failed."
171
172 if [[ -d contrib/src ]]; then
173 cd contrib/src
174 emake || die "make contrib failed."
175 fi
176 }
177
178 src_install() {
179 cd "${S}"/wxgtk_build
180
181 emake DESTDIR="${D}" install || die "install failed."
182
183 if [[ -d contrib/src ]]; then
184 cd contrib/src
185 emake DESTDIR="${D}" install || die "install contrib failed."
186 fi
187
188 cd "${S}"/docs
189 dodoc changes.txt readme.txt todo30.txt
190 newdoc base/readme.txt base_readme.txt
191 newdoc gtk/readme.txt gtk_readme.txt
192
193 if use doc; then
194 dohtml -r "${S}"/docs/html/*
195 fi
196
197 # We don't want this
198 rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
199 }
200
201 pkg_postinst() {
202 has_version app-admin/eselect-wxwidgets \
203 && eselect wxwidgets update
204 }
205
206 pkg_postrm() {
207 has_version app-admin/eselect-wxwidgets \
208 && eselect wxwidgets update
209 }
210
211
212
213 1.1 x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
214
215 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.1&view=markup
216 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild?rev=1.1&content-type=text/plain
217
218 Index: wxGTK-2.6.4.0-r6.ebuild
219 ===================================================================
220 # Copyright 1999-2009 Gentoo Foundation
221 # Distributed under the terms of the GNU General Public License v2
222 # $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.1 2009/08/06 04:56:07 dirtyepic Exp $
223
224 inherit eutils versionator flag-o-matic
225
226 DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
227 HOMEPAGE="http://wxwidgets.org/"
228
229 BASE_PV="$(get_version_component_range 1-3)"
230 BASE_P="${PN}-${BASE_PV}"
231
232 # we use the wxPython tarballs because they include the full wxGTK sources and
233 # are released more frequently than wxGTK.
234 SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
235 doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
236
237 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
238 IUSE="X doc debug gnome odbc opengl pch sdl unicode"
239
240 RDEPEND="
241 dev-libs/expat
242 odbc? ( dev-db/unixODBC )
243 sdl? ( media-libs/libsdl )
244 X? (
245 >=x11-libs/gtk+-2.0
246 >=dev-libs/glib-2.0
247 media-libs/jpeg
248 media-libs/tiff
249 x11-libs/libSM
250 x11-libs/libXinerama
251 x11-libs/libXxf86vm
252 gnome? ( gnome-base/libgnomeprintui )
253 opengl? ( virtual/opengl )
254 )"
255
256 DEPEND="${RDEPEND}
257 dev-util/pkgconfig
258 X? (
259 x11-proto/xproto
260 x11-proto/xineramaproto
261 x11-proto/xf86vidmodeproto
262 )"
263
264 PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
265
266 SLOT="2.6"
267 LICENSE="wxWinLL-3
268 GPL-2
269 odbc? ( LGPL-2 )
270 doc? ( wxWinFDL-3 )"
271
272 S="${WORKDIR}/wxPython-src-${PV}"
273 HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
274
275 src_unpack() {
276 unpack ${A}
277 cd "${S}"
278
279 # General Patches
280
281 epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
282 epatch "${FILESDIR}"/${BASE_P}-collision.patch
283 epatch "${FILESDIR}"/${BASE_P}-mmedia.patch # Bug #174874
284
285 # Patches Specific to this version
286
287 epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
288 epatch "${FILESDIR}"/${P}-g_free.patch
289 epatch "${FILESDIR}"/${PN}-2.8.10.1-CVE-2009-2369.patch
290 epatch "${FILESDIR}"/${PN}-2.8.10.1-gsocket.patch
291
292 # Reverse apply patch in wxPython tarball that breaks ABI
293 EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
294 EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
295
296 # wxBase has an automagic sdl dependency. short circuit it here.
297 # http://bugs.gentoo.org/show_bug.cgi?id=91574
298 use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
299 }
300
301 src_compile() {
302 local myconf
303
304 append-flags -fno-strict-aliasing
305
306 # X independent options
307 myconf="--enable-shared
308 --enable-compat24
309 --with-regex=builtin
310 --with-zlib=sys
311 --with-expat
312 $(use_enable pch precomp-headers)
313 $(use_with sdl)
314 $(use_with odbc)"
315
316 # wxGTK only
317 use X && \
318 myconf="${myconf}
319 --enable-gui
320 --with-libpng
321 --with-libxpm
322 --with-libjpeg
323 --with-libtiff
324 $(use_enable opengl)
325 $(use_with opengl)
326 $(use_with gnome gnomeprint)"
327
328 # wxBase only
329 use X || \
330 myconf="${myconf}
331 --disable-gui"
332
333 # in 2.6 we always build ansi
334 # everything else is controlled by USE
335 if ! use debug; then
336 build_wx ansi
337 else
338 build_wx ansi-debug
339 fi
340
341 if use unicode; then
342 if ! use debug; then
343 build_wx unicode
344 else
345 build_wx unicode-debug
346 fi
347 fi
348 }
349
350 src_install() {
351 # Note - the last version to be installed becomes the default, so install
352 # ansi after unicode
353 install_wx unicode
354 install_wx unicode-debug
355 install_wx ansi
356 install_wx ansi-debug
357
358 dodoc "${S}"/docs/changes.txt
359 dodoc "${S}"/docs/gtk/readme.txt
360
361 if use doc; then
362 dohtml -r "${HTML_S}"/docs/html/*
363 fi
364
365 # We don't want this
366 rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo
367 }
368
369 pkg_postinst() {
370 has_version app-admin/eselect-wxwidgets \
371 && eselect wxwidgets update
372 }
373
374 pkg_postrm() {
375 has_version app-admin/eselect-wxwidgets \
376 && eselect wxwidgets update
377 }
378
379 build_wx() {
380 local build_wx_conf
381
382 case "$1" in
383 ansi)
384 build_wx_conf="${build_wx_conf}
385 --disable-unicode"
386 ;;
387
388 ansi-debug)
389 build_wx_conf="${build_wx_conf}
390 --disable-unicode
391 --enable-debug_flag"
392 ;;
393
394 unicode)
395 build_wx_conf="${build_wx_conf}
396 --enable-unicode"
397 ;;
398
399 unicode-debug)
400 build_wx_conf="${build_wx_conf}
401 --enable-unicode
402 --enable-debug_flag"
403 ;;
404
405 *)
406 eerror "wxlib.class: build_wx called with invalid argument(s)."
407 die "wxlib.class: build_wx called with invalid argument(s)."
408 ;;
409 esac
410
411 mkdir -p build_$1
412 pushd build_$1
413
414 ECONF_SOURCE="${S}" econf \
415 ${myconf} \
416 ${build_wx_conf} \
417 || die "Failed to configure $1."
418
419 emake || die "Failed to make $1."
420
421 if [[ -e contrib/src ]]; then
422 cd contrib/src
423 emake || die "Failed to make $1 contrib."
424 fi
425
426 popd
427 }
428
429 install_wx() {
430 if [[ -d build_$1 ]]; then
431 pushd build_$1
432 emake DESTDIR="${D}" install || die "Failed to install $1."
433 if [[ -e contrib/src ]]; then
434 cd contrib/src
435 emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
436 fi
437 popd
438 fi
439 }
Report Message
Find on MARC Find on Google Groups