1 |
commit: 2609c818f49e98b940e1eb6a14e4c6964903b8d1 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 13 19:09:10 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 13 19:09:10 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=2609c818 |
7 |
|
8 |
dev-libs/glib: sync |
9 |
|
10 |
Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4 |
11 |
|
12 |
dev-libs/glib/Manifest | 4 +- |
13 |
dev-libs/glib/glib-1.2.10-r6.ebuild | 77 ------------ |
14 |
.../{glib-2.46.2-r1.ebuild => glib-2.52.3.ebuild} | 134 ++++++++++----------- |
15 |
3 files changed, 64 insertions(+), 151 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
18 |
index 76db1b5042..4ec3c10153 100644 |
19 |
--- a/dev-libs/glib/Manifest |
20 |
+++ b/dev-libs/glib/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
DIST 07d4a86e74b9b12a562b57ce5fa3a275bf0fe774.zip 13852 SHA256 decff3d1b7f259154940153cc65994fdc9d6a6ffe32e0e99334fe2163844ac4f SHA512 971a0519b53e066adcce27176bc134f6ccd6660d85113d5be10fa7cd421ef1e089a1780459de63234de618abd68df62d308f409a7097fe6a9e91e20510af40b9 WHIRLPOOL 0d2908fdd3c355479886387fd2619ae16470e971948a1af4a4a499a3d00dcbaeaf3b0dbe6115f06eca74bb99a40ce5e670bc8c14a1deb15450fd4a06aa642320 |
23 |
-DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 3bb8c45706f97b526da851061c89618bc258fa61f9100802c1340548e4bb2731 SHA512 e65c7f66254eae22deaa67bf621ebd1d7af897b93d93ba6cffaa4ce9894cf14c140e6888d877b6b36fcea8be1b8d1ef4fcc7ec1719bd23b1cc6fd662876c70ae WHIRLPOOL 20254678a86595353058ee8dc81a02e4ae7bb16ba9ba34e036fe2e99d3fffa25c825f8961bdeb5fa50c49582ce37e65684e414631c74653c4523c2baee34c341 |
24 |
-DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8 WHIRLPOOL 478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca |
25 |
-DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb |
26 |
DIST glib-2.50.2.tar.xz 7582312 SHA256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 SHA512 63d7b5ece8d7d15b10e06ef10a8e0a4446f30a8d9c97daa3352ec00dfef622728bd42ed24cbf67e553166a0f9e29a3e3d024d1d085b9804fd67608db438b6771 WHIRLPOOL f7a005c0ad0edd0a9010aec60c4df907f79c45948b7bb583d70c378557c2a2f63383ebbaded9074b319a669bdf0532d78ce41a4f98d80d53a3a151a4a69be2a2 |
27 |
+DIST glib-2.52.3.tar.xz 7679972 SHA256 25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 WHIRLPOOL 733ab64abbd60c633833d662d6b58e011478f85d1b0ab48a4af4cbe79e6c9973ccc86247dec2897a0c7663edeee516a3f034c14ac9b5e7a3dba97a04a88298f0 |
28 |
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 |
29 |
|
30 |
diff --git a/dev-libs/glib/glib-1.2.10-r6.ebuild b/dev-libs/glib/glib-1.2.10-r6.ebuild |
31 |
deleted file mode 100644 |
32 |
index 4a098907d4..0000000000 |
33 |
--- a/dev-libs/glib/glib-1.2.10-r6.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,77 +0,0 @@ |
36 |
-# Copyright 1999-2015 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r6.ebuild,v 1.8 2015/07/17 15:32:53 ago Exp $ |
39 |
- |
40 |
-EAPI=5 |
41 |
-GNOME_TARBALL_SUFFIX="gz" |
42 |
-GNOME2_LA_PUNT="yes" |
43 |
- |
44 |
-inherit autotools eutils gnome2 libtool flag-o-matic portability multilib-minimal |
45 |
- |
46 |
-DESCRIPTION="The GLib library of C routines" |
47 |
-HOMEPAGE="http://www.gtk.org/" |
48 |
-SRC_URI="${SRC_URI} |
49 |
- mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2 |
50 |
-" |
51 |
- |
52 |
-LICENSE="LGPL-2.1+" |
53 |
-SLOT="1" |
54 |
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" |
55 |
-IUSE="hardened static-libs" |
56 |
- |
57 |
-DEPEND="" |
58 |
-RDEPEND="" |
59 |
- |
60 |
-MULTILIB_CHOST_TOOLS=(/usr/bin/glib-config) |
61 |
- |
62 |
-src_prepare() { |
63 |
- epatch "${FILESDIR}"/${P}-automake.patch |
64 |
- epatch "${FILESDIR}"/${P}-m4.patch |
65 |
- epatch "${FILESDIR}"/${P}-configure-LANG.patch #133679 |
66 |
- |
67 |
- # Allow glib to build with gcc-3.4.x #47047 |
68 |
- epatch "${FILESDIR}"/${P}-gcc34-fix.patch |
69 |
- |
70 |
- # Fix for -Wl,--as-needed (bug #133818) |
71 |
- epatch "${DISTDIR}"/glib-1.2.10-r1-as-needed.patch.bz2 |
72 |
- |
73 |
- # build failure with automake-1.13 |
74 |
- epatch "${FILESDIR}/${P}-automake-1.13.patch" |
75 |
- |
76 |
- use ppc64 && use hardened && replace-flags -O[2-3] -O1 |
77 |
- sed -i "/libglib_la_LDFLAGS/i libglib_la_LIBADD = $(dlopen_lib)" Makefile.am || die |
78 |
- |
79 |
- rm -f acinclude.m4 #168198 |
80 |
- |
81 |
- mv configure.in configure.ac || die |
82 |
- |
83 |
- eautoreconf |
84 |
- elibtoolize |
85 |
- gnome2_src_prepare |
86 |
-} |
87 |
- |
88 |
-multilib_src_configure() { |
89 |
- # Bug 48839: pam fails to build on ia64 |
90 |
- # The problem is that it attempts to link a shared object against |
91 |
- # libglib.a; this library needs to be built with -fPIC. Since |
92 |
- # this package doesn't contain any significant binaries, build the |
93 |
- # whole thing with -fPIC (23 Apr 2004 agriffis) |
94 |
- append-flags -fPIC |
95 |
- |
96 |
- ECONF_SOURCE="${S}" \ |
97 |
- gnome2_src_configure \ |
98 |
- --with-threads=posix \ |
99 |
- --enable-debug=yes \ |
100 |
- $(use_enable static-libs static) |
101 |
-} |
102 |
- |
103 |
-multilib_src_install() { |
104 |
- gnome2_src_install |
105 |
- |
106 |
- chmod 755 "${ED}"/usr/$(get_libdir)/libgmodule-1.2.so.* || die |
107 |
-} |
108 |
- |
109 |
-multilib_src_install_all() { |
110 |
- einstalldocs |
111 |
- dohtml -r docs |
112 |
-} |
113 |
|
114 |
diff --git a/dev-libs/glib/glib-2.46.2-r1.ebuild b/dev-libs/glib/glib-2.52.3.ebuild |
115 |
similarity index 69% |
116 |
rename from dev-libs/glib/glib-2.46.2-r1.ebuild |
117 |
rename to dev-libs/glib/glib-2.52.3.ebuild |
118 |
index 779e00a982..29b94af7ff 100644 |
119 |
--- a/dev-libs/glib/glib-2.46.2-r1.ebuild |
120 |
+++ b/dev-libs/glib/glib-2.52.3.ebuild |
121 |
@@ -1,60 +1,57 @@ |
122 |
# Copyright 1999-2017 Gentoo Foundation |
123 |
# Distributed under the terms of the GNU General Public License v2 |
124 |
-# $Id$ |
125 |
|
126 |
# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
127 |
# adding new dependencies end up making stage3 to grow. Every addition needs |
128 |
# then to be think very closely. |
129 |
|
130 |
-EAPI="5" |
131 |
+EAPI=6 |
132 |
PYTHON_COMPAT=( python2_7 ) |
133 |
-# Building with --disable-debug highly unrecommended. It will build glib in |
134 |
-# an unusable form as it disables some commonly used API. Please do not |
135 |
-# convert this to the use_enable form, as it results in a broken build. |
136 |
-GCONF_DEBUG="yes" |
137 |
# Completely useless with or without USE static-libs, people need to use |
138 |
# pkg-config |
139 |
GNOME2_LA_PUNT="yes" |
140 |
|
141 |
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \ |
142 |
- pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal |
143 |
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
144 |
+ multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
145 |
|
146 |
DESCRIPTION="The GLib library of C routines" |
147 |
-HOMEPAGE="http://www.gtk.org/" |
148 |
+HOMEPAGE="https://www.gtk.org/" |
149 |
SRC_URI="${SRC_URI} |
150 |
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
151 |
- |
152 |
+ https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
153 |
CYGWINPORTS_GITREV="07d4a86e74b9b12a562b57ce5fa3a275bf0fe774" |
154 |
|
155 |
[[ -n ${CYGWINPORTS_GITREV} ]] && |
156 |
SRC_URI+=" elibc_Cygwin? ( https://github.com/cygwinports/glib2.0/archive/${CYGWINPORTS_GITREV}.zip )" |
157 |
|
158 |
-LICENSE="LGPL-2+" |
159 |
+LICENSE="LGPL-2.1+" |
160 |
SLOT="2" |
161 |
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
162 |
+IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
163 |
REQUIRED_USE=" |
164 |
utils? ( ${PYTHON_REQUIRED_USE} ) |
165 |
test? ( ${PYTHON_REQUIRED_USE} ) |
166 |
" |
167 |
|
168 |
-KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
169 |
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" |
170 |
+ |
171 |
+# Added util-linux multilib dependency to have libmount support (which |
172 |
+# is always turned on on linux systems, unless explicitly disabled, but |
173 |
+# this ebuild does not do that anyway) (bug #599586) |
174 |
|
175 |
RDEPEND=" |
176 |
!<dev-util/gdbus-codegen-${PV} |
177 |
+ >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
178 |
>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
179 |
>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
180 |
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
181 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
182 |
+ kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
183 |
selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
184 |
xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
185 |
fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
186 |
utils? ( |
187 |
${PYTHON_DEPS} |
188 |
>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
189 |
- kernel_linux? ( || ( |
190 |
- >=dev-libs/elfutils-0.142 |
191 |
- >=dev-libs/libelf-0.8.12 |
192 |
- >=sys-freebsd/freebsd-lib-9.2_rc1 |
193 |
- ) ) |
194 |
+ virtual/libelf:0= |
195 |
) |
196 |
" |
197 |
DEPEND="${RDEPEND} |
198 |
@@ -70,9 +67,6 @@ DEPEND="${RDEPEND} |
199 |
>=sys-apps/dbus-1.2.14 ) |
200 |
!<dev-util/gtk-doc-1.15-r2 |
201 |
" |
202 |
-# gobject-introspection blocker to ensure people don't mix |
203 |
-# different g-i and glib major versions |
204 |
- |
205 |
PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
206 |
dbus? ( gnome-base/dconf ) |
207 |
mime? ( x11-misc/shared-mime-info ) |
208 |
@@ -82,13 +76,13 @@ PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
209 |
# Earlier versions of gvfs do not work with glib |
210 |
|
211 |
MULTILIB_CHOST_TOOLS=( |
212 |
- /usr/bin/gio-querymodules |
213 |
+ /usr/bin/gio-querymodules$(get_exeext) |
214 |
) |
215 |
|
216 |
pkg_setup() { |
217 |
if use kernel_linux ; then |
218 |
CONFIG_CHECK="~INOTIFY_USER" |
219 |
- if use test; then |
220 |
+ if use test ; then |
221 |
CONFIG_CHECK="~IPV6" |
222 |
WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
223 |
fi |
224 |
@@ -116,40 +110,23 @@ src_prepare() { |
225 |
sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
226 |
fi |
227 |
|
228 |
- # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 |
229 |
- if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then |
230 |
- ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" |
231 |
- ewarn "not being present on your system, think on installing them to get these tests run." |
232 |
- sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die |
233 |
- sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die |
234 |
- sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die |
235 |
- sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die |
236 |
- sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die |
237 |
- sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die |
238 |
- sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die |
239 |
- # needed to prevent gdbus-threading from asserting |
240 |
- ln -sfn $(type -P true) gio/tests/gdbus-testserver.py |
241 |
- fi |
242 |
- |
243 |
- # Some tests need ipv6, upstream bug #667468 |
244 |
- # https://bugs.gentoo.org/show_bug.cgi?id=508752 |
245 |
- if [[ ! -f /proc/net/if_net6 ]]; then |
246 |
- sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die |
247 |
- sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die |
248 |
- sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die |
249 |
- fi |
250 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
251 |
+ sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
252 |
+ sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
253 |
|
254 |
- # This test is prone to fail, bug #504024, upstream bug #723719 |
255 |
- sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die |
256 |
+ ewarn "Tests for search-utils have been skipped" |
257 |
+ sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
258 |
else |
259 |
# Don't build tests, also prevents extra deps, bug #512022 |
260 |
sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
261 |
fi |
262 |
|
263 |
# gdbus-codegen is a separate package |
264 |
- epatch "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch |
265 |
+ eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch |
266 |
|
267 |
- # leave python shebang alone |
268 |
+ # Leave python shebang alone - handled by python_replicate_script |
269 |
+ # We could call python_setup and give configure a valid --with-python |
270 |
+ # arg, but that would mean a build dep on python when USE=utils. |
271 |
sed -e '/${PYTHON}/d' \ |
272 |
-i glib/Makefile.{am,in} || die |
273 |
|
274 |
@@ -159,12 +136,12 @@ src_prepare() { |
275 |
eval "$(sed -ne '/PATCH_URI="/,/"/p' < "${d}"/glib2.0.cygport)" |
276 |
echo ${PATCH_URI} |
277 |
); do |
278 |
+ # Cygwin hasn't updated to 2.50.2 yet, which has patches merged. |
279 |
+ [[ ${p} == 2.46-glocalfilemonitor.patch ]] && continue |
280 |
epatch "${d}/${p}" |
281 |
done |
282 |
fi |
283 |
|
284 |
- epatch_user |
285 |
- |
286 |
# make default sane for us |
287 |
if use prefix ; then |
288 |
sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die |
289 |
@@ -172,6 +149,16 @@ src_prepare() { |
290 |
export PERL=perl |
291 |
fi |
292 |
|
293 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
294 |
+ # fix standards conflicts |
295 |
+ sed -i \ |
296 |
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \ |
297 |
+ -e '/\<_XOPEN_SOURCE\>/s/ 2,/600,/' \ |
298 |
+ configure.ac || die |
299 |
+ sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ |
300 |
+ glib/giounix.c || die |
301 |
+ fi |
302 |
+ |
303 |
# Also needed to prevent cross-compile failures, see bug #267603 |
304 |
eautoreconf |
305 |
|
306 |
@@ -189,8 +176,10 @@ multilib_src_configure() { |
307 |
export DBUS1_CFLAGS="-I${EPREFIX}/usr/include/dbus-1.0 -I${EPREFIX}/usr/$(get_libdir)/dbus-1.0/include" |
308 |
export DBUS1_LIBS="-ldbus-1" |
309 |
fi |
310 |
- export LIBFFI_CFLAGS="-I$(echo "${EPREFIX}"/usr/$(get_libdir)/libffi-*/include)" |
311 |
+ export LIBFFI_CFLAGS="-I$(echo ${EPREFIX}/usr/$(get_libdir)/libffi-*/include)" |
312 |
export LIBFFI_LIBS="-lffi" |
313 |
+ export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
314 |
+ export PCRE_LIBS="-lpcre" |
315 |
fi |
316 |
|
317 |
# These configure tests don't work when cross-compiling. |
318 |
@@ -223,12 +212,12 @@ multilib_src_configure() { |
319 |
append-libs "-L${EPREFIX}/usr/$(get_libdir)" |
320 |
fi |
321 |
|
322 |
- # FIXME: Always use internal libpcre, bug #254659 |
323 |
- # (maybe consider going back to system lib) |
324 |
# libelf used only by the gresource bin |
325 |
ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
326 |
+ $(usex debug --enable-debug=yes ' ') \ |
327 |
$(use_enable xattr) \ |
328 |
$(use_enable fam) \ |
329 |
+ $(use_enable kernel_linux libmount) \ |
330 |
$(use_enable selinux) \ |
331 |
$(use_enable static-libs static) \ |
332 |
$(use_enable systemtap dtrace) \ |
333 |
@@ -236,7 +225,7 @@ multilib_src_configure() { |
334 |
$(multilib_native_use_enable utils libelf) \ |
335 |
--disable-compile-warnings \ |
336 |
--enable-man \ |
337 |
- --with-pcre=internal \ |
338 |
+ --with-pcre=system \ |
339 |
--with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
340 |
|
341 |
if multilib_is_native_abi; then |
342 |
@@ -249,10 +238,11 @@ multilib_src_configure() { |
343 |
|
344 |
multilib_src_test() { |
345 |
export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg |
346 |
- export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:"${EPREFIX}"/usr/share |
347 |
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:/usr/share |
348 |
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
349 |
export LC_TIME=C # bug #411967 |
350 |
- python_export_best |
351 |
+ unset GSETTINGS_BACKEND # bug #596380 |
352 |
+ python_setup |
353 |
|
354 |
# Related test is a bit nitpicking |
355 |
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
356 |
@@ -265,7 +255,7 @@ multilib_src_test() { |
357 |
fi |
358 |
|
359 |
# Need X for dbus-launch session X11 initialization |
360 |
- Xemake check |
361 |
+ virtx emake check |
362 |
} |
363 |
|
364 |
multilib_src_install() { |
365 |
@@ -274,7 +264,6 @@ multilib_src_install() { |
366 |
} |
367 |
|
368 |
multilib_src_install_all() { |
369 |
- DOCS="AUTHORS ChangeLog* NEWS* README" |
370 |
einstalldocs |
371 |
|
372 |
if use utils ; then |
373 |
@@ -305,7 +294,7 @@ pkg_preinst() { |
374 |
|
375 |
multilib_pkg_preinst() { |
376 |
# Make giomodule.cache belong to glib alone |
377 |
- local cache="usr/$(get_libdir)/gio/giomodule.cache" |
378 |
+ local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
379 |
|
380 |
if [[ -e ${EROOT}${cache} ]]; then |
381 |
cp "${EROOT}"${cache} "${ED}"/${cache} || die |
382 |
@@ -314,7 +303,11 @@ pkg_preinst() { |
383 |
fi |
384 |
} |
385 |
|
386 |
- multilib_foreach_abi multilib_pkg_preinst |
387 |
+ # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
388 |
+ # file due to inability to create it and GIO might not look at any of the modules there |
389 |
+ if ! tc-is-cross-compiler ; then |
390 |
+ multilib_foreach_abi multilib_pkg_preinst |
391 |
+ fi |
392 |
} |
393 |
|
394 |
pkg_postinst() { |
395 |
@@ -327,14 +320,13 @@ pkg_postinst() { |
396 |
gnome2_giomodule_cache_update \ |
397 |
|| die "Update GIO modules cache failed (for ${ABI})" |
398 |
} |
399 |
- multilib_foreach_abi multilib_pkg_postinst |
400 |
- |
401 |
- if has_version '<x11-libs/gtk+-3.0.12:3'; then |
402 |
- # To have a clear upgrade path for gtk+-3.0.x users, have to resort to |
403 |
- # a warning instead of a blocker |
404 |
- ewarn |
405 |
- ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes." |
406 |
- ewarn "You should upgrade to a newer version of gtk+:3 immediately." |
407 |
+ if ! tc-is-cross-compiler ; then |
408 |
+ multilib_foreach_abi multilib_pkg_postinst |
409 |
+ else |
410 |
+ ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
411 |
+ ewarn "You might want to run gio-querymodules manually on the target for" |
412 |
+ ewarn "your final image for performance reasons and re-run it when packages" |
413 |
+ ewarn "installing GIO modules get upgraded or added to the image." |
414 |
fi |
415 |
} |
416 |
|
417 |
@@ -343,7 +335,7 @@ pkg_postrm() { |
418 |
|
419 |
if [[ -z ${REPLACED_BY_VERSION} ]]; then |
420 |
multilib_pkg_postrm() { |
421 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache |
422 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
423 |
} |
424 |
multilib_foreach_abi multilib_pkg_postrm |
425 |
rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |