diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-11-26 04:59:19 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-11-26 04:59:19 +0000 |
| commit | 637f3e25159b4ed45675d5cff29829aa9956d168 (patch) | |
| tree | 8b98be11670f478d79a1c20541afb60eea75a2f2 /x11-libs/gtk+ | |
| parent | Version bump. (diff) | |
| download | gentoo-2-637f3e25159b4ed45675d5cff29829aa9956d168.tar.gz gentoo-2-637f3e25159b4ed45675d5cff29829aa9956d168.tar.bz2 gentoo-2-637f3e25159b4ed45675d5cff29829aa9956d168.zip | |
Forward-port ${CHOST}-cups-config use, bug #530494.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'x11-libs/gtk+')
| -rw-r--r-- | x11-libs/gtk+/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/gtk+/gtk+-3.12.2-r1.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 518e93a1ec63..0ea03b3b18a2 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.740 2014/11/24 01:41:45 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.741 2014/11/26 04:59:19 mgorny Exp $ + + 26 Nov 2014; Michał Górny <mgorny@gentoo.org> gtk+-3.12.2-r1.ebuild: + Forward-port ${CHOST}-cups-config use, bug #530494. 24 Nov 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-3.12.2-r1.ebuild: diff --git a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild index 7c2178a8f05e..672328768cea 100644 --- a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.2 2014/11/24 01:41:45 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.3 2014/11/26 04:59:19 mgorny Exp $ EAPI="5" GCONF_DEBUG="no" @@ -162,7 +162,8 @@ multilib_src_configure() { --enable-man \ --enable-gtk2-dependency \ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - --libdir="${EPREFIX}"/usr/$(get_libdir) + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" # work-around gtk-doc out-of-source brokedness if multilib_is_native_abi; then |