1 |
commit: 1da5a8642ad5161199cd030992b832c25652d409 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 21 14:34:38 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 21 15:15:52 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da5a864 |
7 |
|
8 |
dev-libs/glib: bump to 2.58.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
dev-libs/glib/Manifest | 1 + |
14 |
dev-libs/glib/glib-2.58.3.ebuild | 310 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 311 insertions(+) |
16 |
|
17 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
18 |
index 81581ccb1f0..8bef3f8d337 100644 |
19 |
--- a/dev-libs/glib/Manifest |
20 |
+++ b/dev-libs/glib/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 |
23 |
DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a |
24 |
+DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce |
25 |
DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 |
26 |
|
27 |
diff --git a/dev-libs/glib/glib-2.58.3.ebuild b/dev-libs/glib/glib-2.58.3.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..a75e06def72 |
30 |
--- /dev/null |
31 |
+++ b/dev-libs/glib/glib-2.58.3.ebuild |
32 |
@@ -0,0 +1,310 @@ |
33 |
+# Copyright 1999-2019 Gentoo Authors |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=6 |
37 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
38 |
+GNOME2_EAUTORECONF=yes |
39 |
+ |
40 |
+inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
41 |
+ multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx |
42 |
+ |
43 |
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
44 |
+# adding new dependencies end up making stage3 to grow. Every addition needs |
45 |
+# then to be think very closely. |
46 |
+ |
47 |
+DESCRIPTION="The GLib library of C routines" |
48 |
+HOMEPAGE="https://www.gtk.org/" |
49 |
+SRC_URI="${SRC_URI} |
50 |
+ https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
51 |
+ |
52 |
+LICENSE="LGPL-2.1+" |
53 |
+SLOT="2" |
54 |
+IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr" |
55 |
+ |
56 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
57 |
+ |
58 |
+# Added util-linux multilib dependency to have libmount support (which |
59 |
+# is always turned on on linux systems, unless explicitly disabled, but |
60 |
+# this ebuild does not do that anyway) (bug #599586) |
61 |
+ |
62 |
+RDEPEND=" |
63 |
+ !<dev-util/gdbus-codegen-${PV} |
64 |
+ >=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?] |
65 |
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
66 |
+ >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] |
67 |
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
68 |
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
69 |
+ kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) |
70 |
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
71 |
+ xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
72 |
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
73 |
+ utils? ( |
74 |
+ >=dev-util/gdbus-codegen-${PV} |
75 |
+ virtual/libelf:0= |
76 |
+ ) |
77 |
+" |
78 |
+DEPEND="${RDEPEND} |
79 |
+ app-text/docbook-xml-dtd:4.1.2 |
80 |
+ app-text/docbook-xsl-stylesheets |
81 |
+ >=dev-libs/libxslt-1.0 |
82 |
+ >=sys-devel/gettext-0.11 |
83 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.20 ) |
84 |
+ systemtap? ( >=dev-util/systemtap-1.3 ) |
85 |
+ ${PYTHON_DEPS} |
86 |
+ test? ( |
87 |
+ sys-devel/gdb |
88 |
+ >=dev-util/gdbus-codegen-${PV} |
89 |
+ >=sys-apps/dbus-1.2.14 ) |
90 |
+" |
91 |
+# configure.ac has gtk-doc-am stuff behind m4_ifdef, so we don't need a gtk-doc-am build dep |
92 |
+ |
93 |
+# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate |
94 |
+# python depending package, which can be buildtime depended in packages that |
95 |
+# need these tools, without pulling in python at runtime. |
96 |
+RDEPEND="${RDEPEND} |
97 |
+ >=dev-util/glib-utils-${PV}" |
98 |
+PDEPEND=" |
99 |
+ dbus? ( gnome-base/dconf ) |
100 |
+ mime? ( x11-misc/shared-mime-info ) |
101 |
+" |
102 |
+# shared-mime-info needed for gio/xdgmime, bug #409481 |
103 |
+# dconf is needed to be able to save settings, bug #498436 |
104 |
+ |
105 |
+MULTILIB_CHOST_TOOLS=( |
106 |
+ /usr/bin/gio-querymodules$(get_exeext) |
107 |
+) |
108 |
+ |
109 |
+pkg_setup() { |
110 |
+ if use kernel_linux ; then |
111 |
+ CONFIG_CHECK="~INOTIFY_USER" |
112 |
+ if use test ; then |
113 |
+ CONFIG_CHECK="~IPV6" |
114 |
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
115 |
+ fi |
116 |
+ linux-info_pkg_setup |
117 |
+ fi |
118 |
+ python-any-r1_pkg_setup |
119 |
+} |
120 |
+ |
121 |
+src_prepare() { |
122 |
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
123 |
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
124 |
+ |
125 |
+ if use test; then |
126 |
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
127 |
+ if ! has_version dev-util/desktop-file-utils ; then |
128 |
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
129 |
+ ewarn "think on installing it to get these tests run." |
130 |
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
131 |
+ sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
132 |
+ fi |
133 |
+ |
134 |
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any |
135 |
+ # other), falling back to xterm if one doesn't exist |
136 |
+ #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
137 |
+ # ewarn "Some tests will be skipped due to missing terminal program" |
138 |
+ # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson |
139 |
+ # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails |
140 |
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
141 |
+ # desktop-app-info/launch* might fail similarly |
142 |
+ sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die |
143 |
+ #fi |
144 |
+ |
145 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
146 |
+ sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
147 |
+ sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
148 |
+ |
149 |
+ ewarn "Tests for search-utils have been skipped" |
150 |
+ sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
151 |
+ else |
152 |
+ # Don't build tests, also prevents extra deps, bug #512022 |
153 |
+ sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
154 |
+ fi |
155 |
+ |
156 |
+ # gdbus-codegen is a separate package |
157 |
+ eapply "${FILESDIR}"/${PN}-2.58.2-external-gdbus-codegen.patch |
158 |
+ |
159 |
+ # Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due |
160 |
+ # to circular deps during bootstramp. If actually not building gtk-doc, an almost empty file will do |
161 |
+ # fine as well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is |
162 |
+ # installed, eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy. |
163 |
+ cat > gtk-doc.make << EOF |
164 |
+EXTRA_DIST = |
165 |
+CLEANFILES = |
166 |
+EOF |
167 |
+ |
168 |
+ gnome2_src_prepare |
169 |
+ epunt_cxx |
170 |
+} |
171 |
+ |
172 |
+multilib_src_configure() { |
173 |
+ # Avoid circular depend with dev-util/pkgconfig and |
174 |
+ # native builds (cross-compiles won't need pkg-config |
175 |
+ # in the target ROOT to work here) |
176 |
+ if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
177 |
+ if has_version sys-apps/dbus; then |
178 |
+ export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
179 |
+ export DBUS1_LIBS="-ldbus-1" |
180 |
+ fi |
181 |
+ export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
182 |
+ export LIBFFI_LIBS="-lffi" |
183 |
+ export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
184 |
+ export PCRE_LIBS="-lpcre" |
185 |
+ fi |
186 |
+ |
187 |
+ # These configure tests don't work when cross-compiling. |
188 |
+ if tc-is-cross-compiler ; then |
189 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
190 |
+ case ${CHOST} in |
191 |
+ hppa*|metag*) export glib_cv_stack_grows=yes ;; |
192 |
+ *) export glib_cv_stack_grows=no ;; |
193 |
+ esac |
194 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
195 |
+ export glib_cv_uscore=no |
196 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
197 |
+ export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
198 |
+ fi |
199 |
+ |
200 |
+ local myconf |
201 |
+ |
202 |
+ case "${CHOST}" in |
203 |
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
204 |
+ *) myconf="${myconf} --with-threads=posix" ;; |
205 |
+ esac |
206 |
+ |
207 |
+ # libelf used only by the gresource bin |
208 |
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
209 |
+ $(usex debug --enable-debug=yes ' ') \ |
210 |
+ $(use_enable xattr) \ |
211 |
+ $(use_enable fam) \ |
212 |
+ $(multilib_native_use_enable gtk-doc) \ |
213 |
+ $(use_enable kernel_linux libmount) \ |
214 |
+ $(use_enable selinux) \ |
215 |
+ $(use_enable static-libs static) \ |
216 |
+ $(use_enable systemtap dtrace) \ |
217 |
+ $(use_enable systemtap systemtap) \ |
218 |
+ $(multilib_native_use_enable utils libelf) \ |
219 |
+ --with-python=${EPYTHON} \ |
220 |
+ --disable-compile-warnings \ |
221 |
+ --enable-man \ |
222 |
+ --with-pcre=system \ |
223 |
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
224 |
+ |
225 |
+ if multilib_is_native_abi; then |
226 |
+ local d |
227 |
+ for d in glib gio gobject; do |
228 |
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
229 |
+ done |
230 |
+ fi |
231 |
+} |
232 |
+ |
233 |
+multilib_src_test() { |
234 |
+ export XDG_CONFIG_DIRS=/etc/xdg |
235 |
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share |
236 |
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
237 |
+ export LC_TIME=C # bug #411967 |
238 |
+ unset GSETTINGS_BACKEND # bug #596380 |
239 |
+ python_setup |
240 |
+ |
241 |
+ # Related test is a bit nitpicking |
242 |
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
243 |
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
244 |
+ |
245 |
+ # Hardened: gdb needs this, bug #338891 |
246 |
+ if host-is-pax ; then |
247 |
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
248 |
+ || die "Hardened adjustment failed" |
249 |
+ fi |
250 |
+ |
251 |
+ # Need X for dbus-launch session X11 initialization |
252 |
+ virtx emake check |
253 |
+} |
254 |
+ |
255 |
+multilib_src_install() { |
256 |
+ emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install |
257 |
+ keepdir /usr/$(get_libdir)/gio/modules |
258 |
+} |
259 |
+ |
260 |
+multilib_src_install_all() { |
261 |
+ einstalldocs |
262 |
+ |
263 |
+ # These are installed by dev-util/glib-utils |
264 |
+ # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson |
265 |
+ rm "${ED}usr/bin/glib-genmarshal" || die |
266 |
+ rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die |
267 |
+ rm "${ED}usr/bin/glib-mkenums" || die |
268 |
+ rm "${ED}usr/share/man/man1/glib-mkenums.1" || die |
269 |
+ rm "${ED}usr/bin/gtester-report" || die |
270 |
+ rm "${ED}usr/share/man/man1/gtester-report.1" || die |
271 |
+ |
272 |
+ # Do not install charset.alias even if generated, leave it to libiconv |
273 |
+ rm -f "${ED}/usr/$(get_libdir)/charset.alias" |
274 |
+ |
275 |
+ # Don't install gdb python macros, bug 291328 |
276 |
+ rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
277 |
+ |
278 |
+ # Completely useless with or without USE static-libs, people need to use pkg-config |
279 |
+ find "${ED}" -name '*.la' -delete || die |
280 |
+} |
281 |
+ |
282 |
+pkg_preinst() { |
283 |
+ gnome2_pkg_preinst |
284 |
+ |
285 |
+ # Make gschemas.compiled belong to glib alone |
286 |
+ local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
287 |
+ |
288 |
+ if [[ -e ${EROOT}${cache} ]]; then |
289 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
290 |
+ else |
291 |
+ touch "${ED}"/${cache} || die |
292 |
+ fi |
293 |
+ |
294 |
+ multilib_pkg_preinst() { |
295 |
+ # Make giomodule.cache belong to glib alone |
296 |
+ local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
297 |
+ |
298 |
+ if [[ -e ${EROOT}${cache} ]]; then |
299 |
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die |
300 |
+ else |
301 |
+ touch "${ED}"/${cache} || die |
302 |
+ fi |
303 |
+ } |
304 |
+ |
305 |
+ # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
306 |
+ # file due to inability to create it and GIO might not look at any of the modules there |
307 |
+ if ! tc-is-cross-compiler ; then |
308 |
+ multilib_foreach_abi multilib_pkg_preinst |
309 |
+ fi |
310 |
+} |
311 |
+ |
312 |
+pkg_postinst() { |
313 |
+ # force (re)generation of gschemas.compiled |
314 |
+ GNOME2_ECLASS_GLIB_SCHEMAS="force" |
315 |
+ |
316 |
+ gnome2_pkg_postinst |
317 |
+ |
318 |
+ multilib_pkg_postinst() { |
319 |
+ gnome2_giomodule_cache_update \ |
320 |
+ || die "Update GIO modules cache failed (for ${ABI})" |
321 |
+ } |
322 |
+ if ! tc-is-cross-compiler ; then |
323 |
+ multilib_foreach_abi multilib_pkg_postinst |
324 |
+ else |
325 |
+ ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
326 |
+ ewarn "You might want to run gio-querymodules manually on the target for" |
327 |
+ ewarn "your final image for performance reasons and re-run it when packages" |
328 |
+ ewarn "installing GIO modules get upgraded or added to the image." |
329 |
+ fi |
330 |
+} |
331 |
+ |
332 |
+pkg_postrm() { |
333 |
+ gnome2_pkg_postrm |
334 |
+ |
335 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
336 |
+ multilib_pkg_postrm() { |
337 |
+ rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
338 |
+ } |
339 |
+ multilib_foreach_abi multilib_pkg_postrm |
340 |
+ rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
341 |
+ fi |
342 |
+} |