From: "Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.30.2.ebuild
Date: Mon, 14 Nov 2011 08:11:12 +0000 (UTC) [thread overview]
Message-ID: <20111114081112.7BF2D2004B@flycatcher.gentoo.org> (raw)
tetromino 11/11/14 08:11:12
Modified: ChangeLog
Added: glib-2.30.2.ebuild
Log:
Bump. Notable changes: gdbus-related bugfixes. Add patch to detect machine-id in both /etc and /var, and lower dbus dep. Compile tests when USE=doc to prevent build failure (bug #387385, solution proposed by Pacho Ramos).
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Revision Changes Path
1.492 dev-libs/glib/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.492&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.492&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.491&r2=1.492
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- ChangeLog 12 Nov 2011 17:01:14 -0000 1.491
+++ ChangeLog 14 Nov 2011 08:11:12 -0000 1.492
@@ -1,6 +1,14 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.491 2011/11/12 17:01:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.492 2011/11/14 08:11:12 tetromino Exp $
+
+*glib-2.30.2 (14 Nov 2011)
+
+ 14 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +glib-2.30.2.ebuild,
+ +files/glib-2.30.2-machine-id.patch:
+ Bump. Notable changes: gdbus-related bugfixes. Add patch to detect machine-id
+ in both /etc and /var, and lower dbus dep. Compile tests when USE=doc to
+ prevent build failure (bug #387385, solution proposed by Pacho Ramos).
12 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -glib-2.28.6.ebuild,
-glib-2.30.0.ebuild, -glib-2.30.1.ebuild, -glib-2.30.1-r1.ebuild:
1.1 dev-libs/glib/glib-2.30.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild?rev=1.1&content-type=text/plain
Index: glib-2.30.2.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.1 2011/11/14 08:11:12 tetromino Exp $
EAPI="4"
PYTHON_DEPEND="utils? 2"
# Avoid runtime dependency on python when USE=test
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
SRC_URI="${SRC_URI}
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2"
SLOT="2"
IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
RDEPEND="virtual/libiconv
virtual/libffi
sys-libs/zlib
xattr? ( sys-apps/attr )
fam? ( virtual/fam )
utils? ( >=dev-util/gdbus-codegen-${PV} )"
DEPEND="${RDEPEND}
>=sys-devel/gettext-0.11
>=dev-util/gtk-doc-am-1.15
doc? (
>=dev-libs/libxslt-1.0
>=dev-util/gdbus-codegen-${PV}
>=dev-util/gtk-doc-1.15
~app-text/docbook-xml-dtd-4.1.2 )
systemtap? ( >=dev-util/systemtap-1.3 )
test? (
sys-devel/gdb
=dev-lang/python-2*
>=dev-util/gdbus-codegen-${PV}
>=sys-apps/dbus-1.2.14 )
!<dev-util/gtk-doc-1.15-r2
!<sys-apps/dbus-1.4.16-r2"
PDEPEND="!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
pkg_setup() {
# Needed for gio/tests/gdbus-testserver.py
if use test ; then
python_set_active_version 2
python_pkg_setup
fi
}
src_prepare() {
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
if use ia64 ; then
# Only apply for < 4.1
local major=$(gcc-major-version)
local minor=$(gcc-minor-version)
if (( major < 4 || ( major == 4 && minor == 0 ) )); then
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
fi
fi
# Don't fail gio tests when ran without userpriv, upstream bug 552912
# This is only a temporary workaround, remove as soon as possible
# epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
# Fix gmodule issues on fbsd; bug #184301
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
# Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
# Do not try to remove files on live filesystem, upstream bug #619274
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
# need to build tests if USE=doc for bug #387385
if ! use test && ! use doc; then
# don't waste time building tests
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
else
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
if ! has_version dev-util/desktop-file-utils ; then
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
ewarn "think on installing it to get these tests run."
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
fi
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
ewarn "not being present on your system, think on installing them to get these tests run."
sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
# needed to prevent gdbus-threading from asserting
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
fi
fi
# gdbus-codegen is a separate package
epatch "${FILESDIR}/${PN}-2.30.1-external-gdbus-codegen.patch"
# Handle the G_HOME environment variable to override the passwd entry, upstream bug #142568
epatch "${FILESDIR}/${PN}-2.30.1-homedir-env.patch"
# Fix hardcoded path to machine-id wrt #390143
epatch "${FILESDIR}/${PN}-2.30.2-machine-id.patch"
# disable pyc compiling
ln -sfn $(type -P true) py-compile
# Needed for the punt-python-check patch, disabling timeout test
# Also needed to prevent croscompile failures, see bug #267603
# Also needed for the no-gdbus-codegen patch
AT_M4DIR="${WORKDIR}" eautoreconf
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
epunt_cxx
}
src_configure() {
# Avoid circular depend with dev-util/pkgconfig
if ! has_version dev-util/pkgconfig; then
if has_version sys-apps/dbus; then
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
export DBUS1_LIBS="-ldbus-1"
fi
export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
export LIBFFI_LIBS="-lffi"
fi
local myconf
# Building with --disable-debug highly unrecommended. It will build glib in
# an unusable form as it disables some commonly used API. Please do not
# convert this to the use_enable form, as it results in a broken build.
# -- compnerd (3/27/06)
use debug && myconf="--enable-debug"
# Always use internal libpcre, bug #254659
econf ${myconf} \
$(use_enable xattr) \
$(use_enable doc man) \
$(use_enable doc gtk-doc) \
$(use_enable fam) \
$(use_enable selinux) \
$(use_enable static-libs static) \
$(use_enable systemtap dtrace) \
$(use_enable systemtap systemtap) \
--enable-regex \
--with-pcre=internal \
--with-threads=posix
}
src_install() {
local f
# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
if ! use utils; then
rm "${ED}usr/bin/gtester-report"
fi
# Do not install charset.alias even if generated, leave it to libiconv
rm -f "${ED}/usr/lib/charset.alias"
# Don't install gdb python macros, bug 291328
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
dodoc AUTHORS ChangeLog* NEWS* README
insinto /usr/share/bash-completion
for f in gdbus gsettings; do
newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f}
done
rm -rf "${ED}/etc"
# Completely useless with or without USE static-libs, people need to use
# pkg-config
find "${D}" -name '*.la' -exec rm -f {} +
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
export XDG_CONFIG_DIRS=/etc/xdg
export XDG_DATA_DIRS=/usr/local/share:/usr/share
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
export XDG_DATA_HOME="${T}"
unset GSETTINGS_BACKEND # bug 352451
# Related test is a bit nitpicking
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
# Hardened: gdb needs this, bug #338891
if host-is-pax ; then
pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
|| die "Hardened adjustment failed"
fi
# Need X for dbus-launch session X11 initialization
Xemake check
}
pkg_preinst() {
# Only give the introspection message if:
# * The user has gobject-introspection
# * Has glib already installed
# * Previous version was different from new version
if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
ewarn "You must rebuild gobject-introspection so that the installed"
ewarn "typelibs and girs are regenerated for the new APIs in glib"
fi
}
pkg_postinst() {
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
if has_version dev-libs/dbus-glib; then
ewarn "If you experience a breakage after updating dev-libs/glib try"
ewarn "rebuilding dev-libs/dbus-glib"
fi
if has_version '<x11-libs/gtk+-3.0.12:3'; then
# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
# a warning instead of a blocker
ewarn
ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
ewarn "You should upgrade to a newer version of gtk+:3 immediately."
fi
}
next reply other threads:[~2011-11-14 8:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-14 8:11 Alexandre Rostovtsev (tetromino) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-11-14 19:06 [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.30.2.ebuild Alexandre Rostovtsev (tetromino)
2011-12-20 21:24 Jeroen Roovers (jer)
2011-12-29 17:24 Pacho Ramos (pacho)
2012-01-14 16:17 Markus Meier (maekke)
2012-01-18 20:12 Markus Meier (maekke)
2012-03-05 16:35 Brent Baude (ranger)
2012-03-05 21:57 Brent Baude (ranger)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111114081112.7BF2D2004B@flycatcher.gentoo.org \
--to=tetromino@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox