Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/
Date: Thu, 04 Jan 2018 17:18:58
Message-Id: 1515086243.e0644d07251388ae92b5fedbdcbc0ad0fd6a80ff.leio@gentoo
1 commit: e0644d07251388ae92b5fedbdcbc0ad0fd6a80ff
2 Author: kuzetsa <kuzetsa <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 11 03:45:08 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 17:17:23 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0644d07
7
8 x11-libs/wxGTK: bump to v3.0.3, using gstreamer slot 1.0
9
10 Bug: https://bugs.gentoo.org/629208
11 Closes: https://bugs.gentoo.org/619830
12
13 x11-libs/wxGTK/Manifest | 2 +
14 x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild | 190 +++++++++++++++++++++++++++++++++
15 x11-libs/wxGTK/wxGTK-3.0.3.ebuild | 151 ++++++++++++++++++++++++++
16 3 files changed, 343 insertions(+)
17
18 diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
19 index 70227af228f..7606e383bee 100644
20 --- a/x11-libs/wxGTK/Manifest
21 +++ b/x11-libs/wxGTK/Manifest
22 @@ -1,3 +1,5 @@
23 DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 BLAKE2B 9b6bea6426663b3457764000c3c91a9bdfa85f7e95cae345eb0ba32c3edf59f010738459123423ad68487eadde221dbc3576903b669b9aa674e052b690079de7 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e
24 DIST wxPython-src-2.8.12.1.tar.bz2 31311482 BLAKE2B 33b3feb5f1182948badcd5695b35a68c673e36694a2db8c77b0b031b185c94c9f8bcf4753d9cbf8937e99a72f4c393d6f79850ed3d730af20a7263b97c620386 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3
25 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
26 +DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
27 +DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
28
29 diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
30 new file mode 100644
31 index 00000000000..3ae77564c40
32 --- /dev/null
33 +++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
34 @@ -0,0 +1,190 @@
35 +# Copyright 1999-2017 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI="6"
39 +
40 +inherit autotools multilib-minimal
41 +
42 +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
43 +HOMEPAGE="https://wxwidgets.org/"
44 +
45 +# we use the wxPython tarballs because they include the full wxGTK sources and
46 +# docs, and are released more frequently than wxGTK.
47 +SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
48 + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
49 +
50 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
51 +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
52 +
53 +WXSUBVERSION=${PV}-gtk3 # 3.0.2.0-gtk3
54 +WXVERSION=${WXSUBVERSION%.*} # 3.0.2
55 +WXRELEASE=${WXVERSION%.*}-gtk3 # 3.0-gtk3
56 +WXRELEASE_NODOT=${WXRELEASE//./} # 30-gtk3
57 +
58 +SLOT="${WXRELEASE}"
59 +
60 +RDEPEND="
61 + dev-libs/expat[${MULTILIB_USEDEP}]
62 + sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
63 + X? (
64 + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
65 + media-libs/libpng:0=[${MULTILIB_USEDEP}]
66 + sys-libs/zlib[${MULTILIB_USEDEP}]
67 + virtual/jpeg:0=[${MULTILIB_USEDEP}]
68 + x11-libs/cairo[${MULTILIB_USEDEP}]
69 + x11-libs/gtk+:3[${MULTILIB_USEDEP}]
70 + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
71 + x11-libs/libSM[${MULTILIB_USEDEP}]
72 + x11-libs/libX11[${MULTILIB_USEDEP}]
73 + x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
74 + x11-libs/pango[${MULTILIB_USEDEP}]
75 + gstreamer? (
76 + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
77 + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
78 + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
79 + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
80 + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
81 + webkit? ( net-libs/webkit-gtk:3 )
82 + )
83 + aqua? (
84 + x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
85 + virtual/jpeg:0=[${MULTILIB_USEDEP}]
86 + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
87 + )"
88 +
89 +DEPEND="${RDEPEND}
90 + virtual/pkgconfig[${MULTILIB_USEDEP}]
91 + opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
92 + X? (
93 + x11-proto/xproto[${MULTILIB_USEDEP}]
94 + x11-proto/xineramaproto[${MULTILIB_USEDEP}]
95 + x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
96 + )"
97 +
98 +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
99 +
100 +LICENSE="wxWinLL-3
101 + GPL-2
102 + doc? ( wxWinFDL-3 )"
103 +
104 +S="${WORKDIR}/wxWidgets-${PV}"
105 +
106 +src_prepare() {
107 + default
108 +
109 + local f
110 + for f in $(find "${S}" -name configure.in); do
111 + mv "${f}" "${f/in/ac}" || die
112 + done
113 + AT_M4DIR="${S}/build/aclocal" eautoreconf
114 +
115 + # Versionating
116 + sed -i \
117 + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
118 + -e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
119 + -e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
120 + -e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
121 + -e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}:" \
122 + -e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}:" \
123 + Makefile.in || die
124 +
125 + sed -i \
126 + -e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
127 + utils/wxrc/Makefile.in || die
128 +
129 + sed -i \
130 + -e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
131 + -e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
132 + -e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
133 + -e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
134 + configure || die
135 +}
136 +
137 +multilib_src_configure() {
138 + local myconf
139 +
140 + # X independent options
141 + myconf="
142 + --with-zlib=sys
143 + --with-expat=sys
144 + --enable-compat28
145 + $(use_with sdl)"
146 +
147 + # debug in >=2.9
148 + # there is no longer separate debug libraries (gtk2ud)
149 + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
150 + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
151 + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
152 + # http://docs.wxwidgets.org/3.0/overview_debugging.html
153 + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
154 + use debug \
155 + && myconf="${myconf} --enable-debug=max"
156 +
157 + # wxGTK options
158 + # --enable-graphics_ctx - needed for webkit, editra
159 + # --without-gnomevfs - bug #203389
160 + use X && \
161 + myconf="${myconf}
162 + --enable-graphics_ctx
163 + --with-gtkprint
164 + --enable-gui
165 + --with-gtk=3
166 + --with-libpng=sys
167 + --with-libjpeg=sys
168 + --without-gnomevfs
169 + $(use_enable gstreamer mediactrl)
170 + $(multilib_native_use_enable webkit webview)
171 + $(use_with libnotify)
172 + $(use_with opengl)
173 + $(use_with tiff libtiff sys)"
174 +
175 + use aqua && \
176 + myconf="${myconf}
177 + --enable-graphics_ctx
178 + --enable-gui
179 + --with-libpng=sys
180 + --with-libxpm=sys
181 + --with-libjpeg=sys
182 + --with-mac
183 + --with-opengl"
184 + # cocoa toolkit seems to be broken
185 +
186 + # wxBase options
187 + if use !X && use !aqua ; then
188 + myconf="${myconf}
189 + --disable-gui"
190 + fi
191 +
192 + ECONF_SOURCE="${S}" econf ${myconf}
193 +}
194 +
195 +multilib_src_install_all() {
196 + cd "${S}"/docs || die
197 + dodoc changes.txt readme.txt
198 + newdoc base/readme.txt base_readme.txt
199 + newdoc gtk/readme.txt gtk_readme.txt
200 +
201 + if use doc; then
202 + dodoc -r "${S}"/docs/doxygen/out/html
203 + fi
204 +
205 + # Unversioned links
206 + rm "${D}"/usr/bin/wx{-config,rc}
207 +
208 + # version bakefile presets
209 + pushd "${D}"usr/share/bakefile/presets/ > /dev/null
210 + for f in wx*; do
211 + mv "${f}" "${f/wx/wx30gtk3}"
212 + done
213 + popd > /dev/null
214 +}
215 +
216 +pkg_postinst() {
217 + has_version app-eselect/eselect-wxwidgets \
218 + && eselect wxwidgets update
219 +}
220 +
221 +pkg_postrm() {
222 + has_version app-eselect/eselect-wxwidgets \
223 + && eselect wxwidgets update
224 +}
225
226 diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
227 new file mode 100644
228 index 00000000000..620fd0bcfac
229 --- /dev/null
230 +++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
231 @@ -0,0 +1,151 @@
232 +# Copyright 1999-2017 Gentoo Foundation
233 +# Distributed under the terms of the GNU General Public License v2
234 +
235 +EAPI="5"
236 +
237 +inherit eutils multilib-minimal
238 +
239 +DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
240 +HOMEPAGE="https://wxwidgets.org/"
241 +
242 +# we use the wxPython tarballs because they include the full wxGTK sources and
243 +# docs, and are released more frequently than wxGTK.
244 +SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
245 + doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )"
246 +
247 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
248 +IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
249 +
250 +SLOT="3.0"
251 +
252 +RDEPEND="
253 + dev-libs/expat[${MULTILIB_USEDEP}]
254 + sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
255 + X? (
256 + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
257 + media-libs/libpng:0=[${MULTILIB_USEDEP}]
258 + sys-libs/zlib[${MULTILIB_USEDEP}]
259 + virtual/jpeg:0=[${MULTILIB_USEDEP}]
260 + >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
261 + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
262 + x11-libs/libSM[${MULTILIB_USEDEP}]
263 + x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
264 + x11-libs/pango[${MULTILIB_USEDEP}]
265 + gstreamer? (
266 + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
267 + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
268 + libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
269 + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
270 + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
271 + webkit? ( net-libs/webkit-gtk:2 )
272 + )
273 + aqua? (
274 + x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
275 + virtual/jpeg:0=[${MULTILIB_USEDEP}]
276 + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
277 + )"
278 +
279 +DEPEND="${RDEPEND}
280 + virtual/pkgconfig[${MULTILIB_USEDEP}]
281 + opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
282 + X? (
283 + x11-proto/xproto[${MULTILIB_USEDEP}]
284 + x11-proto/xineramaproto[${MULTILIB_USEDEP}]
285 + x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
286 + )"
287 +
288 +PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
289 +
290 +LICENSE="wxWinLL-3
291 + GPL-2
292 + doc? ( wxWinFDL-3 )"
293 +
294 +S="${WORKDIR}/wxWidgets-${PV}"
295 +
296 +src_prepare() {
297 + epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
298 + epatch_user
299 +}
300 +
301 +multilib_src_configure() {
302 + local myconf
303 +
304 + # X independent options
305 + myconf="
306 + --with-zlib=sys
307 + --with-expat=sys
308 + --enable-compat28
309 + $(use_with sdl)"
310 +
311 + # debug in >=2.9
312 + # there is no longer separate debug libraries (gtk2ud)
313 + # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
314 + # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
315 + # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
316 + # http://docs.wxwidgets.org/3.0/overview_debugging.html
317 + # https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
318 + use debug \
319 + && myconf="${myconf} --enable-debug=max"
320 +
321 + # wxGTK options
322 + # --enable-graphics_ctx - needed for webkit, editra
323 + # --without-gnomevfs - bug #203389
324 + use X && \
325 + myconf="${myconf}
326 + --enable-graphics_ctx
327 + --with-gtkprint
328 + --enable-gui
329 + --with-libpng=sys
330 + --with-libxpm=sys
331 + --with-libjpeg=sys
332 + --without-gnomevfs
333 + $(use_enable gstreamer mediactrl)
334 + $(multilib_native_use_enable webkit webview)
335 + $(use_with libnotify)
336 + $(use_with opengl)
337 + $(use_with tiff libtiff sys)"
338 +
339 + use aqua && \
340 + myconf="${myconf}
341 + --enable-graphics_ctx
342 + --enable-gui
343 + --with-libpng=sys
344 + --with-libxpm=sys
345 + --with-libjpeg=sys
346 + --with-mac
347 + --with-opengl"
348 + # cocoa toolkit seems to be broken
349 +
350 + # wxBase options
351 + if use !X && use !aqua ; then
352 + myconf="${myconf}
353 + --disable-gui"
354 + fi
355 +
356 + ECONF_SOURCE="${S}" econf ${myconf}
357 +}
358 +
359 +multilib_src_install_all() {
360 + cd "${S}"/docs || die
361 + dodoc changes.txt readme.txt
362 + newdoc base/readme.txt base_readme.txt
363 + newdoc gtk/readme.txt gtk_readme.txt
364 +
365 + if use doc; then
366 + dodoc -r "${S}"/docs/doxygen/out/html
367 + fi
368 +
369 + # Stray windows locale file, causes collisions
370 + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
371 + [[ -e ${wxmsw} ]] && rm "${wxmsw}"
372 +}
373 +
374 +pkg_postinst() {
375 + has_version app-eselect/eselect-wxwidgets \
376 + && eselect wxwidgets update
377 +}
378 +
379 +pkg_postrm() {
380 + has_version app-eselect/eselect-wxwidgets \
381 + && eselect wxwidgets update
382 +}