* [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: gtk+-3.12.2-r1.ebuild ChangeLog
@ 2014-11-22 23:02 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2014-11-22 23:02 UTC (permalink / raw
To: gentoo-commits
mgorny 14/11/22 23:02:47
Modified: ChangeLog
Added: gtk+-3.12.2-r1.ebuild
Log:
Introduce multilib support as needed for net-dns/avahi.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.739 x11-libs/gtk+/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.739&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.739&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.738&r2=1.739
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
retrieving revision 1.738
retrieving revision 1.739
diff -u -r1.738 -r1.739
--- ChangeLog 15 Oct 2014 08:10:20 -0000 1.738
+++ ChangeLog 22 Nov 2014 23:02:47 -0000 1.739
@@ -1,6 +1,11 @@
# 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.738 2014/10/15 08:10:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.739 2014/11/22 23:02:47 mgorny Exp $
+
+*gtk+-3.12.2-r1 (22 Nov 2014)
+
+ 22 Nov 2014; Michał Górny <mgorny@gentoo.org> +gtk+-3.12.2-r1.ebuild:
+ Introduce multilib support as needed for net-dns/avahi.
15 Oct 2014; Pacho Ramos <pacho@gentoo.org> gtk+-2.24.25.ebuild:
dev-libs/gobject-introspection-common DEPEND needed again (#525448 by Andrei
1.1 x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?rev=1.1&content-type=text/plain
Index: gtk+-3.12.2-r1.ebuild
===================================================================
# 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.1 2014/11/22 23:02:47 mgorny Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
DESCRIPTION="Gimp ToolKit +"
HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="3"
# NOTE: This gtk+ has multi-gdk-backend support, see:
# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
# I tried this and got it all compiling, but the end result is unusable as it
# horribly mixes up the backends -- grobian
IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
REQUIRED_USE="
|| ( aqua wayland X )
xinerama? ( X )
"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# FIXME: introspection data is built against system installation of gtk+:3
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
# Use gtk+:2 for gtk-update-icon-cache
COMMON_DEPEND="
>=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}]
>=dev-libs/glib-2.39.5:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}]
>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
>=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}]
x11-misc/shared-mime-info
cloudprint? (
>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.39 )
wayland? (
>=dev-libs/wayland-1.3.90[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
)
X? (
>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
x11-libs/libXrender[${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXcomposite[${MULTILIB_USEDEP}]
x11-libs/libXdamage[${MULTILIB_USEDEP}]
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
)
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd:4.1.2
dev-libs/libxslt
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.20
sys-devel/gettext
virtual/pkgconfig[${MULTILIB_USEDEP}]
X? (
x11-proto/xextproto[${MULTILIB_USEDEP}]
x11-proto/xproto[${MULTILIB_USEDEP}]
x11-proto/inputproto[${MULTILIB_USEDEP}]
x11-proto/damageproto[${MULTILIB_USEDEP}]
xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
)
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
"
# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
# >=xorg-server-1.11.4 needed for
# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
RDEPEND="${COMMON_DEPEND}
!<gnome-base/gail-1000
!<x11-libs/vte-0.31.0:2.90
X? ( !<x11-base/xorg-server-1.11.4 )
"
PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
MULTILIB_CHOST_TOOLS=(
/usr/bin/gtk-query-immodules-3.0
)
strip_builddir() {
local rule=$1
shift
local directory=$1
shift
sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
|| die "Could not strip director ${directory} from build."
}
src_prepare() {
# -O3 and company cause random crashes in applications. Bug #133469
replace-flags -O3 -O2
strip-flags
# Build fix on Darwin 10.6; bug #519058
epatch "${FILESDIR}/${P}-darwin10.6.patch"
if ! use test ; then
# don't waste time building tests
strip_builddir SRC_SUBDIRS testsuite Makefile.am
strip_builddir SRC_SUBDIRS testsuite Makefile.in
strip_builddir SRC_SUBDIRS tests Makefile.am
strip_builddir SRC_SUBDIRS tests Makefile.in
fi
if ! use examples; then
# don't waste time building demos
strip_builddir SRC_SUBDIRS demos Makefile.am
strip_builddir SRC_SUBDIRS demos Makefile.in
strip_builddir SRC_SUBDIRS examples Makefile.am
strip_builddir SRC_SUBDIRS examples Makefile.in
fi
gnome2_src_prepare
}
multilib_src_configure() {
# Passing --disable-debug is not recommended for production use
# need libdir here to avoid a double slash in a path that libtool doesn't
# grok so well during install (// between $EPREFIX and usr ...)
ECONF_SOURCE=${S} \
gnome2_src_configure \
$(use_enable aqua quartz-backend) \
$(use_enable cloudprint) \
$(use_enable colord) \
$(use_enable cups cups auto) \
$(usex debug --enable-debug=yes "") \
$(multilib_native_use_enable introspection) \
$(use_enable wayland wayland-backend) \
$(use_enable X x11-backend) \
$(use_enable X xcomposite) \
$(use_enable X xdamage) \
$(use_enable X xfixes) \
$(use_enable X xkb) \
$(use_enable X xrandr) \
$(use_enable xinerama) \
--disable-papi \
--enable-man \
--enable-gtk2-dependency \
--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
--libdir="${EPREFIX}"/usr/$(get_libdir)
# work-around gtk-doc out-of-source brokedness
if multilib_is_native_abi; then
local d
for d in gdk gtk libgail-util; do
ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
done
fi
}
multilib_src_test() {
# Tests require a new gnome-themes-standard, but adding it to DEPEND
# would result in circular dependencies.
# https://bugzilla.gnome.org/show_bug.cgi?id=669562
if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
ewarn "is not installed. Please re-run tests after installing the"
ewarn "required version of gnome-themes-standard."
return 0
fi
# FIXME: this should be handled at eclass level
"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
unset DBUS_SESSION_BUS_ADDRESS
GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
}
multilib_src_install() {
gnome2_src_install
# add -framework Carbon to the .pc files
if use aqua ; then
for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
sed -e "s:Libs\: :Libs\: -framework Carbon :" \
-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
done
fi
}
multilib_src_install_all() {
insinto /etc/gtk-3.0
doins "${FILESDIR}"/settings.ini
dodoc AUTHORS ChangeLog* HACKING NEWS* README*
}
pkg_preinst() {
gnome2_pkg_preinst
multilib_pkg_preinst() {
# Make sure loaders.cache belongs to gdk-pixbuf alone
local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
if [[ -e ${EROOT}${cache} ]]; then
cp "${EROOT}"${cache} "${ED}"/${cache} || die
else
touch "${ED}"/${cache} || die
fi
}
multilib_parallel_foreach_abi multilib_pkg_preinst
}
pkg_postinst() {
gnome2_pkg_postinst
gnome2_query_immodules_gtk3
if ! has_version "app-text/evince"; then
elog "Please install app-text/evince for print preview functionality."
elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
elog "add it to your settings.ini file."
fi
}
pkg_postrm() {
gnome2_pkg_postrm
if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
multilib_pkg_postrm() {
rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
}
multilib_foreach_abi multilib_pkg_postrm
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: gtk+-3.12.2-r1.ebuild ChangeLog
@ 2014-11-26 4:59 Michal Gorny (mgorny)
0 siblings, 0 replies; 2+ messages in thread
From: Michal Gorny (mgorny) @ 2014-11-26 4:59 UTC (permalink / raw
To: gentoo-commits
mgorny 14/11/26 04:59:19
Modified: gtk+-3.12.2-r1.ebuild ChangeLog
Log:
Forward-port ${CHOST}-cups-config use, bug #530494.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.3 x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild?r1=1.2&r2=1.3
Index: gtk+-3.12.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk+-3.12.2-r1.ebuild 24 Nov 2014 01:41:45 -0000 1.2
+++ gtk+-3.12.2-r1.ebuild 26 Nov 2014 04:59:19 -0000 1.3
@@ -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 @@
--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
1.741 x11-libs/gtk+/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.741&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?rev=1.741&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/ChangeLog?r1=1.740&r2=1.741
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v
retrieving revision 1.740
retrieving revision 1.741
diff -u -r1.740 -r1.741
--- ChangeLog 24 Nov 2014 01:41:45 -0000 1.740
+++ ChangeLog 26 Nov 2014 04:59:19 -0000 1.741
@@ -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:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-26 4:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-22 23:02 [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+: gtk+-3.12.2-r1.ebuild ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2014-11-26 4:59 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox