1 |
dirtyepic 10/02/02 19:10:59 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: wxGTK-2.8.10.1-r5.ebuild |
5 |
Removed: wxGTK-2.8.10.1-r4.ebuild wxGTK-2.8.10.1-r3.ebuild |
6 |
Log: |
7 |
Revbump to fix typo in collision patch. Remove unused patches. |
8 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.243 x11-libs/wxGTK/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.243&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.243&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.242&r2=1.243 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v |
20 |
retrieving revision 1.242 |
21 |
retrieving revision 1.243 |
22 |
diff -u -r1.242 -r1.243 |
23 |
--- ChangeLog 19 Jan 2010 01:19:35 -0000 1.242 |
24 |
+++ ChangeLog 2 Feb 2010 19:10:58 -0000 1.243 |
25 |
@@ -1,6 +1,17 @@ |
26 |
# ChangeLog for x11-libs/wxGTK |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.242 2010/01/19 01:19:35 dirtyepic Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.243 2010/02/02 19:10:58 dirtyepic Exp $ |
30 |
+ |
31 |
+*wxGTK-2.8.10.1-r5 (02 Feb 2010) |
32 |
+ |
33 |
+ 02 Feb 2010; Ryan Hill <dirtyepic@g.o> |
34 |
+ -files/wxGTK-2.8.6-wxrc_link_fix.patch, |
35 |
+ -files/wxGTK-2.8.8-collision.patch, |
36 |
+ -files/wxGTK-2.8.9.2-nestedtables.patch, |
37 |
+ -files/wxGTK-2.8.9-dont-touch-my-bools.patch, -wxGTK-2.8.10.1-r3.ebuild, |
38 |
+ -wxGTK-2.8.10.1-r4.ebuild, +wxGTK-2.8.10.1-r5.ebuild, |
39 |
+ files/wxGTK-2.8.10-collision.patch: |
40 |
+ Revbump to fix typo in collision patch. Remove unused patches. |
41 |
|
42 |
*wxGTK-2.8.10.1-r4 (19 Jan 2010) |
43 |
|
44 |
|
45 |
|
46 |
|
47 |
1.1 x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: wxGTK-2.8.10.1-r5.ebuild |
53 |
=================================================================== |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.1 2010/02/02 19:10:58 dirtyepic Exp $ |
57 |
|
58 |
EAPI="2" |
59 |
|
60 |
inherit eutils versionator flag-o-matic |
61 |
|
62 |
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit." |
63 |
HOMEPAGE="http://wxwidgets.org/" |
64 |
|
65 |
BASE_PV="$(get_version_component_range 1-3)" |
66 |
BASE_P="${PN}-${BASE_PV}" |
67 |
|
68 |
# we use the wxPython tarballs because they include the full wxGTK sources and |
69 |
# docs, and are released more frequently than wxGTK. |
70 |
SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2" |
71 |
|
72 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
73 |
IUSE="X doc debug gnome gstreamer odbc opengl pch sdl" |
74 |
|
75 |
RDEPEND=" |
76 |
dev-libs/expat |
77 |
odbc? ( dev-db/unixODBC ) |
78 |
sdl? ( media-libs/libsdl ) |
79 |
X? ( |
80 |
>=x11-libs/gtk+-2.4 |
81 |
>=dev-libs/glib-2.4 |
82 |
media-libs/jpeg |
83 |
media-libs/tiff |
84 |
x11-libs/libSM |
85 |
x11-libs/libXinerama |
86 |
x11-libs/libXxf86vm |
87 |
gnome? ( gnome-base/libgnomeprintui ) |
88 |
gstreamer? ( |
89 |
>=gnome-base/gconf-2.0 |
90 |
>=media-libs/gstreamer-0.10 ) |
91 |
opengl? ( virtual/opengl ) |
92 |
)" |
93 |
|
94 |
DEPEND="${RDEPEND} |
95 |
dev-util/pkgconfig |
96 |
X? ( |
97 |
x11-proto/xproto |
98 |
x11-proto/xineramaproto |
99 |
x11-proto/xf86vidmodeproto |
100 |
)" |
101 |
|
102 |
PDEPEND=">=app-admin/eselect-wxwidgets-0.7" |
103 |
|
104 |
SLOT="2.8" |
105 |
LICENSE="wxWinLL-3 |
106 |
GPL-2 |
107 |
odbc? ( LGPL-2 ) |
108 |
doc? ( wxWinFDL-3 )" |
109 |
|
110 |
S="${WORKDIR}/wxPython-src-${PV}" |
111 |
|
112 |
src_prepare() { |
113 |
epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch |
114 |
epatch "${FILESDIR}"/${PN}-2.8.10-collision.patch |
115 |
epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874 |
116 |
# this version only: |
117 |
epatch "${FILESDIR}"/${P}-CVE-2009-2369.patch # Bug #277722 |
118 |
epatch "${FILESDIR}"/${P}-gsocket.patch # Bug #278778 |
119 |
epatch "${FILESDIR}"/${P}-wxTimer-unbounded-hook.patch # Bug #301143 |
120 |
} |
121 |
|
122 |
src_configure() { |
123 |
local myconf |
124 |
|
125 |
append-flags -fno-strict-aliasing |
126 |
|
127 |
# X independent options |
128 |
myconf="--enable-compat26 |
129 |
--enable-shared |
130 |
--enable-unicode |
131 |
--with-regex=builtin |
132 |
--with-zlib=sys |
133 |
--with-expat=sys |
134 |
$(use_enable debug) |
135 |
$(use_enable pch precomp-headers) |
136 |
$(use_with sdl)" |
137 |
|
138 |
use odbc \ |
139 |
&& myconf="${myconf} --with-odbc=sys" \ |
140 |
|| myconf="${myconf} $(use_with odbc)" |
141 |
|
142 |
# wxGTK options |
143 |
# --enable-graphics_ctx - needed for webkit, editra |
144 |
# --without-gnomevfs - bug #203389 |
145 |
|
146 |
use X && \ |
147 |
myconf="${myconf} |
148 |
--enable-graphics_ctx |
149 |
--enable-gui |
150 |
--with-libpng=sys |
151 |
--with-libxpm=sys |
152 |
--with-libjpeg=sys |
153 |
--with-libtiff=sys |
154 |
$(use_enable gstreamer mediactrl) |
155 |
$(use_enable opengl) |
156 |
$(use_with opengl) |
157 |
$(use_with gnome gnomeprint) |
158 |
--without-gnomevfs" |
159 |
|
160 |
# wxBase options |
161 |
use X || \ |
162 |
myconf="${myconf} |
163 |
--disable-gui" |
164 |
|
165 |
mkdir "${S}"/wxgtk_build |
166 |
cd "${S}"/wxgtk_build |
167 |
|
168 |
ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed." |
169 |
} |
170 |
|
171 |
src_compile() { |
172 |
cd "${S}"/wxgtk_build |
173 |
|
174 |
emake || die "make failed." |
175 |
|
176 |
if [[ -d contrib/src ]]; then |
177 |
cd contrib/src |
178 |
emake || die "make contrib failed." |
179 |
fi |
180 |
} |
181 |
|
182 |
src_install() { |
183 |
cd "${S}"/wxgtk_build |
184 |
|
185 |
emake DESTDIR="${D}" install || die "install failed." |
186 |
|
187 |
if [[ -d contrib/src ]]; then |
188 |
cd contrib/src |
189 |
emake DESTDIR="${D}" install || die "install contrib failed." |
190 |
fi |
191 |
|
192 |
cd "${S}"/docs |
193 |
dodoc changes.txt readme.txt todo30.txt |
194 |
newdoc base/readme.txt base_readme.txt |
195 |
newdoc gtk/readme.txt gtk_readme.txt |
196 |
|
197 |
if use doc; then |
198 |
dohtml -r "${S}"/docs/html/* |
199 |
fi |
200 |
|
201 |
# We don't want this |
202 |
rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo |
203 |
} |
204 |
|
205 |
pkg_postinst() { |
206 |
has_version app-admin/eselect-wxwidgets \ |
207 |
&& eselect wxwidgets update |
208 |
} |
209 |
|
210 |
pkg_postrm() { |
211 |
has_version app-admin/eselect-wxwidgets \ |
212 |
&& eselect wxwidgets update |
213 |
} |