diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-12 04:16:12 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-12 04:16:12 +0000 |
commit | 5730c5419c375bb909281e16a8d49fac4a18ac55 (patch) | |
tree | dd09c8e8fd47ec28891c2f472139762889f3d06e /dev-cpp | |
parent | Version bump for glib-2.32. (diff) | |
download | historical-5730c5419c375bb909281e16a8d49fac4a18ac55.tar.gz historical-5730c5419c375bb909281e16a8d49fac4a18ac55.tar.bz2 historical-5730c5419c375bb909281e16a8d49fac4a18ac55.zip |
Version bump for gtk+-3.4.
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'dev-cpp')
-rw-r--r-- | dev-cpp/gtkmm/ChangeLog | 8 | ||||
-rw-r--r-- | dev-cpp/gtkmm/files/gtkmm-3.4.0-automagic-gdk-targets.patch | 37 | ||||
-rw-r--r-- | dev-cpp/gtkmm/gtkmm-3.4.0.ebuild | 68 | ||||
-rw-r--r-- | dev-cpp/gtkmm/metadata.xml | 3 |
4 files changed, 115 insertions, 1 deletions
diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog index 47c3cc9ddd5e..994675bfc7b9 100644 --- a/dev-cpp/gtkmm/ChangeLog +++ b/dev-cpp/gtkmm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-cpp/gtkmm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.225 2012/04/01 17:34:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.226 2012/04/12 04:16:12 tetromino Exp $ + +*gtkmm-3.4.0 (12 Apr 2012) + + 12 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +gtkmm-3.4.0.ebuild, + +files/gtkmm-3.4.0-automagic-gdk-targets.patch: + Version bump for gtk+-3.4. 01 Apr 2012; Raúl Porcel <armin76@gentoo.org> gtkmm-3.2.0.ebuild: alpha/ia64/sh/sparc stable wrt #407643 diff --git a/dev-cpp/gtkmm/files/gtkmm-3.4.0-automagic-gdk-targets.patch b/dev-cpp/gtkmm/files/gtkmm-3.4.0-automagic-gdk-targets.patch new file mode 100644 index 000000000000..2aa5a41d1993 --- /dev/null +++ b/dev-cpp/gtkmm/files/gtkmm-3.4.0-automagic-gdk-targets.patch @@ -0,0 +1,37 @@ +From f86a02f31783acb1be29daf748f8385e8a66f113 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Wed, 11 Apr 2012 23:37:19 -0400 +Subject: [PATCH] Make list of gdk targets non-automagic + +Otherwise, it is difficult e.g. to build a wayland-only gtkmm on a +build machine that has gdk with both x11 and wayland targets installed. +The argument to --with-gdk-targets is comma-delimeted to make quoting +easier in automated build scripts. + +https://bugzilla.gnome.org/show_bug.cgi?id=673963 +--- + configure.ac | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5c85b7e..141f39a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,7 +52,13 @@ gdk_target_quartz=no + gdk_target_x11=no + gdk_target_wayland=no + gdk_target_broadway=no +-for target in `$PKG_CONFIG --variable=targets gtk+-3.0`; do ++AC_ARG_WITH(gdk_targets, AS_HELP_STRING([--with-gdk-targets@<:@=TARGETS@:>@], [comma-delimeted list of gdk targets (default is "", meaning auto-detect)]), ,[with_gdk_targets=]) ++if test -z "$with_gdk_targets"; then ++ gdk_targets=`$PKG_CONFIG --variable=targets gtk+-3.0` ++else ++ gdk_targets=`echo $with_gdk_targets | tr , ' '` ++fi ++for target in $gdk_targets; do + case "$target" in + win32) + gdk_target_win32=yes +-- +1.7.8.5 + diff --git a/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild new file mode 100644 index 000000000000..b87dc56a4602 --- /dev/null +++ b/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-3.4.0.ebuild,v 1.1 2012/04/12 04:16:12 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="C++ interface for GTK+2" +HOMEPAGE="http://www.gtkmm.org" + +LICENSE="LGPL-2.1" +SLOT="3.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="aqua doc examples test wayland X" +REQUIRED_USE="|| ( aqua wayland X )" + +RDEPEND=" + >=dev-cpp/glibmm-2.32.0:2 + >=x11-libs/gtk+-3.4.0:3[aqua?,wayland?,X?] + >=x11-libs/gdk-pixbuf-2.22.1:2 + >=dev-cpp/atkmm-2.22.2 + >=dev-cpp/cairomm-1.9.2.2 + >=dev-cpp/pangomm-2.27.1:1.4 + dev-libs/libsigc++:2" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( + media-gfx/graphviz + dev-libs/libxslt + app-doc/doxygen ) + + dev-cpp/mm-common" +# eautoreconf needs mm-common + +pkg_setup() { + DOCS="AUTHORS ChangeLog PORTING NEWS README" + targets= + use X && targets="x11" + use aqua && targets="${targets},quartz" + use wayland && targets="${targets},wayland" + G2CONF="${G2CONF} + --enable-api-atkmm + --with-gdk-targets=${targets/#,/} + $(use_enable doc documentation)" +} + +src_prepare() { + if ! use test; then + # don't waste time building tests + sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed 1 failed" + fi + + if ! use examples; then + # don't waste time building tests + sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed 2 failed" + fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=673963 + epatch "${FILESDIR}/${PN}-3.4.0-automagic-gdk-targets.patch" + + eautoreconf + gnome2_src_prepare +} diff --git a/dev-cpp/gtkmm/metadata.xml b/dev-cpp/gtkmm/metadata.xml index 57c9d9c1a1d8..b21acc696c0c 100644 --- a/dev-cpp/gtkmm/metadata.xml +++ b/dev-cpp/gtkmm/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome-mm</herd> +<use> + <flag name="wayland">Enable <pkg>dev-libs/wayland</pkg> backend</flag> +</use> </pkgmetadata> |