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.36.0.ebuild ChangeLog
Date: Thu, 28 Mar 2013 16:05:43
Message-Id: 20130328160507.053C82171C@flycatcher.gentoo.org
1 pacho 13/03/28 16:05:06
2
3 Modified: ChangeLog
4 Added: glib-2.36.0.ebuild
5 Log:
6 Version bump for Gnome 3.8
7
8 (Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
9
10 Revision Changes Path
11 1.554 dev-libs/glib/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.554&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.554&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.553&r2=1.554
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
20 retrieving revision 1.553
21 retrieving revision 1.554
22 diff -u -r1.553 -r1.554
23 --- ChangeLog 19 Feb 2013 00:08:33 -0000 1.553
24 +++ ChangeLog 28 Mar 2013 16:05:06 -0000 1.554
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-libs/glib
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.553 2013/02/19 00:08:33 tetromino Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.554 2013/03/28 16:05:06 pacho Exp $
30 +
31 +*glib-2.36.0 (28 Mar 2013)
32 +
33 + 28 Mar 2013; Pacho Ramos <pacho@g.o>
34 + +files/glib-2.35.x-external-gdbus-codegen.patch, +glib-2.36.0.ebuild:
35 + Version bump for Gnome 3.8
36
37 19 Feb 2013; Alexandre Rostovtsev <tetromino@g.o> glib-2.30.3.ebuild,
38 glib-2.32.4-r1.ebuild, glib-2.34.2.ebuild, glib-2.34.3.ebuild:
39
40
41
42 1.1 dev-libs/glib/glib-2.36.0.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.36.0.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.36.0.ebuild?rev=1.1&content-type=text/plain
46
47 Index: glib-2.36.0.ebuild
48 ===================================================================
49 # Copyright 1999-2013 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.0.ebuild,v 1.1 2013/03/28 16:05:06 pacho Exp $
52
53 EAPI="5"
54 PYTHON_DEPEND="utils? 2"
55 # Avoid runtime dependency on python when USE=test
56
57 inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
58
59 DESCRIPTION="The GLib library of C routines"
60 HOMEPAGE="http://www.gtk.org/"
61 SRC_URI="${SRC_URI}
62 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
63
64 LICENSE="LGPL-2+"
65 SLOT="2"
66 IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
67 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
68
69 RDEPEND="virtual/libiconv
70 virtual/libffi
71 sys-libs/zlib
72 || (
73 >=dev-libs/elfutils-0.142
74 >=dev-libs/libelf-0.8.12 )
75 xattr? ( sys-apps/attr )
76 fam? ( virtual/fam )
77 utils? ( >=dev-util/gdbus-codegen-${PV} )"
78 DEPEND="${RDEPEND}
79 app-text/docbook-xml-dtd:4.1.2
80 >=dev-libs/libxslt-1.0
81 >=sys-devel/gettext-0.11
82 >=dev-util/gtk-doc-am-1.15
83 systemtap? ( >=dev-util/systemtap-1.3 )
84 test? (
85 sys-devel/gdb
86 =dev-lang/python-2*
87 >=dev-util/gdbus-codegen-${PV}
88 >=sys-apps/dbus-1.2.14 )
89 !<dev-util/gtk-doc-1.15-r2"
90 PDEPEND="x11-misc/shared-mime-info
91 !<gnome-base/gvfs-1.6.4-r990"
92 # shared-mime-info needed for gio/xdgmime, bug #409481
93 # Earlier versions of gvfs do not work with glib
94
95 pkg_setup() {
96 # Needed for gio/tests/gdbus-testserver.py
97 if use test; then
98 python_set_active_version 2
99 python_pkg_setup
100 fi
101
102 if use kernel_linux ; then
103 CONFIG_CHECK="~INOTIFY_USER"
104 linux-info_pkg_setup
105 fi
106 }
107
108 src_prepare() {
109 mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
110
111 # Fix gmodule issues on fbsd; bug #184301
112 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
113
114 if use test; then
115 # Do not try to remove files on live filesystem, upstream bug #619274
116 sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
117 -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
118
119 # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
120 if ! has_version dev-util/desktop-file-utils ; then
121 ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
122 ewarn "think on installing it to get these tests run."
123 sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
124 sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
125 sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
126 sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
127 fi
128
129 # gdesktopappinfo requires existing terminal (gnome-terminal or any
130 # other), falling back to xterm if one doesn't exist
131 if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
132 ewarn "Some tests will be skipped due to missing terminal program"
133 sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
134 fi
135
136 # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
137 if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
138 ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
139 ewarn "not being present on your system, think on installing them to get these tests run."
140 sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
141 sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
142 sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
143 sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
144 sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
145 sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
146 sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
147 # needed to prevent gdbus-threading from asserting
148 ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
149 fi
150
151 epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
152 fi
153
154 # gdbus-codegen is a separate package
155 epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
156
157 # bashcomp goes in /usr/share/bash-completion
158 epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
159
160 epatch_user
161
162 # disable pyc compiling
163 use test && python_clean_py-compile_files
164
165 # Needed for the punt-python-check patch, disabling timeout test
166 # Also needed to prevent croscompile failures, see bug #267603
167 # Also needed for the no-gdbus-codegen patch
168 AT_M4DIR="${WORKDIR}" eautoreconf
169
170 [[ ${CHOST} == *-freebsd* ]] && elibtoolize
171
172 epunt_cxx
173 }
174
175 src_configure() {
176 # Avoid circular depend with dev-util/pkgconfig and
177 # native builds (cross-compiles won't need pkg-config
178 # in the target ROOT to work here)
179 if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
180 if has_version sys-apps/dbus; then
181 export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
182 export DBUS1_LIBS="-ldbus-1"
183 fi
184 export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
185 export LIBFFI_LIBS="-lffi"
186 fi
187
188 local myconf
189
190 # Building with --disable-debug highly unrecommended. It will build glib in
191 # an unusable form as it disables some commonly used API. Please do not
192 # convert this to the use_enable form, as it results in a broken build.
193 # -- compnerd (3/27/06)
194 use debug && myconf="--enable-debug"
195
196 if use test; then
197 myconf="${myconf} --enable-modular-tests"
198 else
199 myconf="${myconf} --disable-modular-tests"
200 fi
201
202 # Always use internal libpcre, bug #254659
203 econf ${myconf} \
204 $(use_enable xattr) \
205 $(use_enable fam) \
206 $(use_enable selinux) \
207 $(use_enable static-libs static) \
208 $(use_enable systemtap dtrace) \
209 $(use_enable systemtap systemtap) \
210 --enable-man \
211 --with-pcre=internal \
212 --with-threads=posix \
213 --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
214 }
215
216 src_install() {
217 local f
218
219 # install-exec-hook substitutes ${PYTHON} in glib/gtester-report
220 emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
221
222 if ! use utils; then
223 rm "${ED}usr/bin/gtester-report"
224 fi
225
226 # Do not install charset.alias even if generated, leave it to libiconv
227 rm -f "${ED}/usr/lib/charset.alias"
228
229 # Don't install gdb python macros, bug 291328
230 rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
231
232 dodoc AUTHORS ChangeLog* NEWS* README
233
234 # Completely useless with or without USE static-libs, people need to use
235 # pkg-config
236 prune_libtool_files --modules
237 }
238
239 src_test() {
240 gnome2_environment_reset
241
242 unset DBUS_SESSION_BUS_ADDRESS
243 export XDG_CONFIG_DIRS=/etc/xdg
244 export XDG_DATA_DIRS=/usr/local/share:/usr/share
245 export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
246 unset GSETTINGS_BACKEND # bug 352451
247 export LC_TIME=C # bug #411967
248
249 # Related test is a bit nitpicking
250 mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
251 chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
252
253 # Hardened: gdb needs this, bug #338891
254 if host-is-pax ; then
255 pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
256 || die "Hardened adjustment failed"
257 fi
258
259 # Need X for dbus-launch session X11 initialization
260 Xemake check
261 }
262
263 pkg_preinst() {
264 # Only give the introspection message if:
265 # * The user has gobject-introspection
266 # * Has glib already installed
267 # * Previous version was different from new version
268 # TODO: add a subslotted virtual to trigger this automatically
269 if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
270 ewarn "You must rebuild gobject-introspection so that the installed"
271 ewarn "typelibs and girs are regenerated for the new APIs in glib"
272 fi
273 }
274
275 pkg_postinst() {
276 # Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
277 # TODO: add a subslotted virtual to trigger this automatically
278 if has_version dev-libs/dbus-glib; then
279 ewarn "If you experience a breakage after updating dev-libs/glib try"
280 ewarn "rebuilding dev-libs/dbus-glib"
281 fi
282
283 if has_version '<x11-libs/gtk+-3.0.12:3'; then
284 # To have a clear upgrade path for gtk+-3.0.x users, have to resort to
285 # a warning instead of a blocker
286 ewarn
287 ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
288 ewarn "You should upgrade to a newer version of gtk+:3 immediately."
289 fi
290 }