[libchamplain/f17] try again

Matthias Clasen mclasen at fedoraproject.org
Tue Feb 28 14:46:47 UTC 2012


commit 2d9ab2c3795cb42dc67c9ce6fa5707c92da86325
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Feb 28 09:47:03 2012 -0500

    try again

 champlain-grr.patch |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/champlain-grr.patch b/champlain-grr.patch
index f4436e2..a2958de 100644
--- a/champlain-grr.patch
+++ b/champlain-grr.patch
@@ -1,3 +1,24 @@
+diff -up libchamplain-0.12.1/champlain-gtk/Makefile.am.grr libchamplain-0.12.1/champlain-gtk/Makefile.am
+--- libchamplain-0.12.1/champlain-gtk/Makefile.am.grr	2012-02-28 09:45:19.484067486 -0500
++++ libchamplain-0.12.1/champlain-gtk/Makefile.am	2012-02-28 09:46:54.180068907 -0500
+@@ -77,7 +77,7 @@ GtkChamplain- at CHAMPLAIN_API_VERSION@.gir
+ GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain
+ GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@
+ GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk- at CHAMPLAIN_API_VERSION@.la
+-GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0
++GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 pangocairo
+ GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
+ GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0
+ GtkChamplain_ at CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-gtk- at CHAMPLAIN_API_VERSION@
+@@ -113,7 +113,7 @@ if ENABLE_VALA
+ CLEANFILES += $(dist_vapi_DATA)
+ 
+ champlain-gtk- at CHAMPLAIN_API_VERSION@.vapi:	GtkChamplain- at CHAMPLAIN_API_VERSION@.gir
+-	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk- at CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain- at CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain- at CHAMPLAIN_API_VERSION@.gir )
++	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk- at CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain- at CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --pkg cogl-pango-1.0 --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain- at CHAMPLAIN_API_VERSION@.gir )
+ 
+ endif
+ 
 diff -up libchamplain-0.12.1/champlain/Makefile.am.grr libchamplain-0.12.1/champlain/Makefile.am
 --- libchamplain-0.12.1/champlain/Makefile.am.grr	2012-02-28 08:49:02.657016816 -0500
 +++ libchamplain-0.12.1/champlain/Makefile.am	2012-02-28 09:08:01.679033908 -0500


More information about the scm-commits mailing list