diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-04 22:38:36 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-04 22:38:36 +0000 |
commit | df98b63bbcabab6da2ee4da455e5e2d36b19bf1d (patch) | |
tree | 69da83e05844c9f97bb1912d57f028db873de93c /dev-lang | |
parent | Marking hwsetup-1.2-r2 ppc for bug 397207 (diff) | |
download | gentoo-2-df98b63bbcabab6da2ee4da455e5e2d36b19bf1d.tar.gz gentoo-2-df98b63bbcabab6da2ee4da455e5e2d36b19bf1d.tar.bz2 gentoo-2-df98b63bbcabab6da2ee4da455e5e2d36b19bf1d.zip |
Add cogl-pango vala bindings from 0.15.x, required for vala support in libchamplain-0.12.x (bug #402013).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/vala/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch | 92 | ||||
-rw-r--r-- | dev-lang/vala/vala-0.14.2-r1.ebuild | 61 |
3 files changed, 161 insertions, 1 deletions
diff --git a/dev-lang/vala/ChangeLog b/dev-lang/vala/ChangeLog index b5722f22d190..b8502581dd70 100644 --- a/dev-lang/vala/ChangeLog +++ b/dev-lang/vala/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/vala # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.85 2012/02/01 02:55:39 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/ChangeLog,v 1.86 2012/02/04 22:38:36 tetromino Exp $ + +*vala-0.14.2-r1 (04 Feb 2012) + + 04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + +vala-0.14.2-r1.ebuild, +files/vala-0.14.2-cogl-pango-1.0.patch: + Add cogl-pango vala bindings from 0.15.x, required for vala support in + libchamplain-0.12.x (bug #402013). *vala-0.14.2 (01 Feb 2012) diff --git a/dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch b/dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch new file mode 100644 index 000000000000..987f7177fbb9 --- /dev/null +++ b/dev-lang/vala/files/vala-0.14.2-cogl-pango-1.0.patch @@ -0,0 +1,92 @@ +From 7af6a003e386739a37b356ab073772ae38b1f9c6 Mon Sep 17 00:00:00 2001 +From: Evan Nemerson <evan@coeus-group.com> +Date: Thu, 12 Jan 2012 15:08:08 -0800 +Subject: [PATCH] Add cogl-pango-1.0 bindings + +--- + vapi/Makefile.am | 7 ++++++- + vapi/cogl-pango-1.0.deps | 2 ++ + vapi/cogl-pango-1.0.vapi | 30 ++++++++++++++++++++++++++++++ + 3 files changed, 38 insertions(+), 1 deletions(-) + create mode 100644 vapi/cogl-pango-1.0.deps + create mode 100644 vapi/cogl-pango-1.0.vapi + +diff --git a/vapi/Makefile.am b/vapi/Makefile.am +index c9a7aad..cd3b9e1 100644 +--- a/vapi/Makefile.am ++++ b/vapi/Makefile.am +@@ -28,6 +28,8 @@ dist_vapi_DATA = \ + clutter-json-1.0.vapi \ + cogl-1.0.vapi \ + cogl-1.0.deps \ ++ cogl-pango-1.0.vapi \ ++ cogl-pango-1.0.deps \ + curses.vapi \ + dbus-glib-1.vapi \ + enchant.vapi \ +@@ -246,7 +248,7 @@ dist_noinst_DATA = \ + config.vapi \ + $(NULL) + +-BINDINGS = atk clutter-1.0 clutter-gtk-0.10 clutter-gtk-1.0 cogl-1.0 gconf-2.0 gdk-2.0 gdk-3.0 gdk-pixbuf-2.0 gdk-x11-2.0 gdk-x11-3.0 gdl-1.0 gdu gdu-gtk gedit-2.20 gedit gio-2.0 gio-unix-2.0 gnome-desktop-2.0 gnome-keyring-1 gnome-vfs-2.0 goocanvas gstreamer-0.10 gstreamer-app-0.10 gstreamer-audio-0.10 gstreamer-base-0.10 gstreamer-cdda-0.10 gstreamer-check-0.10 gstreamer-controller-0.10 gstreamer-dataprotocol-0.10 gstreamer-fft-0.10 gstreamer-interfaces-0.10 gstreamer-net-0.10 gstreamer-netbuffer-0.10 gstreamer-pbutils-0.10 gstreamer-riff-0.10 gstreamer-rtp-0.10 gstreamer-rtsp-0.10 gstreamer-sdp-0.10 gstreamer-tag-0.10 gstreamer-video-0.10 gtk+-2.0 gtk+-3.0 gtksourceview-2.0 gtksourceview-3.0 gudev-1.0 hildon-1 hildon-fm-2 json-glib-1.0 libepc-1.0 libgda-4.0 libgda-report-4.0 libgdata libglade-2.0 libgnome-2.0 libgnome-menu libgnomeui-2.0 libgsf-1 libnotify liboobs-1 libpeas-1.0 librsvg-2.0 libsexy libsoup-2.2 libsoup-2.4 libwnck-1.0 loudmouth-1.0 mx-1.0 packagekit-glib2 pango pangocairo poppler-glib purple rest-0.6 rest-extras-0.6 rest-0.7 tracker-indexer-module-1.0 twitter-glib-1.0 unique-1.0 vte vte-2.90 webkit-1.0 ++BINDINGS = atk clutter-1.0 clutter-gtk-0.10 clutter-gtk-1.0 cogl-1.0 cogl-pango-1.0 gconf-2.0 gdk-2.0 gdk-3.0 gdk-pixbuf-2.0 gdk-x11-2.0 gdk-x11-3.0 gdl-1.0 gdu gdu-gtk gedit-2.20 gedit gio-2.0 gio-unix-2.0 gnome-desktop-2.0 gnome-keyring-1 gnome-vfs-2.0 goocanvas gstreamer-0.10 gstreamer-app-0.10 gstreamer-audio-0.10 gstreamer-base-0.10 gstreamer-cdda-0.10 gstreamer-check-0.10 gstreamer-controller-0.10 gstreamer-dataprotocol-0.10 gstreamer-fft-0.10 gstreamer-interfaces-0.10 gstreamer-net-0.10 gstreamer-netbuffer-0.10 gstreamer-pbutils-0.10 gstreamer-riff-0.10 gstreamer-rtp-0.10 gstreamer-rtsp-0.10 gstreamer-sdp-0.10 gstreamer-tag-0.10 gstreamer-video-0.10 gtk+-2.0 gtk+-3.0 gtksourceview-2.0 gtksourceview-3.0 gudev-1.0 hildon-1 hildon-fm-2 json-glib-1.0 libepc-1.0 libgda-4.0 libgda-report-4.0 libgdata libglade-2.0 libgnome-2.0 libgnome-menu libgnomeui-2.0 libgsf-1 libnotify liboobs-1 libpeas-1.0 librsvg-2.0 libsexy libsoup-2.2 libsoup-2.4 libwnck-1.0 loudmouth-1.0 mx-1.0 packagekit-glib2 pango pangocairo poppler-glib purple rest-0.6 rest-extras-0.6 rest-0.7 tracker-indexer-module-1.0 twitter-glib-1.0 unique-1.0 vte vte-2.90 webkit-1.0 + + VAPIGEN = $(top_builddir)/vapigen/vapigen + VAPIGENFLAGS = --vapidir $(srcdir) +@@ -275,6 +277,9 @@ clutter-gtk-1.0: + cogl-1.0: + $(GENVAPI) --library $(srcdir)/cogl-1.0 $(PACKAGESDIR)/cogl-1.0/cogl-1.0-custom.vala $(PACKAGESDIR)/cogl-1.0/cogl-1.0.gi + ++cogl-pango-1.0: ++ $(GENVAPI) --library $(srcdir)/cogl-pango-1.0 --metadatadir $(METADATADIR) --pkg cogl-1.0 --pkg pango $(GIRDIR)/CoglPango-1.0.gir ++ + gconf-2.0: + $(GENVAPI) --library $(srcdir)/gconf-2.0 $(PACKAGESDIR)/gconf-2.0/gconf-2.0.gi + +diff --git a/vapi/cogl-pango-1.0.deps b/vapi/cogl-pango-1.0.deps +new file mode 100644 +index 0000000..ebc27e5 +--- /dev/null ++++ b/vapi/cogl-pango-1.0.deps +@@ -0,0 +1,2 @@ ++cogl-1.0 ++pango +diff --git a/vapi/cogl-pango-1.0.vapi b/vapi/cogl-pango-1.0.vapi +new file mode 100644 +index 0000000..4b2599c +--- /dev/null ++++ b/vapi/cogl-pango-1.0.vapi +@@ -0,0 +1,30 @@ ++/* cogl-pango-1.0.vapi generated by vapigen, do not modify. */ ++ ++[CCode (cprefix = "CoglPango", gir_namespace = "CoglPango", gir_version = "1.0", lower_case_cprefix = "cogl_pango_")] ++namespace CoglPango { ++ [CCode (cheader_filename = "cogl-pango/cogl-pango.h")] ++ public class FontMap : Pango.FontMap { ++ [CCode (has_construct_function = false)] ++ protected FontMap (); ++ public static void clear_glyph_cache (Pango.CairoFontMap fm); ++ public static Pango.Context create_context (Pango.CairoFontMap fm); ++ public static unowned Pango.Renderer get_renderer (Pango.CairoFontMap fm); ++ public static bool get_use_mipmapping (Pango.CairoFontMap fm); ++ public static Pango.FontMap @new (); ++ public static void set_resolution (Pango.CairoFontMap font_map, double dpi); ++ public static void set_use_mipmapping (Pango.CairoFontMap fm, bool value); ++ } ++ [CCode (cheader_filename = "cogl-pango/cogl-pango.h", type_id = "cogl_pango_renderer_get_type ()")] ++ public class Renderer : Pango.Renderer { ++ [CCode (has_construct_function = false)] ++ protected Renderer (); ++ } ++ [CCode (cheader_filename = "cogl-pango/cogl-pango.h")] ++ public static void ensure_glyph_cache_for_layout (Pango.Layout layout); ++ [CCode (cheader_filename = "cogl-pango/cogl-pango.h")] ++ public static void render_layout (Pango.Layout layout, int x, int y, Cogl.Color color, int flags); ++ [CCode (cheader_filename = "cogl-pango/cogl-pango.h")] ++ public static void render_layout_line (Pango.LayoutLine line, int x, int y, Cogl.Color color); ++ [CCode (cheader_filename = "cogl-pango/cogl-pango.h")] ++ public static void render_layout_subpixel (Pango.Layout layout, int x, int y, Cogl.Color color, int flags); ++} +-- +1.7.8.4 + diff --git a/dev-lang/vala/vala-0.14.2-r1.ebuild b/dev-lang/vala/vala-0.14.2-r1.ebuild new file mode 100644 index 000000000000..31b8a9bab4b4 --- /dev/null +++ b/dev-lang/vala/vala-0.14.2-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.14.2-r1.ebuild,v 1.1 2012/02/04 22:38:36 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools alternatives eutils gnome2 + +DESCRIPTION="Vala - Compiler for the GObject type system" +HOMEPAGE="http://live.gnome.org/Vala" + +LICENSE="LGPL-2.1" +SLOT="0.14" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux" +IUSE="test +vapigen" + +RDEPEND=">=dev-libs/glib-2.16:2" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + sys-devel/flex + || ( sys-devel/bison dev-util/byacc dev-util/yacc ) + dev-util/pkgconfig + dev-libs/libxslt + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 )" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-unversioned + $(use_enable vapigen)" + DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" +} + +src_prepare() { + # Patch from 0.15.x, needed for libchamplain:0.12, bug #402013, + # https://bugzilla.gnome.org/show_bug.cgi?id=669379 + epatch "${FILESDIR}/${PN}-0.14.2-cogl-pango-1.0.patch" + + eautoreconf + gnome2_src_prepare +} + +src_install() { + gnome2_src_install + + insinto /usr/share/aclocal + newins vala.m4 vala-${SLOT/./-}.m4 +} + +pkg_postinst() { + gnome2_pkg_postinst + alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4" +} + +pkg_postrm() { + gnome2_pkg_postrm + alternatives_auto_makesym /usr/share/aclocal/vala.m4 "vala-0-[0-9][0-9].m4" +} |