1 |
commit: 3beb1e16ab710d0c017a3171a0d58f2b16196de5 |
2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
3 |
AuthorDate: Sat Aug 18 06:41:07 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 18 09:51:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3beb1e16 |
7 |
|
8 |
dev-libs/glib: remove old and sync PYTHON_COMP |
9 |
|
10 |
.../files/glib-2.50.3-fix-gdatetime-tests.patch | 52 ---- |
11 |
dev-libs/glib/glib-2.50.3-r1.ebuild | 308 --------------------- |
12 |
dev-libs/glib/glib-2.54.3-r6.ebuild | 2 +- |
13 |
3 files changed, 1 insertion(+), 361 deletions(-) |
14 |
|
15 |
diff --git a/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch b/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch |
16 |
deleted file mode 100644 |
17 |
index 6c41c5c..0000000 |
18 |
--- a/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch |
19 |
+++ /dev/null |
20 |
@@ -1,52 +0,0 @@ |
21 |
-From ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4 Mon Sep 17 00:00:00 2001 |
22 |
-From: Iain Lane <iain@××××××××××××××××.uk> |
23 |
-Date: Mon, 13 Mar 2017 16:52:11 +0000 |
24 |
-Subject: [PATCH] tests/gdatetime: Use a real rather than invented timezone |
25 |
- |
26 |
-The tzdata maintainers had previously invented abbreviations for |
27 |
-timezones. As of their 2017a release, the one we were testing ("BRT") |
28 |
-has been dropped. |
29 |
- |
30 |
-Switch to testing PST, which is a real timezone abbreviation. |
31 |
- |
32 |
-https://bugzilla.gnome.org/show_bug.cgi?id=779799 |
33 |
---- |
34 |
- glib/tests/gdatetime.c | 12 ++++++------ |
35 |
- 1 file changed, 6 insertions(+), 6 deletions(-) |
36 |
- |
37 |
-diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c |
38 |
-index dcb8a8f..c54031d 100644 |
39 |
---- a/glib/tests/gdatetime.c |
40 |
-+++ b/glib/tests/gdatetime.c |
41 |
-@@ -635,22 +635,22 @@ test_GDateTime_new_full (void) |
42 |
- g_date_time_unref (dt); |
43 |
- |
44 |
- #ifdef G_OS_UNIX |
45 |
-- tz = g_time_zone_new ("America/Recife"); |
46 |
-+ tz = g_time_zone_new ("America/Tijuana"); |
47 |
- #elif defined G_OS_WIN32 |
48 |
-- tz = g_time_zone_new ("E. South America Standard Time"); |
49 |
-+ tz = g_time_zone_new ("Pacific Standard Time"); |
50 |
- #endif |
51 |
-- dt = g_date_time_new (tz, 2010, 5, 24, 8, 4, 0); |
52 |
-+ dt = g_date_time_new (tz, 2010, 11, 24, 8, 4, 0); |
53 |
- g_time_zone_unref (tz); |
54 |
- g_assert_cmpint (2010, ==, g_date_time_get_year (dt)); |
55 |
-- g_assert_cmpint (5, ==, g_date_time_get_month (dt)); |
56 |
-+ g_assert_cmpint (11, ==, g_date_time_get_month (dt)); |
57 |
- g_assert_cmpint (24, ==, g_date_time_get_day_of_month (dt)); |
58 |
- g_assert_cmpint (8, ==, g_date_time_get_hour (dt)); |
59 |
- g_assert_cmpint (4, ==, g_date_time_get_minute (dt)); |
60 |
- g_assert_cmpint (0, ==, g_date_time_get_second (dt)); |
61 |
- #ifdef G_OS_UNIX |
62 |
-- g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt)); |
63 |
-+ g_assert_cmpstr ("PST", ==, g_date_time_get_timezone_abbreviation (dt)); |
64 |
- #elif defined G_OS_WIN32 |
65 |
-- g_assert_cmpstr ("E. South America Standard Time", ==, |
66 |
-+ g_assert_cmpstr ("Pacific Standard Time", ==, |
67 |
- g_date_time_get_timezone_abbreviation (dt)); |
68 |
- #endif |
69 |
- g_assert (!g_date_time_is_daylight_savings (dt)); |
70 |
--- |
71 |
-2.10.1 |
72 |
- |
73 |
|
74 |
diff --git a/dev-libs/glib/glib-2.50.3-r1.ebuild b/dev-libs/glib/glib-2.50.3-r1.ebuild |
75 |
deleted file mode 100644 |
76 |
index 28b779a..0000000 |
77 |
--- a/dev-libs/glib/glib-2.50.3-r1.ebuild |
78 |
+++ /dev/null |
79 |
@@ -1,308 +0,0 @@ |
80 |
-# Copyright 1999-2017 Gentoo Foundation |
81 |
-# Distributed under the terms of the GNU General Public License v2 |
82 |
- |
83 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
84 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
85 |
-# then to be think very closely. |
86 |
- |
87 |
-EAPI=6 |
88 |
-PYTHON_COMPAT=( python2_7 ) |
89 |
-# Completely useless with or without USE static-libs, people need to use |
90 |
-# pkg-config |
91 |
-GNOME2_LA_PUNT="yes" |
92 |
- |
93 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
94 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
95 |
- |
96 |
-DESCRIPTION="The GLib library of C routines" |
97 |
-HOMEPAGE="https://www.gtk.org/" |
98 |
-SRC_URI="${SRC_URI} |
99 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
100 |
- |
101 |
-LICENSE="LGPL-2+" |
102 |
-SLOT="2" |
103 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
104 |
-REQUIRED_USE=" |
105 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
106 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
107 |
-" |
108 |
- |
109 |
-KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sh sparc x86" |
110 |
- |
111 |
-# Added util-linux multilib dependency to have libmount support (which |
112 |
-# is always turned on on linux systems, unless explicitly disabled, but |
113 |
-# this ebuild does not do that anyway) (bug #599586) |
114 |
- |
115 |
-RDEPEND=" |
116 |
- !<dev-util/gdbus-codegen-${PV} |
117 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
118 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
119 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
120 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
121 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
122 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
123 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
124 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
125 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
126 |
- utils? ( |
127 |
- ${PYTHON_DEPS} |
128 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
129 |
- virtual/libelf:0= |
130 |
- ) |
131 |
-" |
132 |
-DEPEND="${RDEPEND} |
133 |
- app-text/docbook-xml-dtd:4.1.2 |
134 |
- >=dev-libs/libxslt-1.0 |
135 |
- >=sys-devel/gettext-0.11 |
136 |
- >=dev-util/gtk-doc-am-1.20 |
137 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
138 |
- test? ( |
139 |
- sys-devel/gdb |
140 |
- ${PYTHON_DEPS} |
141 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
142 |
- >=sys-apps/dbus-1.2.14 ) |
143 |
- !<dev-util/gtk-doc-1.15-r2 |
144 |
-" |
145 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
146 |
- dbus? ( gnome-base/dconf ) |
147 |
- mime? ( x11-misc/shared-mime-info ) |
148 |
-" |
149 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
150 |
-# dconf is needed to be able to save settings, bug #498436 |
151 |
-# Earlier versions of gvfs do not work with glib |
152 |
- |
153 |
-MULTILIB_CHOST_TOOLS=( |
154 |
- /usr/bin/gio-querymodules$(get_exeext) |
155 |
-) |
156 |
- |
157 |
-pkg_setup() { |
158 |
- if use kernel_linux ; then |
159 |
- CONFIG_CHECK="~INOTIFY_USER" |
160 |
- if use test ; then |
161 |
- CONFIG_CHECK="~IPV6" |
162 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
163 |
- fi |
164 |
- linux-info_pkg_setup |
165 |
- fi |
166 |
-} |
167 |
- |
168 |
-src_prepare() { |
169 |
- |
170 |
- # Fix for MUSL |
171 |
- eapply "${FILESDIR}"/quark_init_on_demand.patch |
172 |
- eapply "${FILESDIR}"/gobject_init_on_demand.patch |
173 |
- |
174 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
175 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
176 |
- |
177 |
- if use test; then |
178 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
179 |
- if ! has_version dev-util/desktop-file-utils ; then |
180 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
181 |
- ewarn "think on installing it to get these tests run." |
182 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
183 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
184 |
- fi |
185 |
- |
186 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
187 |
- # other), falling back to xterm if one doesn't exist |
188 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
189 |
- ewarn "Some tests will be skipped due to missing terminal program" |
190 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
191 |
- fi |
192 |
- |
193 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
194 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
195 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
196 |
- |
197 |
- ewarn "Tests for search-utils have been skipped" |
198 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
199 |
- else |
200 |
- # Don't build tests, also prevents extra deps, bug #512022 |
201 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
202 |
- fi |
203 |
- |
204 |
- # Fix tests with timezone-data-2017a and newer |
205 |
- eapply "${FILESDIR}"/${P}-fix-gdatetime-tests.patch |
206 |
- |
207 |
- # gdbus-codegen is a separate package |
208 |
- eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch |
209 |
- |
210 |
- # Leave python shebang alone - handled by python_replicate_script |
211 |
- # We could call python_setup and give configure a valid --with-python |
212 |
- # arg, but that would mean a build dep on python when USE=utils. |
213 |
- sed -e '/${PYTHON}/d' \ |
214 |
- -i glib/Makefile.{am,in} || die |
215 |
- |
216 |
- # Also needed to prevent cross-compile failures, see bug #267603 |
217 |
- eautoreconf |
218 |
- |
219 |
- gnome2_src_prepare |
220 |
- |
221 |
- epunt_cxx |
222 |
-} |
223 |
- |
224 |
-multilib_src_configure() { |
225 |
- # Avoid circular depend with dev-util/pkgconfig and |
226 |
- # native builds (cross-compiles won't need pkg-config |
227 |
- # in the target ROOT to work here) |
228 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
229 |
- if has_version sys-apps/dbus; then |
230 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
231 |
- export DBUS1_LIBS="-ldbus-1" |
232 |
- fi |
233 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
234 |
- export LIBFFI_LIBS="-lffi" |
235 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
236 |
- export PCRE_LIBS="-lpcre" |
237 |
- fi |
238 |
- |
239 |
- # These configure tests don't work when cross-compiling. |
240 |
- if tc-is-cross-compiler ; then |
241 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
242 |
- case ${CHOST} in |
243 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
244 |
- *) export glib_cv_stack_grows=no ;; |
245 |
- esac |
246 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
247 |
- export glib_cv_uscore=no |
248 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
249 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
250 |
- fi |
251 |
- |
252 |
- local myconf |
253 |
- |
254 |
- case "${CHOST}" in |
255 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
256 |
- *) myconf="${myconf} --with-threads=posix" ;; |
257 |
- esac |
258 |
- |
259 |
- # libelf used only by the gresource bin |
260 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
261 |
- $(usex debug --enable-debug=yes ' ') \ |
262 |
- $(use_enable xattr) \ |
263 |
- $(use_enable fam) \ |
264 |
- $(use_enable kernel_linux libmount) \ |
265 |
- $(use_enable selinux) \ |
266 |
- $(use_enable static-libs static) \ |
267 |
- $(use_enable systemtap dtrace) \ |
268 |
- $(use_enable systemtap systemtap) \ |
269 |
- $(multilib_native_use_enable utils libelf) \ |
270 |
- --disable-compile-warnings \ |
271 |
- --enable-man \ |
272 |
- --with-pcre=system \ |
273 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
274 |
- |
275 |
- if multilib_is_native_abi; then |
276 |
- local d |
277 |
- for d in glib gio gobject; do |
278 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
279 |
- done |
280 |
- fi |
281 |
-} |
282 |
- |
283 |
-multilib_src_test() { |
284 |
- export XDG_CONFIG_DIRS=/etc/xdg |
285 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
286 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
287 |
- export LC_TIME=C # bug #411967 |
288 |
- unset GSETTINGS_BACKEND # bug #596380 |
289 |
- python_setup |
290 |
- |
291 |
- # Related test is a bit nitpicking |
292 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
293 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
294 |
- |
295 |
- # Hardened: gdb needs this, bug #338891 |
296 |
- if host-is-pax ; then |
297 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
298 |
- || die "Hardened adjustment failed" |
299 |
- fi |
300 |
- |
301 |
- # Need X for dbus-launch session X11 initialization |
302 |
- virtx emake check |
303 |
-} |
304 |
- |
305 |
-multilib_src_install() { |
306 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
307 |
- keepdir /usr/$(get_libdir)/gio/modules |
308 |
-} |
309 |
- |
310 |
-multilib_src_install_all() { |
311 |
- einstalldocs |
312 |
- |
313 |
- if use utils ; then |
314 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
315 |
- else |
316 |
- rm "${ED}usr/bin/gtester-report" |
317 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
318 |
- fi |
319 |
- |
320 |
- # Do not install charset.alias even if generated, leave it to libiconv |
321 |
- rm -f "${ED}/usr/lib/charset.alias" |
322 |
- |
323 |
- # Don't install gdb python macros, bug 291328 |
324 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
325 |
-} |
326 |
- |
327 |
-pkg_preinst() { |
328 |
- gnome2_pkg_preinst |
329 |
- |
330 |
- # Make gschemas.compiled belong to glib alone |
331 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
332 |
- |
333 |
- if [[ -e ${EROOT}${cache} ]]; then |
334 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
335 |
- else |
336 |
- touch "${ED}"/${cache} || die |
337 |
- fi |
338 |
- |
339 |
- multilib_pkg_preinst() { |
340 |
- # Make giomodule.cache belong to glib alone |
341 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
342 |
- |
343 |
- if [[ -e ${EROOT}${cache} ]]; then |
344 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
345 |
- else |
346 |
- touch "${ED}"/${cache} || die |
347 |
- fi |
348 |
- } |
349 |
- |
350 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
351 |
- # file due to inability to create it and GIO might not look at any of the modules there |
352 |
- if ! tc-is-cross-compiler ; then |
353 |
- multilib_foreach_abi multilib_pkg_preinst |
354 |
- fi |
355 |
-} |
356 |
- |
357 |
-pkg_postinst() { |
358 |
- # force (re)generation of gschemas.compiled |
359 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
360 |
- |
361 |
- gnome2_pkg_postinst |
362 |
- |
363 |
- multilib_pkg_postinst() { |
364 |
- gnome2_giomodule_cache_update \ |
365 |
- || die "Update GIO modules cache failed (for ${ABI})" |
366 |
- } |
367 |
- if ! tc-is-cross-compiler ; then |
368 |
- multilib_foreach_abi multilib_pkg_postinst |
369 |
- else |
370 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
371 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
372 |
- ewarn "your final image for performance reasons and re-run it when packages" |
373 |
- ewarn "installing GIO modules get upgraded or added to the image." |
374 |
- fi |
375 |
-} |
376 |
- |
377 |
-pkg_postrm() { |
378 |
- gnome2_pkg_postrm |
379 |
- |
380 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
381 |
- multilib_pkg_postrm() { |
382 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
383 |
- } |
384 |
- multilib_foreach_abi multilib_pkg_postrm |
385 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
386 |
- fi |
387 |
-} |
388 |
|
389 |
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild |
390 |
index 9f47cc2..4521ac0 100644 |
391 |
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild |
392 |
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild |
393 |
@@ -6,7 +6,7 @@ |
394 |
# then to be think very closely. |
395 |
|
396 |
EAPI=6 |
397 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
398 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
399 |
# Completely useless with or without USE static-libs, people need to use |
400 |
# pkg-config |
401 |
GNOME2_LA_PUNT="yes" |