Hello community,
here is the log from the commit of package libchamplain for openSUSE:Factory checked in at 2014-07-04 17:18:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libchamplain (Old)
and /work/SRC/openSUSE:Factory/.libchamplain.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libchamplain"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libchamplain/libchamplain.changes 2014-02-11 10:29:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libchamplain.new/libchamplain.changes 2014-07-04 17:18:34.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Jul 1 21:11:32 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 0.12.8:
+ + Fix crash when changing a map source.
+ + Drop the dependency on libsoup-gnome by using libsoup 2.34 or
+ newer.
+ + Add basic touchscreen support.
+
+-------------------------------------------------------------------
Old:
----
libchamplain-0.12.7.tar.xz
New:
----
libchamplain-0.12.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libchamplain.spec ++++++
--- /var/tmp/diff_new_pack.weTwgw/_old 2014-07-04 17:18:35.000000000 +0200
+++ /var/tmp/diff_new_pack.weTwgw/_new 2014-07-04 17:18:35.000000000 +0200
@@ -17,7 +17,7 @@
Name: libchamplain
-Version: 0.12.7
+Version: 0.12.8
Release: 0
Summary: Library to display maps
License: LGPL-2.1+
@@ -31,7 +31,7 @@
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
BuildRequires: gtk3-devel
-BuildRequires: libsoup-devel
+BuildRequires: libsoup-devel >= 2.34
BuildRequires: memphis-devel
BuildRequires: sqlite3-devel
BuildRequires: vala
++++++ libchamplain-0.12.7.tar.xz -> libchamplain-0.12.8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/ChangeLog new/libchamplain-0.12.8/ChangeLog
--- old/libchamplain-0.12.7/ChangeLog 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/ChangeLog 2014-07-01 22:36:37.000000000 +0200
@@ -1,5 +1,89 @@
# Generated by Makefile. Do not edit.
+commit 4d80cf4ef464e3102cfc4348454a0da02f3e12ce
+Author: Jiří Techet
+Date: Tue Jul 1 21:46:55 2014 +0200
+
+ 0.12.8
+
+commit cf6530cbdf7b76e84c7216293699664baf690dbd
+Author: Jonas Danielsson
+Date: Sat Apr 19 23:45:45 2014 +0200
+
+ ChamplainView: Sink initial MapSource reference
+
+ We need to call g_object_ref_sink on the initial MapSource otherwise
+ we will call g_object_unref on a floating reference when a new
+ MapSource is set.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=728337
+
+commit 75c8c5a68bb385357f5c0e9167846050d7259cc6
+Author: Reyad Attiyat
+Date: Wed Apr 2 17:39:34 2014 -0500
+
+ Added in touch support to the kinetic scrolling callbacks
+
+commit 855f5b0a17d6753b9c135875ce6ac97cffca4e7d
+Author: Ryan Lortie
+Date: Thu Feb 27 22:13:58 2014 -0500
+
+ demos: Remove libraries from LDFLAGS
+
+ The libraries that the demos link against are already (properly) listed
+ in the per-target _LDADD variable. Libraries should never be in LDFLAGS
+ -- this is for linker options only.
+
+ This unbreaks the build on FreeBSD
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725364
+
+commit 78d3f339b8dc35569419f2a9e13731521f647909
+Author: Jiří Techet
+Date: Wed Feb 26 19:47:00 2014 +0100
+
+ Bump libsoup dependency to 2.34 and use default proxy resolver
+
+commit f2025d9099d72a2b96cd9ceb66a0d546b89ddc51
+Author: Jonas Danielsson
+Date: Tue Feb 25 16:40:00 2014 +0100
+
+ Do not depend on libsoup-gnome-2.4
+
+ Everything in libsoup-gnome is deprecated.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725126
+
+commit fc12385c15827fa41ef6e12ffea4f916c2837608
+Author: Jonas Danielsson
+Date: Tue Feb 25 16:36:05 2014 +0100
+
+ Update required version of libsoup
+
+ In order to use the new SoupSession API we need 2.42 of libsoup.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725126
+
+commit 594e04c91f23321b3c774e8507832faad1ee746c
+Author: Jonas Danielsson
+Date: Tue Feb 25 16:16:31 2014 +0100
+
+ Update documentation of proxy-uri property.
+
+ SoupSession resolve the default proxy when the proxy-uri
+ property is absent. Setting the proxy-uri will override the
+ default proxy.
+
+ This patch updates the doc to make that apparent.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725126
+
+commit eb406913b9423a729fca93d0d91f8d9fd4d45cb4
+Author: Jiří Techet
+Date: Thu Feb 6 21:09:52 2014 +0100
+
+ Post release version bump
+
commit 058199a9d8c85263506dce444bfe6fb874fa6857
Author: Jiří Techet
Date: Thu Feb 6 20:46:17 2014 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/Makefile.in new/libchamplain-0.12.8/Makefile.in
--- old/libchamplain-0.12.7/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -276,11 +276,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/NEWS new/libchamplain-0.12.8/NEWS
--- old/libchamplain-0.12.7/NEWS 2014-02-06 20:28:28.000000000 +0100
+++ new/libchamplain-0.12.8/NEWS 2014-07-01 21:34:26.000000000 +0200
@@ -1,3 +1,15 @@
+libchamplain 0.12.8 (2014-07-01)
+================================
+
+Stable release
+
+Changes:
+
+* Fix crash when changing a map source (Jonas Danielsson)
+* Drop the dependency on libsoup-gnome by using libsoup 2.34 or newer
+ (Jonas Danielsson)
+* Add basic touchscreen support (Reyad Attiyat)
+
libchamplain 0.12.7 (2014-02-06)
================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/build/Makefile.in new/libchamplain-0.12.8/build/Makefile.in
--- old/libchamplain-0.12.7/build/Makefile.in 2014-02-06 20:46:31.000000000 +0100
+++ new/libchamplain-0.12.8/build/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -179,11 +179,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/Makefile.am new/libchamplain-0.12.8/champlain/Makefile.am
--- old/libchamplain-0.12.7/champlain/Makefile.am 2013-09-29 22:54:49.000000000 +0200
+++ new/libchamplain-0.12.8/champlain/Makefile.am 2014-02-26 19:53:47.000000000 +0100
@@ -129,7 +129,7 @@
$(libchamplain_headers_built) \
$(libchamplain_sources_built)
-libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) $(MEMPHIS_LIBS) $(LIBM)
+libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(MEMPHIS_LIBS) $(LIBM)
libchamplain_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
-version-info $(LIBRARY_VERSION)\
@@ -138,7 +138,6 @@
AM_CPPFLAGS = \
$(DEPS_CFLAGS) \
- $(SOUP_CFLAGS) \
$(MEMPHIS_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
@@ -179,7 +178,7 @@
Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-@CHAMPLAIN_API_VERSION@ $(memphis_package)
Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = --identifier-prefix=Champlain --symbol-prefix=champlain --c-include="champlain/champlain.h"
Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
- $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(MEMPHIS_CFLAGS) \
+ $(DEPS_CFLAGS) $(MEMPHIS_CFLAGS) \
-I$(top_srcdir) -I$(top_builddir) \
-DCHAMPLAIN_COMPILATION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/Makefile.in new/libchamplain-0.12.8/champlain/Makefile.in
--- old/libchamplain-0.12.7/champlain/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/champlain/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -142,7 +142,7 @@
am__DEPENDENCIES_1 =
libchamplain_@CHAMPLAIN_API_VERSION@_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1)
am__libchamplain_@CHAMPLAIN_API_VERSION@_la_SOURCES_DIST = \
$(srcdir)/champlain-memphis-renderer.h champlain-version.h \
$(srcdir)/champlain.h $(srcdir)/champlain-defines.h \
@@ -407,11 +407,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
@@ -593,7 +588,7 @@
$(libchamplain_headers_built) \
$(libchamplain_sources_built)
-libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) $(MEMPHIS_LIBS) $(LIBM)
+libchamplain_@CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(MEMPHIS_LIBS) $(LIBM)
libchamplain_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
-version-info $(LIBRARY_VERSION)\
-no-undefined \
@@ -601,7 +596,6 @@
AM_CPPFLAGS = \
$(DEPS_CFLAGS) \
- $(SOUP_CFLAGS) \
$(MEMPHIS_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
@@ -630,7 +624,7 @@
@HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-@CHAMPLAIN_API_VERSION@ $(memphis_package)
@HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = --identifier-prefix=Champlain --symbol-prefix=champlain --c-include="champlain/champlain.h"
@HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
-@HAVE_INTROSPECTION_TRUE@ $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(MEMPHIS_CFLAGS) \
+@HAVE_INTROSPECTION_TRUE@ $(DEPS_CFLAGS) $(MEMPHIS_CFLAGS) \
@HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) -I$(top_builddir) \
@HAVE_INTROSPECTION_TRUE@ -DCHAMPLAIN_COMPILATION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/champlain-kinetic-scroll-view.c new/libchamplain-0.12.8/champlain/champlain-kinetic-scroll-view.c
--- old/libchamplain-0.12.7/champlain/champlain-kinetic-scroll-view.c 2013-07-25 22:15:46.000000000 +0200
+++ new/libchamplain-0.12.8/champlain/champlain-kinetic-scroll-view.c 2014-04-04 12:29:01.000000000 +0200
@@ -258,9 +258,10 @@
ClutterActor *actor = CLUTTER_ACTOR (scroll);
gfloat x, y;
- if (event->type != CLUTTER_MOTION || !(event->modifier_state & CLUTTER_BUTTON1_MASK))
+ if ((event->type != CLUTTER_MOTION || !(event->modifier_state & CLUTTER_BUTTON1_MASK)) &&
+ event->type != CLUTTER_TOUCH_UPDATE)
return FALSE;
-
+
if (clutter_actor_transform_stage_point (actor,
event->x,
event->y,
@@ -389,8 +390,10 @@
ClutterActor *actor = CLUTTER_ACTOR (scroll);
gboolean decelerating = FALSE;
+
if ((event->type != CLUTTER_MOTION || event->modifier_state & CLUTTER_BUTTON1_MASK) &&
- (event->type != CLUTTER_BUTTON_RELEASE || event->button != 1))
+ (event->type != CLUTTER_BUTTON_RELEASE || event->button != 1) &&
+ event->type != CLUTTER_TOUCH_END)
return FALSE;
g_signal_handlers_disconnect_by_func (stage,
@@ -586,8 +589,8 @@
ClutterButtonEvent *bevent = (ClutterButtonEvent *) event;
ClutterActor *stage = clutter_actor_get_stage (actor);
- if ((event->type == CLUTTER_BUTTON_PRESS) &&
- (bevent->button == 1) &&
+ if ((((event->type == CLUTTER_BUTTON_PRESS) && (bevent->button == 1)) ||
+ event->type == CLUTTER_TOUCH_BEGIN) &&
stage)
{
ChamplainKineticScrollViewMotion *motion;
@@ -637,6 +640,8 @@
clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
g_signal_connect (self, "button-press-event",
G_CALLBACK (button_press_event_cb), self);
+ g_signal_connect (self, "touch-event",
+ G_CALLBACK (button_press_event_cb), self);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/champlain-network-bbox-tile-source.c new/libchamplain-0.12.8/champlain/champlain-network-bbox-tile-source.c
--- old/libchamplain-0.12.7/champlain/champlain-network-bbox-tile-source.c 2013-07-25 22:15:46.000000000 +0200
+++ new/libchamplain-0.12.8/champlain/champlain-network-bbox-tile-source.c 2014-02-26 19:53:47.000000000 +0100
@@ -38,11 +38,7 @@
#include "champlain-version.h"
#include "champlain-tile.h"
-#ifdef HAVE_LIBSOUP_GNOME
-#include
-#else
#include
-#endif
G_DEFINE_TYPE (ChamplainNetworkBboxTileSource, champlain_network_bbox_tile_source, CHAMPLAIN_TYPE_TILE_SOURCE)
@@ -201,7 +197,7 @@
/**
* ChamplainNetworkBboxTileSource:proxy-uri:
*
- * The proxy URI to use to access network
+ * Used to override the default proxy for accessing the network.
*
* Since: 0.8
*/
@@ -244,10 +240,8 @@
priv->proxy_uri = g_strdup ("");
priv->soup_session = soup_session_async_new_with_options (
"proxy-uri", soup_uri_new (priv->proxy_uri),
-#ifdef HAVE_LIBSOUP_GNOME
SOUP_SESSION_ADD_FEATURE_BY_TYPE,
- SOUP_TYPE_PROXY_RESOLVER_GNOME,
-#endif
+ SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
NULL);
g_object_set (G_OBJECT (priv->soup_session),
"user-agent",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/champlain-network-tile-source.c new/libchamplain-0.12.8/champlain/champlain-network-tile-source.c
--- old/libchamplain-0.12.7/champlain/champlain-network-tile-source.c 2013-07-25 22:15:46.000000000 +0200
+++ new/libchamplain-0.12.8/champlain/champlain-network-tile-source.c 2014-02-26 19:53:47.000000000 +0100
@@ -51,11 +51,7 @@
#include
#include
#include
-#ifdef HAVE_LIBSOUP_GNOME
-#include
-#else
#include
-#endif
#include
#include
#include
@@ -251,7 +247,7 @@
/**
* ChamplainNetworkTileSource:proxy-uri:
*
- * The proxy uri used to access network
+ * Used to override the default proxy for accessing the network.
*
* Since: 0.4
*/
@@ -277,10 +273,8 @@
priv->soup_session = soup_session_async_new_with_options (
"proxy-uri", NULL,
-#ifdef HAVE_LIBSOUP_GNOME
SOUP_SESSION_ADD_FEATURE_BY_TYPE,
- SOUP_TYPE_PROXY_RESOLVER_GNOME,
-#endif
+ SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
NULL);
g_object_set (G_OBJECT (priv->soup_session),
"user-agent",
@@ -414,7 +408,7 @@
* @tile_source: the #ChamplainNetworkTileSource
* @proxy_uri: the proxy uri used to access network
*
- * Sets the proxy uri used to access network.
+ * Override the default proxy for accessing the network.
*
* Since: 0.6
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/champlain-version.h new/libchamplain-0.12.8/champlain/champlain-version.h
--- old/libchamplain-0.12.7/champlain/champlain-version.h 2014-02-06 20:46:35.000000000 +0100
+++ new/libchamplain-0.12.8/champlain/champlain-version.h 2014-07-01 22:36:14.000000000 +0200
@@ -49,14 +49,14 @@
*
* The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3)
*/
-#define CHAMPLAIN_MICRO_VERSION (7)
+#define CHAMPLAIN_MICRO_VERSION (8)
/**
* CHAMPLAIN_VERSION:
*
* The full version of libchamplain, like 1.2.3
*/
-#define CHAMPLAIN_VERSION 0.12.7
+#define CHAMPLAIN_VERSION 0.12.8
/**
* CHAMPLAIN_VERSION_S:
@@ -64,7 +64,7 @@
* The full version of libchamplain, in string form (suited for
* string concatenation)
*/
-#define CHAMPLAIN_VERSION_S "0.12.7"
+#define CHAMPLAIN_VERSION_S "0.12.8"
/**
* CHAMPLAIN_VERSION_HEX:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain/champlain-view.c new/libchamplain-0.12.8/champlain/champlain-view.c
--- old/libchamplain-0.12.7/champlain/champlain-view.c 2014-02-06 20:24:50.000000000 +0100
+++ new/libchamplain-0.12.8/champlain/champlain-view.c 2014-07-01 21:09:09.000000000 +0200
@@ -1106,7 +1106,7 @@
factory = champlain_map_source_factory_dup_default ();
source = champlain_map_source_factory_create_cached_source (factory, CHAMPLAIN_MAP_SOURCE_OSM_MAPNIK);
- priv->map_source = CHAMPLAIN_MAP_SOURCE (source);
+ priv->map_source = CHAMPLAIN_MAP_SOURCE (g_object_ref_sink (source));
priv->zoom_level = 0;
priv->min_zoom_level = champlain_map_source_get_min_zoom_level (priv->map_source);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain-gtk/Makefile.am new/libchamplain-0.12.8/champlain-gtk/Makefile.am
--- old/libchamplain-0.12.7/champlain-gtk/Makefile.am 2013-07-25 22:15:46.000000000 +0200
+++ new/libchamplain-0.12.8/champlain-gtk/Makefile.am 2014-02-26 19:53:47.000000000 +0100
@@ -88,7 +88,7 @@
--c-include="champlain-gtk/champlain-gtk.h" \
--include-uninstalled=$(top_builddir)/champlain/Champlain-@CHAMPLAIN_API_VERSION@.gir
GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
- $(SOUP_CFLAGS) $(GTK_CFLAGS) $(DEPS_CFLAGS) \
+ $(GTK_CFLAGS) $(DEPS_CFLAGS) \
-I$(top_srcdir) -I$(top_builddir)\
-DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain-gtk/Makefile.in new/libchamplain-0.12.8/champlain-gtk/Makefile.in
--- old/libchamplain-0.12.7/champlain-gtk/Makefile.in 2014-02-06 20:46:31.000000000 +0100
+++ new/libchamplain-0.12.8/champlain-gtk/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -302,11 +302,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
@@ -442,7 +437,7 @@
@HAVE_INTROSPECTION_TRUE@ --include-uninstalled=$(top_builddir)/champlain/Champlain-@CHAMPLAIN_API_VERSION@.gir
@HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
-@HAVE_INTROSPECTION_TRUE@ $(SOUP_CFLAGS) $(GTK_CFLAGS) $(DEPS_CFLAGS) \
+@HAVE_INTROSPECTION_TRUE@ $(GTK_CFLAGS) $(DEPS_CFLAGS) \
@HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) -I$(top_builddir)\
@HAVE_INTROSPECTION_TRUE@ -DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain-uninstalled.pc.in new/libchamplain-0.12.8/champlain-uninstalled.pc.in
--- old/libchamplain-0.12.7/champlain-uninstalled.pc.in 2013-07-25 22:15:46.000000000 +0200
+++ new/libchamplain-0.12.8/champlain-uninstalled.pc.in 2014-02-26 19:53:47.000000000 +0100
@@ -9,4 +9,4 @@
Libs: ${abs_top_builddir}/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
Requires: gobject-2.0 glib-2.0 clutter-1.0
-Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
+Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 libsoup-2.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/champlain.pc.in new/libchamplain-0.12.8/champlain.pc.in
--- old/libchamplain-0.12.7/champlain.pc.in 2013-07-25 22:15:46.000000000 +0200
+++ new/libchamplain-0.12.8/champlain.pc.in 2014-02-26 19:53:47.000000000 +0100
@@ -9,4 +9,4 @@
Libs: -L${libdir} -lchamplain-@CHAMPLAIN_API_VERSION@
Cflags: -I${includedir}/libchamplain-@CHAMPLAIN_API_VERSION@
Requires: gobject-2.0 glib-2.0 clutter-1.0
-Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
+Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 libsoup-2.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/config.h.in new/libchamplain-0.12.8/config.h.in
--- old/libchamplain-0.12.7/config.h.in 2014-02-06 20:46:31.000000000 +0100
+++ new/libchamplain-0.12.8/config.h.in 2014-07-01 22:36:09.000000000 +0200
@@ -9,9 +9,6 @@
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
-/* libsoup gnome integration */
-#undef HAVE_LIBSOUP_GNOME
-
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/configure new/libchamplain-0.12.8/configure
--- old/libchamplain-0.12.7/configure 2014-02-06 20:46:31.000000000 +0100
+++ new/libchamplain-0.12.8/configure 2014-07-01 22:36:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libchamplain 0.12.7.
+# Generated by GNU Autoconf 2.69 for libchamplain 0.12.8.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain.
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='libchamplain'
PACKAGE_TARNAME='libchamplain'
-PACKAGE_VERSION='0.12.7'
-PACKAGE_STRING='libchamplain 0.12.7'
+PACKAGE_VERSION='0.12.8'
+PACKAGE_STRING='libchamplain 0.12.8'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain'
PACKAGE_URL='https://wiki.gnome.org/Projects/libchamplain'
@@ -711,11 +711,6 @@
ENABLE_GTK_TRUE
GTK_LIBS
GTK_CFLAGS
-SOUP_DEP
-SOUP_LIBS
-SOUP_CFLAGS
-SOUP_GNOME_LIBS
-SOUP_GNOME_CFLAGS
HAVE_INTROSPECTION_FALSE
HAVE_INTROSPECTION_TRUE
INTROSPECTION_MAKEFILE
@@ -922,10 +917,6 @@
DEPS_LIBS
GTKDOC_DEPS_CFLAGS
GTKDOC_DEPS_LIBS
-SOUP_GNOME_CFLAGS
-SOUP_GNOME_LIBS
-SOUP_CFLAGS
-SOUP_LIBS
GTK_CFLAGS
GTK_LIBS
MEMPHIS_CFLAGS
@@ -1470,7 +1461,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libchamplain 0.12.7 to adapt to many kinds of systems.
+\`configure' configures libchamplain 0.12.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1540,7 +1531,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libchamplain 0.12.7:";;
+ short | recursive ) echo "Configuration of libchamplain 0.12.8:";;
esac
cat <<\_ACEOF
@@ -1605,12 +1596,6 @@
C compiler flags for GTKDOC_DEPS, overriding pkg-config
GTKDOC_DEPS_LIBS
linker flags for GTKDOC_DEPS, overriding pkg-config
- SOUP_GNOME_CFLAGS
- C compiler flags for SOUP_GNOME, overriding pkg-config
- SOUP_GNOME_LIBS
- linker flags for SOUP_GNOME, overriding pkg-config
- SOUP_CFLAGS C compiler flags for SOUP, overriding pkg-config
- SOUP_LIBS linker flags for SOUP, overriding pkg-config
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
MEMPHIS_CFLAGS
@@ -1685,7 +1670,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libchamplain configure 0.12.7
+libchamplain configure 0.12.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1963,7 +1948,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libchamplain $as_me 0.12.7, which was
+It was created by libchamplain $as_me 0.12.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2783,7 +2768,7 @@
# Define the identity of the package.
PACKAGE='libchamplain'
- VERSION='0.12.7'
+ VERSION='0.12.8'
cat >>confdefs.h <<_ACEOF
@@ -12238,13 +12223,13 @@
# - If binary compatibility has been broken (eg removed or changed interfaces)
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=4:2:4
+LIBRARY_VERSION=4:3:4
CHAMPLAIN_API_VERSION=0.12
CHAMPLAIN_API_VERSION_NORM=0_12
CHAMPLAIN_MAJOR_VERSION=0
CHAMPLAIN_MINOR_VERSION=12
-CHAMPLAIN_MICRO_VERSION=7
-CHAMPLAIN_VERSION=0.12.7
+CHAMPLAIN_MICRO_VERSION=8
+CHAMPLAIN_VERSION=0.12.8
CHAMPLAIN_MAJORMINOR=0.12
@@ -12528,6 +12513,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
\""; } >&5
($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.16
@@ -12537,6 +12523,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
") 2>&5
ac_status=$?
@@ -12549,6 +12536,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
@@ -12569,6 +12557,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
\""; } >&5
($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.16
@@ -12578,6 +12567,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
") 2>&5
ac_status=$?
@@ -12590,6 +12580,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
@@ -12619,6 +12610,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
" 2>&1`
else
@@ -12629,6 +12621,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
" 2>&1`
fi
@@ -12642,6 +12635,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
) were not met:
@@ -13593,172 +13587,6 @@
# -----------------------------------------------------------
-# Check for libsoup, use libsoup-gnome if available
-# -----------------------------------------------------------
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUP_GNOME" >&5
-$as_echo_n "checking for SOUP_GNOME... " >&6; }
-
-if test -n "$SOUP_GNOME_CFLAGS"; then
- pkg_cv_SOUP_GNOME_CFLAGS="$SOUP_GNOME_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.26\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.26") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SOUP_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libsoup-gnome-2.4 >= 2.26" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$SOUP_GNOME_LIBS"; then
- pkg_cv_SOUP_GNOME_LIBS="$SOUP_GNOME_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.26\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.26") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SOUP_GNOME_LIBS=`$PKG_CONFIG --libs "libsoup-gnome-2.4 >= 2.26" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- SOUP_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-gnome-2.4 >= 2.26" 2>&1`
- else
- SOUP_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-gnome-2.4 >= 2.26" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$SOUP_GNOME_PKG_ERRORS" >&5
-
- have_soup_gnome="no"
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_soup_gnome="no"
-else
- SOUP_GNOME_CFLAGS=$pkg_cv_SOUP_GNOME_CFLAGS
- SOUP_GNOME_LIBS=$pkg_cv_SOUP_GNOME_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
- have_soup_gnome="yes"
- SOUP_CFLAGS=$SOUP_GNOME_CFLAGS
- SOUP_LIBS=$SOUP_GNOME_LIBS
- SOUP_DEP="libsoup-gnome-2.4"
-
-$as_echo "#define HAVE_LIBSOUP_GNOME 1" >>confdefs.h
-
-
-fi
-
-
-if test "x$have_soup_gnome" = "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOUP" >&5
-$as_echo_n "checking for SOUP... " >&6; }
-
-if test -n "$SOUP_CFLAGS"; then
- pkg_cv_SOUP_CFLAGS="$SOUP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.4.1" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$SOUP_LIBS"; then
- pkg_cv_SOUP_LIBS="$SOUP_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.4.1" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsoup-2.4 >= 2.4.1" 2>&1`
- else
- SOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsoup-2.4 >= 2.4.1" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$SOUP_PKG_ERRORS" >&5
-
- have_soup="no"
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_soup="no"
-else
- SOUP_CFLAGS=$pkg_cv_SOUP_CFLAGS
- SOUP_LIBS=$pkg_cv_SOUP_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- have_soup="yes"
-fi
- SOUP_DEP="libsoup-2.4"
-fi
-
-if test "x$have_soup" = "xno" && test "x$have_soup_gnome" = "xno"; then
- as_fn_error $? "Could not find libsoup or libsoup-gnome." "$LINENO" 5
-fi
-
-
-
-
-# -----------------------------------------------------------
# Enable debug
# -----------------------------------------------------------
@@ -14798,7 +14626,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libchamplain $as_me 0.12.7, which was
+This file was extended by libchamplain $as_me 0.12.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14865,7 +14693,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libchamplain config.status 0.12.7
+libchamplain config.status 0.12.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -16693,7 +16521,6 @@
echo " Compiler flags: ${CFLAGS} ${CPPFLAGS}"
echo " Documentation: ${enable_gtk_doc}"
echo " Debug: ${enable_debug}"
-echo " libsoup-gnome: ${have_soup_gnome}"
echo " Gtk+ View: ${enable_gtk}"
echo ""
echo "Extra renderers:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/configure.ac new/libchamplain-0.12.8/configure.ac
--- old/libchamplain-0.12.7/configure.ac 2014-02-06 20:30:02.000000000 +0100
+++ new/libchamplain-0.12.8/configure.ac 2014-07-01 21:36:56.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
m4_define([champlain_major_version], [0])
m4_define([champlain_minor_version], [12])
-m4_define([champlain_micro_version], [7])
+m4_define([champlain_micro_version], [8])
m4_define([champlain_version],
[champlain_major_version.champlain_minor_version.champlain_micro_version])
m4_define([champlain_minor_api_version], [m4_eval(champlain_minor_version + champlain_minor_version%2)])
@@ -36,7 +36,7 @@
# - If binary compatibility has been broken (eg removed or changed interfaces)
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
-LIBRARY_VERSION=4:2:4
+LIBRARY_VERSION=4:3:4
CHAMPLAIN_API_VERSION=champlain_api_version
CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
CHAMPLAIN_MAJOR_VERSION=champlain_major_version
@@ -67,6 +67,7 @@
cairo >= 1.4
gio-2.0 >= 2.16
sqlite3 >= 3.0
+ libsoup-2.4 >= 2.34
]
)
AC_SUBST(DEPS_CFLAGS)
@@ -83,31 +84,6 @@
GOBJECT_INTROSPECTION_CHECK([0.6.3])
# -----------------------------------------------------------
-# Check for libsoup, use libsoup-gnome if available
-# -----------------------------------------------------------
-PKG_CHECK_MODULES(SOUP_GNOME, libsoup-gnome-2.4 >= 2.26, [
- have_soup_gnome="yes"
- SOUP_CFLAGS=$SOUP_GNOME_CFLAGS
- SOUP_LIBS=$SOUP_GNOME_LIBS
- SOUP_DEP="libsoup-gnome-2.4"
- AC_DEFINE(HAVE_LIBSOUP_GNOME,1,[libsoup gnome integration])
- ], have_soup_gnome="no")
-
-
-if test "x$have_soup_gnome" = "xno"; then
- PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.4.1,
- have_soup="yes", have_soup="no")
- SOUP_DEP="libsoup-2.4"
-fi
-
-if test "x$have_soup" = "xno" && test "x$have_soup_gnome" = "xno"; then
- AC_MSG_ERROR([Could not find libsoup or libsoup-gnome.])
-fi
-
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
-AC_SUBST(SOUP_DEP)
-# -----------------------------------------------------------
# Enable debug
# -----------------------------------------------------------
@@ -252,7 +228,6 @@
echo " Compiler flags: ${CFLAGS} ${CPPFLAGS}"
echo " Documentation: ${enable_gtk_doc}"
echo " Debug: ${enable_debug}"
-echo " libsoup-gnome: ${have_soup_gnome}"
echo " Gtk+ View: ${enable_gtk}"
echo ""
echo "Extra renderers:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/demos/Makefile.am new/libchamplain-0.12.8/demos/Makefile.am
--- old/libchamplain-0.12.7/demos/Makefile.am 2014-02-06 20:14:55.000000000 +0100
+++ new/libchamplain-0.12.8/demos/Makefile.am 2014-03-03 21:14:59.000000000 +0100
@@ -5,7 +5,6 @@
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
-AM_LDFLAGS = $(DEPS_LIBS)
minimal_SOURCES = minimal.c
minimal_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
@@ -20,8 +19,8 @@
polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
url_marker_SOURCES = url-marker.c
-url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(WARN_CFLAGS)
-url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
+url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
+url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
create_destroy_test_SOURCES = create-destroy-test.c
create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/demos/Makefile.in new/libchamplain-0.12.8/demos/Makefile.in
--- old/libchamplain-0.12.7/demos/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/demos/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -140,7 +140,7 @@
../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
am_url_marker_OBJECTS = url_marker-url-marker.$(OBJEXT)
url_marker_OBJECTS = $(am_url_marker_OBJECTS)
-url_marker_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+url_marker_DEPENDENCIES = $(am__DEPENDENCIES_1) \
../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -332,11 +332,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
@@ -397,7 +392,6 @@
SUBDIRS = icons
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
-AM_LDFLAGS = $(DEPS_LIBS)
minimal_SOURCES = minimal.c
minimal_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
launcher_SOURCES = launcher.c markers.c
@@ -407,8 +401,8 @@
polygons_SOURCES = polygons.c
polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
url_marker_SOURCES = url-marker.c
-url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(WARN_CFLAGS)
-url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
+url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
+url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
create_destroy_test_SOURCES = create-destroy-test.c
create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
@ENABLE_GTK_TRUE@minimal_gtk_SOURCES = minimal-gtk.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/demos/icons/Makefile.in new/libchamplain-0.12.8/demos/icons/Makefile.in
--- old/libchamplain-0.12.7/demos/icons/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/demos/icons/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -179,11 +179,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/Makefile.in new/libchamplain-0.12.8/docs/Makefile.in
--- old/libchamplain-0.12.7/docs/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/docs/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -220,11 +220,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/Makefile.in new/libchamplain-0.12.8/docs/reference/Makefile.in
--- old/libchamplain-0.12.7/docs/reference/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -186,11 +186,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ChamplainNetworkBboxTileSource.html new/libchamplain-0.12.8/docs/reference/html/ChamplainNetworkBboxTileSource.html
--- old/libchamplain-0.12.7/docs/reference/html/ChamplainNetworkBboxTileSource.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ChamplainNetworkBboxTileSource.html 2014-07-01 22:36:37.000000000 +0200
@@ -263,7 +263,7 @@
<a name="ChamplainNetworkBboxTileSource--proxy-uri"></a><h3>The <code class="literal">"proxy-uri"</code> property</h3>
<pre class="programlisting"> "proxy-uri" <span class="type">gchar</span>* : Read / Write</pre>
<p>
-The proxy URI to use to access network
+Used to override the default proxy for accessing the network.
</p>
<p>Default value: ""</p>
<p class="since">Since 0.8</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ChamplainNetworkTileSource.html new/libchamplain-0.12.8/docs/reference/html/ChamplainNetworkTileSource.html
--- old/libchamplain-0.12.7/docs/reference/html/ChamplainNetworkTileSource.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ChamplainNetworkTileSource.html 2014-07-01 22:36:37.000000000 +0200
@@ -295,7 +295,7 @@
(<em class="parameter"><code><a class="link" href="ChamplainNetworkTileSource.html" title="ChamplainNetworkTileSource"><span class="type">ChamplainNetworkTileSource</span></a> *tile_source</code></em>,
<em class="parameter"><code>const <span class="type">gchar</span> *proxy_uri</code></em>);</pre>
<p>
-Sets the proxy uri used to access network.
+Override the default proxy for accessing the network.
</p>
<div class="variablelist"><table border="0">
<col align="left" valign="top">
@@ -354,7 +354,7 @@
<a name="ChamplainNetworkTileSource--proxy-uri"></a><h3>The <code class="literal">"proxy-uri"</code> property</h3>
<pre class="programlisting"> "proxy-uri" <span class="type">gchar</span>* : Read / Write</pre>
<p>
-The proxy uri used to access network
+Used to override the default proxy for accessing the network.
</p>
<p>Default value: ""</p>
<p class="since">Since 0.4</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ch01.html new/libchamplain-0.12.8/docs/reference/html/ch01.html
--- old/libchamplain-0.12.7/docs/reference/html/ch01.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ch01.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp4192192"></a>Layers</h2></div></div></div>
+<a name="idp65488"></a>Layers</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ChamplainLayer.html">ChamplainLayer</a></span><span class="refpurpose"> — Base class of libchamplain layers</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ch02.html new/libchamplain-0.12.8/docs/reference/html/ch02.html
--- old/libchamplain-0.12.7/docs/reference/html/ch02.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ch02.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp4194608"></a>Markers</h2></div></div></div>
+<a name="idp67904"></a>Markers</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ChamplainMarker.html">ChamplainMarker</a></span><span class="refpurpose"> — Base class of libchamplain markers</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ch03.html new/libchamplain-0.12.8/docs/reference/html/ch03.html
--- old/libchamplain-0.12.7/docs/reference/html/ch03.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ch03.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp4197552"></a>Locations</h2></div></div></div>
+<a name="idp83152"></a>Locations</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ChamplainLocation.html">ChamplainLocation</a></span><span class="refpurpose"> — An interface common to objects having latitude and longitude</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ch04.html new/libchamplain-0.12.8/docs/reference/html/ch04.html
--- old/libchamplain-0.12.7/docs/reference/html/ch04.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ch04.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp4202656"></a>Tile Sources</h2></div></div></div>
+<a name="idp88256"></a>Tile Sources</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ChamplainTileSource.html">ChamplainTileSource</a></span><span class="refpurpose"> — A base class of tile sources</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ch05.html new/libchamplain-0.12.8/docs/reference/html/ch05.html
--- old/libchamplain-0.12.7/docs/reference/html/ch05.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ch05.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp40272"></a>Tile Caches</h2></div></div></div>
+<a name="idp261088"></a>Tile Caches</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ChamplainTileCache.html">ChamplainTileCache</a></span><span class="refpurpose"> — A base class of tile caches</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ch06.html new/libchamplain-0.12.8/docs/reference/html/ch06.html
--- old/libchamplain-0.12.7/docs/reference/html/ch06.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ch06.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="chapter">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp42704"></a>Map Source Utilities</h2></div></div></div>
+<a name="idp263520"></a>Map Source Utilities</h2></div></div></div>
<div class="toc"><dl>
<dt>
<span class="refentrytitle"><a href="ChamplainMapSourceChain.html">ChamplainMapSourceChain</a></span><span class="refpurpose"> — A map source simplifying creation of source chains</span>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/index.html new/libchamplain-0.12.8/docs/reference/html/index.html
--- old/libchamplain-0.12.7/docs/reference/html/index.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/index.html 2014-07-01 22:36:37.000000000 +0200
@@ -16,7 +16,7 @@
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain Reference Manual</p></th></tr></table></div>
<div>
<p class="releaseinfo">
- for libchamplain 0.12.7
+ for libchamplain 0.12.8
</p>
<p>
@@ -28,7 +28,7 @@
</div>
<div><p class="copyright">Copyright © 2008-2013 libchamplain contributors</p></div>
<div><div class="legalnotice">
-<a name="idp200144"></a><p>
+<a name="idp166736"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix01.html new/libchamplain-0.12.8/docs/reference/html/ix01.html
--- old/libchamplain-0.12.7/docs/reference/html/ix01.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix01.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp51632"></a>Index</h2></div></div></div>
+<a name="idp96352"></a>Index</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>B</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix02.html new/libchamplain-0.12.8/docs/reference/html/ix02.html
--- old/libchamplain-0.12.7/docs/reference/html/ix02.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix02.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp52432"></a>Index of deprecated symbols</h2></div></div></div>
+<a name="idp97152"></a>Index of deprecated symbols</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>C</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix03.html new/libchamplain-0.12.8/docs/reference/html/ix03.html
--- old/libchamplain-0.12.7/docs/reference/html/ix03.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix03.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp53520"></a>Index of new symbols in 0.1</h2></div></div></div>
+<a name="idp98240"></a>Index of new symbols in 0.1</h2></div></div></div>
<div class="index"><div class="indexdiv">
<h3>V</h3>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix04.html new/libchamplain-0.12.8/docs/reference/html/ix04.html
--- old/libchamplain-0.12.7/docs/reference/html/ix04.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix04.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp54624"></a>Index of new symbols in 0.2</h2></div></div></div>
+<a name="idp99344"></a>Index of new symbols in 0.2</h2></div></div></div>
<div class="index"><div class="indexdiv">
<h3>V</h3>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix05.html new/libchamplain-0.12.8/docs/reference/html/ix05.html
--- old/libchamplain-0.12.7/docs/reference/html/ix05.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix05.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp61312"></a>Index of new symbols in 0.4</h2></div></div></div>
+<a name="idp100448"></a>Index of new symbols in 0.4</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>F</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix06.html new/libchamplain-0.12.8/docs/reference/html/ix06.html
--- old/libchamplain-0.12.7/docs/reference/html/ix06.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix06.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp62416"></a>Index of new symbols in 0.6</h2></div></div></div>
+<a name="idp101504"></a>Index of new symbols in 0.6</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>B</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix07.html new/libchamplain-0.12.8/docs/reference/html/ix07.html
--- old/libchamplain-0.12.7/docs/reference/html/ix07.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix07.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp63520"></a>Index of new symbols in 0.8</h2></div></div></div>
+<a name="idp102608"></a>Index of new symbols in 0.8</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>E</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix08.html new/libchamplain-0.12.8/docs/reference/html/ix08.html
--- old/libchamplain-0.12.7/docs/reference/html/ix08.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix08.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp64624"></a>Index of new symbols in 0.10</h2></div></div></div>
+<a name="idp103712"></a>Index of new symbols in 0.10</h2></div></div></div>
<div class="index">
<div class="indexdiv">
<h3>B</h3>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/ix09.html new/libchamplain-0.12.8/docs/reference/html/ix09.html
--- old/libchamplain-0.12.7/docs/reference/html/ix09.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/ix09.html 2014-07-01 22:36:37.000000000 +0200
@@ -20,7 +20,7 @@
</tr></table>
<div class="index">
<div class="titlepage"><div><div><h2 class="title">
-<a name="idp65712"></a>Index of new symbols in 0.12</h2></div></div></div>
+<a name="idp104800"></a>Index of new symbols in 0.12</h2></div></div></div>
<div class="index"><div class="indexdiv">
<h3>V</h3>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/libchamplain-ChamplainVersion.html new/libchamplain-0.12.8/docs/reference/html/libchamplain-ChamplainVersion.html
--- old/libchamplain-0.12.7/docs/reference/html/libchamplain-ChamplainVersion.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/libchamplain-ChamplainVersion.html 2014-07-01 22:36:37.000000000 +0200
@@ -77,7 +77,7 @@
<hr>
<div class="refsect2">
<a name="CHAMPLAIN-MICRO-VERSION:CAPS"></a><h3>CHAMPLAIN_MICRO_VERSION</h3>
-<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION (7)
+<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION (8)
</pre>
<p>
The micro version of libchamplain (3, if <a class="link" href="libchamplain-ChamplainVersion.html#CHAMPLAIN-VERSION:CAPS" title="CHAMPLAIN_VERSION"><code class="literal">CHAMPLAIN_VERSION</code></a> is 1.2.3)
@@ -86,7 +86,7 @@
<hr>
<div class="refsect2">
<a name="CHAMPLAIN-VERSION:CAPS"></a><h3>CHAMPLAIN_VERSION</h3>
-<pre class="programlisting">#define CHAMPLAIN_VERSION 0.12.7
+<pre class="programlisting">#define CHAMPLAIN_VERSION 0.12.8
</pre>
<p>
The full version of libchamplain, like 1.2.3
@@ -95,7 +95,7 @@
<hr>
<div class="refsect2">
<a name="CHAMPLAIN-VERSION-S:CAPS"></a><h3>CHAMPLAIN_VERSION_S</h3>
-<pre class="programlisting">#define CHAMPLAIN_VERSION_S "0.12.7"
+<pre class="programlisting">#define CHAMPLAIN_VERSION_S "0.12.8"
</pre>
<p>
The full version of libchamplain, in string form (suited for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt01.html new/libchamplain-0.12.8/docs/reference/html/pt01.html
--- old/libchamplain-0.12.7/docs/reference/html/pt01.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt01.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp4190128"></a>Part I. Basic API</h1></div></div></div>
+<a name="idp63424"></a>Part I. Basic API</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl><dt>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt02.html new/libchamplain-0.12.8/docs/reference/html/pt02.html
--- old/libchamplain-0.12.7/docs/reference/html/pt02.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt02.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp4191504"></a>Part II. Layers, Markers and Locations</h1></div></div></div>
+<a name="idp64800"></a>Part II. Layers, Markers and Locations</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt03.html new/libchamplain-0.12.8/docs/reference/html/pt03.html
--- old/libchamplain-0.12.7/docs/reference/html/pt03.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt03.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp4199568"></a>Part III. Widgets</h1></div></div></div>
+<a name="idp85168"></a>Part III. Widgets</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt04.html new/libchamplain-0.12.8/docs/reference/html/pt04.html
--- old/libchamplain-0.12.7/docs/reference/html/pt04.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt04.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp4201440"></a>Part IV. Map Source API</h1></div></div></div>
+<a name="idp87040"></a>Part IV. Map Source API</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt05.html new/libchamplain-0.12.8/docs/reference/html/pt05.html
--- old/libchamplain-0.12.7/docs/reference/html/pt05.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt05.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp45264"></a>Part V. Renderer API</h1></div></div></div>
+<a name="idp266080"></a>Part V. Renderer API</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt06.html new/libchamplain-0.12.8/docs/reference/html/pt06.html
--- old/libchamplain-0.12.7/docs/reference/html/pt06.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt06.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp47696"></a>Part VI. Others</h1></div></div></div>
+<a name="idp92464"></a>Part VI. Others</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/html/pt07.html new/libchamplain-0.12.8/docs/reference/html/pt07.html
--- old/libchamplain-0.12.7/docs/reference/html/pt07.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/html/pt07.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp50112"></a>Part VII. Annotation Glossary</h1></div></div></div>
+<a name="idp94880"></a>Part VII. Annotation Glossary</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl><dt><span class="glossary"><a href="annotation-glossary.html">Annotation Glossary</a></span></dt></dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference/version.xml new/libchamplain-0.12.8/docs/reference/version.xml
--- old/libchamplain-0.12.7/docs/reference/version.xml 2014-02-06 20:46:35.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference/version.xml 2014-07-01 22:36:14.000000000 +0200
@@ -1 +1 @@
-0.12.7
+0.12.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference-gtk/Makefile.in new/libchamplain-0.12.8/docs/reference-gtk/Makefile.in
--- old/libchamplain-0.12.7/docs/reference-gtk/Makefile.in 2014-02-06 20:46:32.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference-gtk/Makefile.in 2014-07-01 22:36:10.000000000 +0200
@@ -186,11 +186,6 @@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
-SOUP_CFLAGS = @SOUP_CFLAGS@
-SOUP_DEP = @SOUP_DEP@
-SOUP_GNOME_CFLAGS = @SOUP_GNOME_CFLAGS@
-SOUP_GNOME_LIBS = @SOUP_GNOME_LIBS@
-SOUP_LIBS = @SOUP_LIBS@
STRIP = @STRIP@
VALAC = @VALAC@
VAPIGEN = @VAPIGEN@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference-gtk/html/index.html new/libchamplain-0.12.8/docs/reference-gtk/html/index.html
--- old/libchamplain-0.12.7/docs/reference-gtk/html/index.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference-gtk/html/index.html 2014-07-01 22:36:37.000000000 +0200
@@ -16,7 +16,7 @@
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libchamplain-gtk Reference Manual</p></th></tr></table></div>
<div>
<p class="releaseinfo">
- for libchamplain-gtk 0.12.7
+ for libchamplain-gtk 0.12.8
</p>
<p>
@@ -28,7 +28,7 @@
</div>
<div><p class="copyright">Copyright © 2008-2013 libchamplain contributors</p></div>
<div><div class="legalnotice">
-<a name="idp54399056"></a><p>
+<a name="idp2037920"></a><p>
Permission is granted to copy, distribute and/or modify this
document under the terms of the <em class="citetitle">GNU Free
Documentation License</em>, Version 1.1 or any later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference-gtk/html/pt01.html new/libchamplain-0.12.8/docs/reference-gtk/html/pt01.html
--- old/libchamplain-0.12.7/docs/reference-gtk/html/pt01.html 2014-02-06 20:47:02.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference-gtk/html/pt01.html 2014-07-01 22:36:37.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="idp54259408"></a>Part I. API Reference</h1></div></div></div>
+<a name="idp3514528"></a>Part I. API Reference</h1></div></div></div>
<div class="toc">
<p><b>Table of Contents</b></p>
<dl>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.7/docs/reference-gtk/version.xml new/libchamplain-0.12.8/docs/reference-gtk/version.xml
--- old/libchamplain-0.12.7/docs/reference-gtk/version.xml 2014-02-06 20:46:35.000000000 +0100
+++ new/libchamplain-0.12.8/docs/reference-gtk/version.xml 2014-07-01 22:36:14.000000000 +0200
@@ -1 +1 @@
-0.12.7
+0.12.8
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org