Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libchamplain/files: libchamplain-0.12.1-vala-cogl-pango-1.0.patch
Date: Sat, 04 Feb 2012 22:44:38
Message-Id: 20120204224428.CC7402004C@flycatcher.gentoo.org
1 tetromino 12/02/04 22:44:28
2
3 Added: libchamplain-0.12.1-vala-cogl-pango-1.0.patch
4 Log:
5 Fix building vala bindings (bug #402013, thanks to Billy DeVincentis for reporting).
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch?rev=1.1&content-type=text/plain
14
15 Index: libchamplain-0.12.1-vala-cogl-pango-1.0.patch
16 ===================================================================
17 From 79062869a18ef70862f5cadb51a53731d3ba5cc1 Mon Sep 17 00:00:00 2001
18 From: Alexandre Rostovtsev <tetromino@g.o>
19 Date: Sat, 4 Feb 2012 16:51:53 -0500
20 Subject: [PATCH] Call vapigen with --pkg cogl-pango-1.0
21
22 https://bugzilla.gnome.org/show_bug.cgi?id=669378
23 ---
24 champlain-gtk/Makefile.am | 2 +-
25 champlain/Makefile.am | 2 +-
26 2 files changed, 2 insertions(+), 2 deletions(-)
27
28 diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
29 index 1efeeea..549c197 100644
30 --- a/champlain-gtk/Makefile.am
31 +++ b/champlain-gtk/Makefile.am
32 @@ -113,7 +113,7 @@ if ENABLE_VALA
33 CLEANFILES += $(dist_vapi_DATA)
34
35 champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi: GtkChamplain-@CHAMPLAIN_API_VERSION@.gir
36 - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
37 + $(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg cogl-pango-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
38
39 endif
40
41 diff --git a/champlain/Makefile.am b/champlain/Makefile.am
42 index a4b55a6..f145e9f 100644
43 --- a/champlain/Makefile.am
44 +++ b/champlain/Makefile.am
45 @@ -206,7 +206,7 @@ if ENABLE_VALA
46 CLEANFILES += $(dist_vapi_DATA)
47
48 champlain-@CHAMPLAIN_API_VERSION@.vapi: Champlain-@CHAMPLAIN_API_VERSION@.gir
49 - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )
50 + $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg cogl-pango-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )
51
52 endif
53
54 --
55 1.7.8.4