* [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.20.1-r1.ebuild glib-2.18.4-r2.ebuild
@ 2009-05-04 22:06 Gilles Dartiguelongue (eva)
0 siblings, 0 replies; only message in thread
From: Gilles Dartiguelongue (eva) @ 2009-05-04 22:06 UTC (permalink / raw
To: gentoo-commits
eva 09/05/04 22:06:50
Modified: ChangeLog
Added: glib-2.20.1-r1.ebuild glib-2.18.4-r2.ebuild
Log:
Fix gio unref, bug #260301. Fix compilation of glib-2.18 with gcc 4.4, bug #264686.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Revision Changes Path
1.368 dev-libs/glib/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.368&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.368&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.367&r2=1.368
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- ChangeLog 4 May 2009 21:24:07 -0000 1.367
+++ ChangeLog 4 May 2009 22:06:50 -0000 1.368
@@ -1,6 +1,15 @@
# ChangeLog for dev-libs/glib
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.367 2009/05/04 21:24:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.368 2009/05/04 22:06:50 eva Exp $
+
+*glib-2.20.1-r1 (04 May 2009)
+*glib-2.18.4-r2 (04 May 2009)
+
+ 04 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ +files/glib-2.18.4-gcc44.patch, +files/glib-2.20.1-gio-unref.patch,
+ +glib-2.18.4-r2.ebuild, +glib-2.20.1-r1.ebuild:
+ Fix gio unref, bug #260301. Fix compilation of glib-2.18 with gcc 4.4, bug
+ #264686.
*glib-2.20.1 (04 May 2009)
1.1 dev-libs/glib/glib-2.20.1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/glib-2.20.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/glib-2.20.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: glib-2.20.1-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.20.1-r1.ebuild,v 1.1 2009/05/04 22:06:50 eva Exp $
EAPI="2"
inherit gnome.org libtool eutils flag-o-matic
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="debug doc fam hardened selinux xattr"
RDEPEND="virtual/libc
virtual/libiconv
xattr? ( sys-apps/attr )
fam? ( virtual/fam )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.16
>=sys-devel/gettext-0.11
doc? (
>=dev-libs/libxslt-1.0
>=dev-util/gtk-doc-1.11
~app-text/docbook-xml-dtd-4.1.2 )"
src_prepare() {
if use ppc64 && use hardened ; then
replace-flags -O[2-3] -O1
epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
fi
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 GIO null unref, bug #260301
epatch "${FILESDIR}/${P}-gio-unref.patch"
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
}
src_configure() {
local myconf
epunt_cxx
# 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 build static libs, see #153807
# 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) \
--enable-static \
--enable-regex \
--with-pcre=internal \
--with-threads=posix
}
src_install() {
emake DESTDIR="${D}" install || die "Installation failed"
# Do not install charset.alias even if generated, leave it to libiconv
rm -f "${D}/usr/lib/charset.alias"
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
}
src_test() {
unset DBUS_SESSION_BUS_ADDRESS
emake check || die "tests failed"
}
1.1 dev-libs/glib/glib-2.18.4-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/glib-2.18.4-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/glib/glib-2.18.4-r2.ebuild?rev=1.1&content-type=text/plain
Index: glib-2.18.4-r2.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.18.4-r2.ebuild,v 1.1 2009/05/04 22:06:50 eva Exp $
EAPI="2"
inherit gnome.org libtool eutils flag-o-matic
DESCRIPTION="The GLib library of C routines"
HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
IUSE="debug doc fam hardened selinux xattr"
RDEPEND="virtual/libc
virtual/libiconv
xattr? ( sys-apps/attr )
fam? ( virtual/fam )"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.16
>=sys-devel/gettext-0.11
doc? (
>=dev-libs/libxslt-1.0
>=dev-util/gtk-doc-1.8
~app-text/docbook-xml-dtd-4.1.2 )"
src_prepare() {
if use ppc64 && use hardened ; then
replace-flags -O[2-3] -O1
epatch "${FILESDIR}/glib-2.6.3-testglib-ssp.patch"
fi
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 g_base64 overruns. bug #249214
epatch "${FILESDIR}"/glib2-CVE-2008-4316.patch
# Fix compilation with gcc 4.4, bug #264686
epatch "${FILESDIR}/${P}-gcc44.patch"
# Fix GIO null unref, bug #260301
epatch "${FILESDIR}/${PN}-2.20.1-gio-unref.patch"
[[ ${CHOST} == *-freebsd* ]] && elibtoolize
}
src_configure() {
local myconf
epunt_cxx
# 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 build static libs, see #153807
# 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) \
--enable-static \
--enable-regex \
--with-pcre=internal \
--with-threads=posix
}
src_install() {
emake DESTDIR="${D}" install || die "Installation failed"
# Do not install charset.alias even if generated, leave it to libiconv
rm -f "${D}/usr/lib/charset.alias"
dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-04 22:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-04 22:06 [gentoo-commits] gentoo-x86 commit in dev-libs/glib: ChangeLog glib-2.20.1-r1.ebuild glib-2.18.4-r2.ebuild Gilles Dartiguelongue (eva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox