Hello community, here is the log from the commit of package libchamplain for openSUSE:Factory checked in at 2012-03-02 13:48:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libchamplain (Old) and /work/SRC/openSUSE:Factory/.libchamplain.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libchamplain", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libchamplain/libchamplain.changes 2012-01-09 15:17:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libchamplain.new/libchamplain.changes 2012-03-02 13:48:51.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 27 14:24:10 UTC 2012 - vuntz@opensuse.org + +- Add libchamplain-vapi-cogl-pango.patch: fix build with vala 0.15. +- Add libtool BuildRequires and call to autoreconf, needed for + above patch. + +------------------------------------------------------------------- New: ---- libchamplain-vapi-cogl-pango.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchamplain.spec ++++++ --- /var/tmp/diff_new_pack.6PVxUj/_old 2012-03-02 13:48:53.000000000 +0100 +++ /var/tmp/diff_new_pack.6PVxUj/_new 2012-03-02 13:48:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libchamplain # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,14 @@ Name: libchamplain Version: 0.12.1 Release: 0 +# FIXME: on update, check if patch0 is still needed, or if it got fixed in vala Summary: Library to display maps License: LGPL-2.1+ Group: Development/Libraries/GNOME Url: http://projects.gnome.org/libchamplain/ Source0: http://download.gnome.org/sources/libchamplain/0.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM libchamplain-vapi-cogl-pango.patch bgo#669378 vuntz@opensuse.org -- Fix build with vala 0.15 +Patch0: libchamplain-vapi-cogl-pango.patch BuildRequires: clutter-devel BuildRequires: clutter-gtk-devel BuildRequires: fdupes @@ -31,6 +34,8 @@ BuildRequires: gobject-introspection-devel BuildRequires: gtk3-devel BuildRequires: libsoup-devel +# needed for patch0 +BuildRequires: libtool BuildRequires: memphis-devel BuildRequires: sqlite3-devel BuildRequires: vala @@ -86,12 +91,15 @@ %prep %setup -q +%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh %endif %build +# needed for patch0 +autoreconf -fi %configure --disable-static --enable-vala %__make %{?_smp_mflags} V=1 ++++++ libchamplain-vapi-cogl-pango.patch ++++++
From 79062869a18ef70862f5cadb51a53731d3ba5cc1 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev
Date: Sat, 4 Feb 2012 16:51:53 -0500 Subject: [PATCH] Call vapigen with --pkg cogl-pango-1.0
https://bugzilla.gnome.org/show_bug.cgi?id=669378 --- champlain-gtk/Makefile.am | 2 +- champlain/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am index 1efeeea..549c197 100644 --- a/champlain-gtk/Makefile.am +++ b/champlain-gtk/Makefile.am @@ -113,7 +113,7 @@ if ENABLE_VALA CLEANFILES += $(dist_vapi_DATA) champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi: GtkChamplain-@CHAMPLAIN_API_VERSION@.gir - $(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 ) + $(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 ) endif diff --git a/champlain/Makefile.am b/champlain/Makefile.am index a4b55a6..f145e9f 100644 --- a/champlain/Makefile.am +++ b/champlain/Makefile.am @@ -206,7 +206,7 @@ if ENABLE_VALA CLEANFILES += $(dist_vapi_DATA) champlain-@CHAMPLAIN_API_VERSION@.vapi: Champlain-@CHAMPLAIN_API_VERSION@.gir - $(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir ) + $(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 ) endif -- 1.7.8.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org