Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/glib: glib-2.40.2.ebuild ChangeLog
Date: Sun, 28 Sep 2014 12:52:59
Message-Id: 20140928125254.9D8F86734@oystercatcher.gentoo.org
1 pacho 14/09/28 12:52:54
2
3 Modified: ChangeLog
4 Added: glib-2.40.2.ebuild
5 Log:
6 Version bump
7
8 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
9
10 Revision Changes Path
11 1.623 dev-libs/glib/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.623&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.623&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.622&r2=1.623
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
20 retrieving revision 1.622
21 retrieving revision 1.623
22 diff -u -r1.622 -r1.623
23 --- ChangeLog 15 Sep 2014 08:18:20 -0000 1.622
24 +++ ChangeLog 28 Sep 2014 12:52:54 -0000 1.623
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-libs/glib
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.622 2014/09/15 08:18:20 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.623 2014/09/28 12:52:54 pacho Exp $
30 +
31 +*glib-2.40.2 (28 Sep 2014)
32 +
33 + 28 Sep 2014; Pacho Ramos <pacho@g.o> +glib-2.40.2.ebuild:
34 + Version bump
35
36 15 Sep 2014; Agostino Sarubbo <ago@g.o> glib-2.40.0-r1.ebuild:
37 Stable for sparc, wrt bug #512012
38
39
40
41 1.1 dev-libs/glib/glib-2.40.2.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.40.2.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.40.2.ebuild?rev=1.1&content-type=text/plain
45
46 Index: glib-2.40.2.ebuild
47 ===================================================================
48 # Copyright 1999-2014 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.2.ebuild,v 1.1 2014/09/28 12:52:54 pacho Exp $
51
52 EAPI="5"
53 PYTHON_COMPAT=( python2_{6,7} )
54 # Building with --disable-debug highly unrecommended. It will build glib in
55 # an unusable form as it disables some commonly used API. Please do not
56 # convert this to the use_enable form, as it results in a broken build.
57 GCONF_DEBUG="yes"
58 # Completely useless with or without USE static-libs, people need to use
59 # pkg-config
60 GNOME2_LA_PUNT="yes"
61
62 inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \
63 pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
64
65 DESCRIPTION="The GLib library of C routines"
66 HOMEPAGE="http://www.gtk.org/"
67 SRC_URI="${SRC_URI}
68 http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
69
70 LICENSE="LGPL-2+"
71 SLOT="2"
72 IUSE="fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
73 REQUIRED_USE="
74 utils? ( ${PYTHON_REQUIRED_USE} )
75 test? ( ${PYTHON_REQUIRED_USE} )
76 "
77
78 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
79
80 RDEPEND="
81 !<dev-util/gdbus-codegen-${PV}
82 >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
83 >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
84 >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
85 || (
86 >=dev-libs/elfutils-0.142
87 >=dev-libs/libelf-0.8.12
88 >=sys-freebsd/freebsd-lib-9.2_rc1
89 )
90 selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
91 xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
92 fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
93 utils? (
94 ${PYTHON_DEPS}
95 >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
96 abi_x86_32? (
97 !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
98 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
99 )
100 "
101 DEPEND="${RDEPEND}
102 app-text/docbook-xml-dtd:4.1.2
103 >=dev-libs/libxslt-1.0
104 >=sys-devel/gettext-0.11
105 >=dev-util/gtk-doc-am-1.20
106 systemtap? ( >=dev-util/systemtap-1.3 )
107 test? (
108 sys-devel/gdb
109 ${PYTHON_DEPS}
110 >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
111 >=sys-apps/dbus-1.2.14 )
112 !<dev-util/gtk-doc-1.15-r2
113 "
114 # gobject-introspection blocker to ensure people don't mix
115 # different g-i and glib major versions
116
117 PDEPEND="!<gnome-base/gvfs-1.6.4-r990
118 mime? ( x11-misc/shared-mime-info )
119 "
120 # shared-mime-info needed for gio/xdgmime, bug #409481
121 # Earlier versions of gvfs do not work with glib
122
123 #DOCS="AUTHORS ChangeLog* NEWS* README"
124
125 pkg_setup() {
126 if use kernel_linux ; then
127 CONFIG_CHECK="~INOTIFY_USER"
128 if use test; then
129 CONFIG_CHECK="~IPV6"
130 WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
131 export IPV6_DISABLED="yes"
132 fi
133 linux-info_pkg_setup
134 fi
135 }
136
137 src_prepare() {
138 # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
139 mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
140
141 # Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
142 # Upstream doesn't even know if this is needed, looks like openBSD
143 # people is not needing it
144 # epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
145
146 if use test; then
147 # Do not try to remove files on live filesystem, upstream bug #619274
148 sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
149 -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
150
151 # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
152 if ! has_version dev-util/desktop-file-utils ; then
153 ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
154 ewarn "think on installing it to get these tests run."
155 sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
156 sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
157 sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
158 sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
159 fi
160
161 # gdesktopappinfo requires existing terminal (gnome-terminal or any
162 # other), falling back to xterm if one doesn't exist
163 if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
164 ewarn "Some tests will be skipped due to missing terminal program"
165 sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
166 fi
167
168 # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
169 if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
170 ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
171 ewarn "not being present on your system, think on installing them to get these tests run."
172 sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
173 sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
174 sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
175 sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
176 sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
177 sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
178 sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
179 # needed to prevent gdbus-threading from asserting
180 ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
181 fi
182
183 # Some tests need ipv6, upstream bug #667468
184 if [[ -n "${IPV6_DISABLED}" ]]; then
185 sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
186 sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
187 sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
188 fi
189
190 # Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
191 sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
192
193 # thread test fails, upstream bug #679306
194 epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
195
196 # This test is prone to fail, bug #504024, upstream bug #723719
197 sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
198 else
199 # Don't build tests, also prevents extra deps, bug #512022
200 sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
201 fi
202
203 # gdbus-codegen is a separate package
204 epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
205
206 # leave python shebang alone
207 sed -e '/${PYTHON}/d' \
208 -i glib/Makefile.{am,in} || die
209
210 # Gentoo handles completions in a different directory
211 sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
212 gio/Makefile.am || die
213
214 epatch_user
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 fi
236
237 local myconf
238
239 case "${CHOST}" in
240 *-mingw*) myconf="${myconf} --with-threads=win32" ;;
241 *) myconf="${myconf} --with-threads=posix" ;;
242 esac
243
244 # Only used by the gresource bin
245 multilib_is_native_abi || myconf="${myconf} --disable-libelf"
246
247 # Always use internal libpcre, bug #254659
248 ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
249 $(use_enable xattr) \
250 $(use_enable fam) \
251 $(use_enable selinux) \
252 $(use_enable static-libs static) \
253 $(use_enable systemtap dtrace) \
254 $(use_enable systemtap systemtap) \
255 --disable-compile-warnings \
256 --enable-man \
257 --with-pcre=internal \
258 --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
259
260 if multilib_is_native_abi; then
261 local d
262 for d in glib gio gobject; do
263 ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
264 done
265 fi
266 }
267
268 multilib_src_test() {
269 unset DBUS_SESSION_BUS_ADDRESS
270 export XDG_CONFIG_DIRS=/etc/xdg
271 export XDG_DATA_DIRS=/usr/local/share:/usr/share
272 export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
273 unset GSETTINGS_BACKEND # bug 352451
274 export LC_TIME=C # bug #411967
275 python_export_best
276
277 # Related test is a bit nitpicking
278 mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
279 chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
280
281 # Hardened: gdb needs this, bug #338891
282 if host-is-pax ; then
283 pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
284 || die "Hardened adjustment failed"
285 fi
286
287 # Need X for dbus-launch session X11 initialization
288 Xemake check
289 }
290
291 multilib_src_install() {
292 gnome2_src_install
293 }
294
295 multilib_src_install_all() {
296 DOCS="AUTHORS ChangeLog* NEWS* README"
297 einstalldocs
298
299 if use utils ; then
300 python_replicate_script "${ED}"/usr/bin/gtester-report
301 else
302 rm "${ED}usr/bin/gtester-report"
303 rm "${ED}usr/share/man/man1/gtester-report.1"
304 fi
305
306 # Do not install charset.alias even if generated, leave it to libiconv
307 rm -f "${ED}/usr/lib/charset.alias"
308
309 # Don't install gdb python macros, bug 291328
310 rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
311 }
312
313 pkg_postinst() {
314 gnome2_pkg_postinst
315 if has_version '<x11-libs/gtk+-3.0.12:3'; then
316 # To have a clear upgrade path for gtk+-3.0.x users, have to resort to
317 # a warning instead of a blocker
318 ewarn
319 ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
320 ewarn "You should upgrade to a newer version of gtk+:3 immediately."
321 fi
322 }