Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtkglextmm/, dev-cpp/gtkglextmm/files/

[Andrew Savchenko]

On Fri, 11 Dec 2015 20:18:46 +0100 Gilles Dartiguelongue wrote:
> Le vendredi 11 décembre 2015 à 12:17 +0000, Andrew Savchenko a écrit :
> > commit:     fcc5f0fe910ec73b41adf3120255571baf896d4c
> > Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
> > AuthorDate: Fri Dec 11 12:17:20 2015 +0000
> > Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
> > CommitDate: Fri Dec 11 12:17:20 2015 +0000
> > URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcc5
> > f0fe
> >
> > dev-cpp/gtkglextmm: fix bug 552686
> >
> > Fix underquoted aclocal definition.
> >
> > Package-Manager: portage-2.2.26
> > Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
> >
> >  .../files/gtkglextmm-1.2.0-aclocal.patch           | 11 ++++++
> >  dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild      | 46
> > ++++++++++++++++++++++
> >  2 files changed, 57 insertions(+)
> >
> > diff --git a/dev-cpp/gtkglextmm/files/gtkglextmm-1.2.0-aclocal.patch
> > b/dev-cpp/gtkglextmm/files/gtkglextmm-1.2.0-aclocal.patch
> > new file mode 100644
> > index 0000000..32fa489
> > --- /dev/null
> > +++ b/dev-cpp/gtkglextmm/files/gtkglextmm-1.2.0-aclocal.patch
> > @@ -0,0 +1,11 @@
> > +--- gtkglextmm-1.2.0/m4macros/gtkglextmm.m4.orig	2004-05-18
> > 10:29:34.000000000 +0400
> > ++++ gtkglextmm-1.2.0/m4macros/gtkglextmm.m4	2015-08-07
> > 17:02:42.324065008 +0300
> > +@@ -222,7 +222,7 @@
> > + dnl AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD([ACTION-IF-SUPPORTED [,
> > ACTION-IF-NOT-SUPPORTED]])
> > + dnl Checks whether gtkglextmm supports multihead.
> > + dnl
> > +-AC_DEFUN(AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD,
> > ++AC_DEFUN([AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD],
> > + [ AC_LANG_SAVE
> > +   AC_LANG_CPLUSPLUS
> > +   AC_CACHE_CHECK([whether gtkglextmm supports multihead],
> >
> > diff --git a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild b/dev-
> > cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
> > new file mode 100644
> > index 0000000..504827e
> > --- /dev/null
> > +++ b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
> > @@ -0,0 +1,46 @@
> > +# Copyright 1999-2015 Gentoo Foundation
> > +# Distributed under the terms of the GNU General Public License v2
> > +# $Id$
> > +
> > +EAPI=5
> > +GCONF_DEBUG="yes"
> > +
> > +inherit eutils gnome2
> > +
> > +DESCRIPTION="C++ bindings for gtkglext"
> > +HOMEPAGE="https://projects.gnome.org/gtkglext/"
> > +SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
> > +
> > +KEYWORDS="~amd64 ~ppc ~x86"
> > +IUSE="doc"
> > +SLOT="1.0"
> > +LICENSE="GPL-2 LGPL-2.1"
> > +
> > +RDEPEND="
> > +	>=x11-libs/gtkglext-1
> > +	>=dev-libs/libsigc++-2.0
> > +	>=dev-cpp/glibmm-2.4:2
> > +	>=dev-cpp/gtkmm-2.4:2.4
> > +	virtual/opengl
> > +"
> > +DEPEND="${RDEPEND}
> > +	virtual/pkgconfig"
> > +
> > +src_prepare() {
> > +	# fix underquoted definition, bug 552686
> > +	epatch "${FILESDIR}/${P}-aclocal.patch"
> > +
> > +	# Remove docs from SUBDIRS so that docs are not installed,
> > as
> > +	# we handle it in src_install.
> > +	sed -i -e 's|^\(SUBDIRS =.*\)docs\(.*\)|\1\2|' Makefile.in
> > || \
> > +		die "sed Makefile.in failed"
> > +
> > +	gnome2_src_prepare
> > +}
> > +
> > +src_install() {
> > +	gnome2_src_install
> > +	if use doc; then
> > +		dohtml -r docs/reference/html/*
> > +	fi
> > +}
>
> Why a revbump for this, it appears to be a build-time fix only.

Becase it fixes file installed on a live filesystem, which affects
global aclocal runs. Without this fix each aclocal run in the
system with this package installed aclocal warning will be
displayed:

/usr/share/aclocal/gtkglextmm-1.2.m4:225: warning: underquoted
definition of
AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD /usr/share/aclocal/gtkglextmm-1.2.m4:225:
run info Automake 'Extending
aclocal' /usr/share/aclocal/gtkglextmm-1.2.m4:225:   or see
http://www.gnu.org/software/automake/manual/automake.html#Extending-aclocal

> Also it
> appears to be missing an autools inherit and eautoreconf call.
 
No, it doesn't. This file is not used during gtkglextmm build, it
is used by packages using gtkglextmm during their aclocal runs.

Best regards,
Andrew Savchenko