diff -Nru libchamplain-0.12.12/champlain/champlain-0.12.vapi libchamplain-0.12.13/champlain/champlain-0.12.vapi
--- libchamplain-0.12.12/champlain/champlain-0.12.vapi 2015-12-02 19:05:05.000000000 +0000
+++ libchamplain-0.12.13/champlain/champlain-0.12.vapi 2016-02-25 19:43:39.000000000 +0000
@@ -232,6 +232,7 @@
public uint max_zoom_level { get; construct; }
public uint min_zoom_level { get; construct; }
public string name { get; construct; }
+ public Champlain.MapProjection projection { get; construct; }
public uint tile_size { get; construct; }
public string uri_format { get; construct; }
}
@@ -274,7 +275,7 @@
public signal void drag_motion (double dx, double dy, Clutter.Event event);
}
[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_marker_layer_get_type ()")]
- public class MarkerLayer : Champlain.Layer, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
+ public class MarkerLayer : Champlain.Layer, Atk.Implementor, Champlain.Exportable, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
[CCode (has_construct_function = false)]
public MarkerLayer ();
public void add_marker (Champlain.Marker marker);
@@ -294,6 +295,7 @@
public void set_selection_mode (Champlain.SelectionMode mode);
public void show_all_markers ();
public void unselect_all_markers ();
+ public Champlain.SelectionMode selection_mode { get; set; }
}
[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_memory_cache_get_type ()")]
public class MemoryCache : Champlain.TileCache {
@@ -318,6 +320,8 @@
public string api_uri { get; set; }
[NoAccessorMethod]
public string proxy_uri { owned get; set; }
+ [NoAccessorMethod]
+ public Champlain.State state { get; set; }
}
[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_network_tile_source_get_type ()")]
public class NetworkTileSource : Champlain.TileSource {
@@ -376,7 +380,7 @@
public bool visible { get; set; }
}
[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_point_get_type ()")]
- public class Point : Champlain.Marker, Atk.Implementor, Champlain.Location, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
+ public class Point : Champlain.Marker, Atk.Implementor, Champlain.Exportable, Champlain.Location, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
[CCode (has_construct_function = false, type = "ClutterActor*")]
public Point ();
[CCode (has_construct_function = false, type = "ClutterActor*")]
@@ -406,6 +410,7 @@
public void set_max_width (uint value);
public void set_unit (Champlain.Unit unit);
public uint max_width { get; set; }
+ public Champlain.Unit unit { get; set; }
}
[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_tile_get_type ()")]
public class Tile : Clutter.Actor, Atk.Implementor, Champlain.Exportable, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
@@ -436,6 +441,7 @@
public string etag { get; set; }
public bool fade_in { get; set; }
public uint size { get; set; }
+ public Champlain.State state { get; set; }
public uint x { get; set; }
public uint y { get; set; }
public uint zoom_level { get; set; }
@@ -477,6 +483,8 @@
[NoAccessorMethod]
public string name { owned get; set construct; }
[NoAccessorMethod]
+ public Champlain.MapProjection projection { get; set construct; }
+ [NoAccessorMethod]
public uint tile_size { get; set construct; }
}
[CCode (cheader_filename = "champlain/champlain.h", type_id = "champlain_view_get_type ()")]
@@ -548,6 +556,7 @@
public Champlain.MapSource map_source { get; set; }
public uint max_zoom_level { get; set; }
public uint min_zoom_level { get; set; }
+ public Champlain.State state { get; }
public Champlain.BoundingBox world { get; set; }
public uint zoom_level { get; set; }
public bool zoom_on_double_click { get; set; }
@@ -592,25 +601,24 @@
[NoAccessorMethod]
public abstract double longitude { get; set; }
}
- [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MAP_PROJECTION_", has_type_id = false)]
+ [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_MAP_PROJECTION_", type_id = "champlain_map_projection_get_type ()")]
public enum MapProjection {
- [CCode (cname = "CHAMPLAIN_MAP_PROJECTION_MERCATOR")]
- MAP_PROJECTION_MERCATOR
+ MERCATOR
}
- [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_SELECTION_", has_type_id = false)]
+ [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_SELECTION_", type_id = "champlain_selection_mode_get_type ()")]
public enum SelectionMode {
NONE,
SINGLE,
MULTIPLE
}
- [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_STATE_", has_type_id = false)]
+ [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_STATE_", type_id = "champlain_state_get_type ()")]
public enum State {
NONE,
LOADING,
LOADED,
DONE
}
- [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_UNIT_", has_type_id = false)]
+ [CCode (cheader_filename = "champlain/champlain.h", cprefix = "CHAMPLAIN_UNIT_", type_id = "champlain_unit_get_type ()")]
public enum Unit {
KM,
MILES
diff -Nru libchamplain-0.12.12/champlain/champlain-marker-layer.c libchamplain-0.12.13/champlain/champlain-marker-layer.c
--- libchamplain-0.12.12/champlain/champlain-marker-layer.c 2014-08-11 19:42:22.000000000 +0000
+++ libchamplain-0.12.13/champlain/champlain-marker-layer.c 2016-01-15 13:46:30.000000000 +0000
@@ -37,7 +37,10 @@
#include
#include
-G_DEFINE_TYPE (ChamplainMarkerLayer, champlain_marker_layer, CHAMPLAIN_TYPE_LAYER)
+static void exportable_interface_init (ChamplainExportableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ChamplainMarkerLayer, champlain_marker_layer, CHAMPLAIN_TYPE_LAYER,
+ G_IMPLEMENT_INTERFACE (CHAMPLAIN_TYPE_EXPORTABLE, exportable_interface_init));
#define GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_MARKER_LAYER, ChamplainMarkerLayerPrivate))
@@ -52,6 +55,7 @@
{
PROP_0,
PROP_SELECTION_MODE,
+ PROP_SURFACE,
};
@@ -61,6 +65,9 @@
ChamplainView *view;
};
+static void set_surface (ChamplainExportable *exportable,
+ cairo_surface_t *surface);
+static cairo_surface_t *get_surface (ChamplainExportable *exportable);
static void marker_selected_cb (ChamplainMarker *marker,
G_GNUC_UNUSED GParamSpec *arg1,
@@ -87,6 +94,10 @@
g_value_set_enum (value, priv->mode);
break;
+ case PROP_SURFACE:
+ g_value_set_boxed (value, get_surface (CHAMPLAIN_EXPORTABLE (self)));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -107,6 +118,10 @@
champlain_marker_layer_set_selection_mode (self, g_value_get_enum (value));
break;
+ case PROP_SURFACE:
+ set_surface (CHAMPLAIN_EXPORTABLE (object), g_value_get_boxed (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
@@ -164,6 +179,10 @@
CHAMPLAIN_TYPE_SELECTION_MODE,
CHAMPLAIN_SELECTION_NONE,
CHAMPLAIN_PARAM_READWRITE));
+
+ g_object_class_override_property (object_class,
+ PROP_SURFACE,
+ "surface");
}
@@ -179,6 +198,77 @@
}
+static void
+set_surface (ChamplainExportable *exportable,
+ cairo_surface_t *surface)
+{
+ /* no need */
+}
+
+static cairo_surface_t *
+get_surface (ChamplainExportable *exportable)
+{
+ g_return_val_if_fail (CHAMPLAIN_IS_MARKER_LAYER (exportable), NULL);
+
+ ClutterActorIter iter;
+ ClutterActor *child;
+ ChamplainMarkerLayer *layer = CHAMPLAIN_MARKER_LAYER (exportable);
+ ChamplainMarkerLayerPrivate *priv = layer->priv;
+ cairo_surface_t *surface = NULL;
+ cairo_t *cr;
+ gboolean has_marker = FALSE;
+
+ clutter_actor_iter_init (&iter, CLUTTER_ACTOR (layer));
+ while (clutter_actor_iter_next (&iter, &child))
+ {
+ ChamplainMarker *marker = CHAMPLAIN_MARKER (child);
+
+ if (CHAMPLAIN_IS_EXPORTABLE (marker))
+ {
+ gfloat x, y, tx, ty;
+ gint origin_x, origin_y;
+ cairo_surface_t *marker_surface;
+ ChamplainExportable *exportable;
+
+ if (!has_marker)
+ {
+ gfloat width, height;
+
+ width = 256;
+ height = 256;
+ if (priv->view != NULL)
+ clutter_actor_get_size (CLUTTER_ACTOR (priv->view),&width, &height);
+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+ has_marker = TRUE;
+ }
+
+ exportable = CHAMPLAIN_EXPORTABLE (marker);
+ marker_surface = champlain_exportable_get_surface (exportable);
+
+ champlain_view_get_viewport_origin (priv->view, &origin_x, &origin_y);
+ clutter_actor_get_translation (CLUTTER_ACTOR (marker), &tx, &ty, NULL);
+ clutter_actor_get_position (CLUTTER_ACTOR (marker), &x, &y);
+
+ cr = cairo_create (surface);
+ cairo_set_source_surface (cr, marker_surface,
+ (x + tx) - origin_x,
+ (y + ty) - origin_y);
+ cairo_paint (cr);
+ cairo_destroy (cr);
+ }
+ }
+
+ return surface;
+}
+
+static void
+exportable_interface_init (ChamplainExportableIface *iface)
+{
+ iface->get_surface = get_surface;
+ iface->set_surface = set_surface;
+}
+
+
/**
* champlain_marker_layer_new:
*
diff -Nru libchamplain-0.12.12/champlain/champlain-point.c libchamplain-0.12.13/champlain/champlain-point.c
--- libchamplain-0.12.12/champlain/champlain-point.c 2014-08-11 19:42:22.000000000 +0000
+++ libchamplain-0.12.13/champlain/champlain-point.c 2016-01-15 13:46:30.000000000 +0000
@@ -55,6 +55,7 @@
PROP_0,
PROP_COLOR,
PROP_SIZE,
+ PROP_SURFACE,
};
/* static guint champlain_point_signals[LAST_SIGNAL] = { 0, }; */
@@ -64,11 +65,19 @@
ClutterColor *color;
gdouble size;
ClutterContent *canvas;
+ cairo_surface_t *surface;
guint redraw_id;
};
-G_DEFINE_TYPE (ChamplainPoint, champlain_point, CHAMPLAIN_TYPE_MARKER);
+static void set_surface (ChamplainExportable *exportable,
+ cairo_surface_t *surface);
+static cairo_surface_t *get_surface (ChamplainExportable *exportable);
+
+static void exportable_interface_init (ChamplainExportableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (ChamplainPoint, champlain_point, CHAMPLAIN_TYPE_MARKER,
+ G_IMPLEMENT_INTERFACE (CHAMPLAIN_TYPE_EXPORTABLE, exportable_interface_init));
#define GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), CHAMPLAIN_TYPE_POINT, ChamplainPointPrivate))
@@ -92,6 +101,10 @@
g_value_set_double (value, priv->size);
break;
+ case PROP_SURFACE:
+ g_value_set_boxed (value, get_surface (CHAMPLAIN_EXPORTABLE (object)));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -116,6 +129,10 @@
champlain_point_set_size (point, g_value_get_double (value));
break;
+ case PROP_SURFACE:
+ set_surface (CHAMPLAIN_EXPORTABLE (object), g_value_get_boxed (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -146,6 +163,10 @@
static void
champlain_point_dispose (GObject *object)
{
+ ChamplainPointPrivate *priv = CHAMPLAIN_POINT (object)->priv;
+
+ g_clear_pointer (&priv->surface, cairo_surface_destroy);
+
G_OBJECT_CLASS (champlain_point_parent_class)->dispose (object);
}
@@ -201,6 +222,11 @@
G_MAXDOUBLE,
12,
CHAMPLAIN_PARAM_READWRITE));
+
+ g_object_class_override_property (object_class,
+ PROP_SURFACE,
+ "surface");
+
}
@@ -216,6 +242,8 @@
gdouble radius = size / 2.0;
const ClutterColor *color;
+ set_surface (CHAMPLAIN_EXPORTABLE (point), cairo_get_target (cr));
+
cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
cairo_paint (cr);
cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
@@ -270,6 +298,40 @@
}
+static void
+set_surface (ChamplainExportable *exportable,
+ cairo_surface_t *surface)
+{
+ g_return_if_fail (CHAMPLAIN_POINT (exportable));
+ g_return_if_fail (surface != NULL);
+
+ ChamplainPoint *self = CHAMPLAIN_POINT (exportable);
+
+ if (self->priv->surface == surface)
+ return;
+
+ cairo_surface_destroy (self->priv->surface);
+ self->priv->surface = cairo_surface_reference (surface);
+ g_object_notify (G_OBJECT (self), "surface");
+}
+
+static cairo_surface_t *
+get_surface (ChamplainExportable *exportable)
+{
+ g_return_val_if_fail (CHAMPLAIN_POINT (exportable), NULL);
+
+ return CHAMPLAIN_POINT (exportable)->priv->surface;
+}
+
+
+static void
+exportable_interface_init (ChamplainExportableIface *iface)
+{
+ iface->get_surface = get_surface;
+ iface->set_surface = set_surface;
+}
+
+
/**
* champlain_point_new:
*
diff -Nru libchamplain-0.12.12/champlain/champlain-version.h libchamplain-0.12.13/champlain/champlain-version.h
--- libchamplain-0.12.12/champlain/champlain-version.h 2015-12-02 19:43:07.000000000 +0000
+++ libchamplain-0.12.13/champlain/champlain-version.h 2016-02-25 20:09:48.000000000 +0000
@@ -49,14 +49,14 @@
*
* The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3)
*/
-#define CHAMPLAIN_MICRO_VERSION (12)
+#define CHAMPLAIN_MICRO_VERSION (13)
/**
* CHAMPLAIN_VERSION:
*
* The full version of libchamplain, like 1.2.3
*/
-#define CHAMPLAIN_VERSION 0.12.12
+#define CHAMPLAIN_VERSION 0.12.13
/**
* 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.12"
+#define CHAMPLAIN_VERSION_S "0.12.13"
/**
* CHAMPLAIN_VERSION_HEX:
diff -Nru libchamplain-0.12.12/champlain/champlain-view.c libchamplain-0.12.13/champlain/champlain-view.c
--- libchamplain-0.12.12/champlain/champlain-view.c 2015-11-30 22:12:47.000000000 +0000
+++ libchamplain-0.12.13/champlain/champlain-view.c 2016-02-25 18:50:21.000000000 +0000
@@ -726,6 +726,10 @@
priv->map_layer = NULL;
priv->license_actor = NULL;
+
+ /* This is needed to prevent race condition see bug #760012 */
+ if (priv->user_layers)
+ clutter_actor_remove_all_children (priv->user_layers);
priv->user_layers = NULL;
priv->zoom_layer = NULL;
@@ -1417,9 +1421,6 @@
clutter_actor_set_x_align (priv->license_actor, CLUTTER_ACTOR_ALIGN_END);
clutter_actor_set_y_align (priv->license_actor, CLUTTER_ACTOR_ALIGN_END);
clutter_actor_add_child (CLUTTER_ACTOR (view), priv->license_actor);
-
- priv->state = CHAMPLAIN_STATE_DONE;
- g_object_notify (G_OBJECT (view), "state");
}
diff -Nru libchamplain-0.12.12/champlain/Makefile.am libchamplain-0.12.13/champlain/Makefile.am
--- libchamplain-0.12.12/champlain/Makefile.am 2015-11-16 22:32:03.000000000 +0000
+++ libchamplain-0.12.13/champlain/Makefile.am 2016-02-01 09:04:55.000000000 +0000
@@ -110,7 +110,7 @@
# glib-mkenums rules
glib_enum_h = champlain-enum-types.h
glib_enum_c = champlain-enum-types.c
-glib_enum_headers = $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public))
+glib_enum_headers = $(filter-out champlain-version.h,$(libchamplain_headers_public))
include $(top_srcdir)/build/Makefile.am.enums
libchamplain_headers_built = \
@@ -139,12 +139,13 @@
-no-undefined \
-export-symbols-regex ^champlain_.*
-AM_CPPFLAGS = \
- $(DEPS_CFLAGS) \
- $(MEMPHIS_CFLAGS) \
- -DDATADIR=\""$(datadir)"\" \
- -I$(top_srcdir) \
- -DCHAMPLAIN_COMPILATION \
+AM_CPPFLAGS = \
+ $(DEPS_CFLAGS) \
+ $(MEMPHIS_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
+ -I$(top_srcdir) \
+ -DCHAMPLAIN_COMPILATION \
+ -DG_LOG_DOMAIN=\"$(PACKAGE_NAME)\" \
$(WARN_CFLAGS)
@@ -165,6 +166,7 @@
INTROSPECTION_COMPILER_ARGS =
introspection_sources = \
$(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public)) \
+ champlain-enum-types.h \
$(libchamplain_sources)
if ENABLE_MEMPHIS
memphis_gir_include = Memphis-0.2
diff -Nru libchamplain-0.12.12/champlain/Makefile.in libchamplain-0.12.13/champlain/Makefile.in
--- libchamplain-0.12.12/champlain/Makefile.in 2015-12-02 19:43:04.000000000 +0000
+++ libchamplain-0.12.13/champlain/Makefile.in 2016-02-25 20:09:46.000000000 +0000
@@ -612,7 +612,7 @@
# glib-mkenums rules
glib_enum_h = champlain-enum-types.h
glib_enum_c = champlain-enum-types.c
-glib_enum_headers = $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public))
+glib_enum_headers = $(filter-out champlain-version.h,$(libchamplain_headers_public))
enum_tmpl_h = $(glib_enum_h:.h=.h.in)
enum_tmpl_c = $(glib_enum_c:.c=.c.in)
libchamplain_headers_built = \
@@ -640,11 +640,12 @@
-export-symbols-regex ^champlain_.*
AM_CPPFLAGS = \
- $(DEPS_CFLAGS) \
- $(MEMPHIS_CFLAGS) \
- -DDATADIR=\""$(datadir)"\" \
- -I$(top_srcdir) \
- -DCHAMPLAIN_COMPILATION \
+ $(DEPS_CFLAGS) \
+ $(MEMPHIS_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
+ -I$(top_srcdir) \
+ -DCHAMPLAIN_COMPILATION \
+ -DG_LOG_DOMAIN=\"$(PACKAGE_NAME)\" \
$(WARN_CFLAGS)
lib_LTLIBRARIES = libchamplain-@CHAMPLAIN_API_VERSION@.la
@@ -656,6 +657,7 @@
@HAVE_INTROSPECTION_TRUE@INTROSPECTION_COMPILER_ARGS =
@HAVE_INTROSPECTION_TRUE@introspection_sources = \
@HAVE_INTROSPECTION_TRUE@ $(filter-out $(srcdir)/champlain-version.h,$(libchamplain_headers_public)) \
+@HAVE_INTROSPECTION_TRUE@ champlain-enum-types.h \
@HAVE_INTROSPECTION_TRUE@ $(libchamplain_sources)
@ENABLE_MEMPHIS_TRUE@@HAVE_INTROSPECTION_TRUE@memphis_gir_include = Memphis-0.2
diff -Nru libchamplain-0.12.12/champlain-gtk/gtk-champlain-embed.c libchamplain-0.12.13/champlain-gtk/gtk-champlain-embed.c
--- libchamplain-0.12.12/champlain-gtk/gtk-champlain-embed.c 2015-11-16 21:51:16.000000000 +0000
+++ libchamplain-0.12.13/champlain-gtk/gtk-champlain-embed.c 2016-02-01 08:44:35.000000000 +0000
@@ -327,8 +327,11 @@
/* Set selection color */
style = gtk_widget_get_style_context (widget);
-
- gtk_style_context_get_color (style, GTK_STATE_FLAG_SELECTED, &gdk_rgba_color);
+ gtk_style_context_save (style);
+ gtk_style_context_set_state (style, GTK_STATE_FLAG_SELECTED);
+
+ gtk_style_context_get_color (style, gtk_style_context_get_state (style),
+ &gdk_rgba_color);
gdk_rgba_to_clutter_color (&gdk_rgba_color, &color);
if (color.alpha == 0 && color.red == 0 && color.green == 0 && color.blue == 0)
{
@@ -338,7 +341,8 @@
}
champlain_marker_set_selection_text_color (&color);
- gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED, &gdk_rgba_color);
+ gtk_style_context_get_background_color (style, gtk_style_context_get_state (style),
+ &gdk_rgba_color);
gdk_rgba_to_clutter_color (&gdk_rgba_color, &color);
if (color.alpha == 0)
color.alpha = 255;
@@ -349,6 +353,8 @@
color.blue = 131;
}
champlain_marker_set_selection_color (&color);
+
+ gtk_style_context_restore (style);
#endif
/* Setup mouse cursor to a hand */
diff -Nru libchamplain-0.12.12/ChangeLog libchamplain-0.12.13/ChangeLog
--- libchamplain-0.12.12/ChangeLog 2015-12-02 19:43:24.000000000 +0000
+++ libchamplain-0.12.13/ChangeLog 2016-02-25 20:10:06.000000000 +0000
@@ -1,5 +1,107 @@
# Generated by Makefile. Do not edit.
+commit ceccc10eacce0d4ffef22233739ecbf05ea60180
+Author: Jiří Techet
+Date: Thu Feb 25 21:05:27 2016 +0100
+
+ 0.12.13
+
+commit 5038ab1b704e609ba76958075a4b61eab13699b0
+Author: Jonas Danielsson
+Date: Tue Feb 16 10:54:00 2016 +0100
+
+ champlain-view: Remove children from user_layers in dispose
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=760012
+
+commit a8073a3c837c291a3b3b5331ea2bc01f2f7ca2ca
+Author: Jiří Techet
+Date: Fri Feb 12 16:45:37 2016 +0100
+
+ demos: Fix confusingly swapped latitude/longitude retrieval in Python demo
+
+ Thanks to Pavel Machek for the patch.
+
+commit e641833c36620a712781b1ebce31311daa888535
+Author: Hashem Nasarat
+Date: Sun Jan 31 12:19:33 2016 -0500
+
+ build: Set G_LOG_DOMAIN to libchamplain
+
+ "Libraries should define this so that any messages which they log can be
+ differentiated from messages from other libraries and application code"
+
+ https://developer.gnome.org/glib/stable/glib-Message-Logging.html#G-LOG-DOMAIN:CAPS
+
+ This enables us to filter debug messages to only see libchamplain
+ output — quite useful!
+
+ E.g. G_MESSAGES_DEBUG=libchamplain CHAMPLAIN_DEBUG=view gnome-maps
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=761368
+
+commit 9fcbddde94d9fbeb1ef9dfc82b16675c0a47acf1
+Author: Cosimo Cecchi
+Date: Wed Jan 27 14:59:03 2016 +0100
+
+ gtk-champlain-embed: avoid runtime warnings
+
+ We need to set the state on the GtkStyleContext these days, to avoid GTK
+ emitting runtime warnings.
+ This change is retro-compatible with older versions of GTK.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=761178
+
+commit 713f73b933730d64d6e037c548cb9fbbe210d039
+Author: Emmanuele Bassi
+Date: Fri Jan 15 14:26:28 2016 +0000
+
+ Build fixes for builddir != srcdir
+
+ Generated files go in builddir, which evaluates to '.', not in srcdir.
+
+ Without this change, libchamplain fails to build in Continuous with the
+ following error:
+
+ make[3]: *** No rule to make target '../../champlain/champlain-enum-types.h', needed by 'Champlain-0.12.gir'. Stop.
+
+commit 06de4514628b53996d46940e644e7b2ff8d7db02
+Author: Jonas Danielsson
+Date: Tue Jan 12 20:41:19 2016 +0100
+
+ build: Make sure enums are introspectable
+
+commit c8829c4f86569fe5c75dc96d3578e29edbb327bd
+Author: Jonas Danielsson
+Date: Sat Jan 9 10:35:50 2016 +0100
+
+ ChamplainPoint: Implement ChamplainExportable interface
+
+commit 2814f9e2ad6812a0da8c23289b76c16b5edd5382
+Author: Jonas Danielsson
+Date: Sat Jan 9 10:34:57 2016 +0100
+
+ MarkerLayer: Implement ChamplainExportable interface
+
+ Make MarkerLayer exportable. Will contain non-NULL surface
+ iff a marker in the layer implements ChamplainExportable
+ interface.
+
+commit 4350ac6d2ab5c77cfeeedc9e7d3a4b87d19f8ebc
+Author: Jiří Techet
+Date: Tue Jan 12 11:59:12 2016 +0100
+
+ ChamplainView: Don't set state to DONE at the end of init
+
+ The initial state is CHAMPLAIN_STATE_NONE and it should be changed to DONE
+ only after tiles get loaded which already happens in tile_state_notify().
+
+commit 57fb0b10e679d0bd7686fcdde4d24170b2f085ba
+Author: Jiří Techet
+Date: Wed Dec 2 20:59:39 2015 +0100
+
+ Post release version bump
+
commit c726e061eeb394d7a806b75e3377dce9ad7fa734
Author: Jiří Techet
Date: Wed Dec 2 20:41:25 2015 +0100
diff -Nru libchamplain-0.12.12/configure libchamplain-0.12.13/configure
--- libchamplain-0.12.12/configure 2015-12-02 19:43:04.000000000 +0000
+++ libchamplain-0.12.13/configure 2016-02-25 20:09:45.000000000 +0000
@@ -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.12.
+# Generated by GNU Autoconf 2.69 for libchamplain 0.12.13.
#
# Report bugs to .
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='libchamplain'
PACKAGE_TARNAME='libchamplain'
-PACKAGE_VERSION='0.12.12'
-PACKAGE_STRING='libchamplain 0.12.12'
+PACKAGE_VERSION='0.12.13'
+PACKAGE_STRING='libchamplain 0.12.13'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain'
PACKAGE_URL='https://wiki.gnome.org/Projects/libchamplain'
@@ -1464,7 +1464,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.12 to adapt to many kinds of systems.
+\`configure' configures libchamplain 0.12.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1534,7 +1534,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libchamplain 0.12.12:";;
+ short | recursive ) echo "Configuration of libchamplain 0.12.13:";;
esac
cat <<\_ACEOF
@@ -1676,7 +1676,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libchamplain configure 0.12.12
+libchamplain configure 0.12.13
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1954,7 +1954,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.12, which was
+It was created by libchamplain $as_me 0.12.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2822,7 +2822,7 @@
# Define the identity of the package.
PACKAGE='libchamplain'
- VERSION='0.12.12'
+ VERSION='0.12.13'
cat >>confdefs.h <<_ACEOF
@@ -12328,13 +12328,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=7:4:7
+LIBRARY_VERSION=8:0:8
CHAMPLAIN_API_VERSION=0.12
CHAMPLAIN_API_VERSION_NORM=0_12
CHAMPLAIN_MAJOR_VERSION=0
CHAMPLAIN_MINOR_VERSION=12
-CHAMPLAIN_MICRO_VERSION=12
-CHAMPLAIN_VERSION=0.12.12
+CHAMPLAIN_MICRO_VERSION=13
+CHAMPLAIN_VERSION=0.12.13
CHAMPLAIN_MAJORMINOR=0.12
@@ -14795,7 +14795,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.12, which was
+This file was extended by libchamplain $as_me 0.12.13, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14862,7 +14862,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.12
+libchamplain config.status 0.12.13
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru libchamplain-0.12.12/configure.ac libchamplain-0.12.13/configure.ac
--- libchamplain-0.12.12/configure.ac 2015-12-02 18:59:21.000000000 +0000
+++ libchamplain-0.12.13/configure.ac 2016-02-25 19:43:00.000000000 +0000
@@ -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], [12])
+m4_define([champlain_micro_version], [13])
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=7:4:7
+LIBRARY_VERSION=8:0:8
CHAMPLAIN_API_VERSION=champlain_api_version
CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version
CHAMPLAIN_MAJOR_VERSION=champlain_major_version
diff -Nru libchamplain-0.12.12/debian/changelog libchamplain-0.12.13/debian/changelog
--- libchamplain-0.12.12/debian/changelog 2015-12-02 22:32:40.000000000 +0000
+++ libchamplain-0.12.13/debian/changelog 2016-03-06 22:02:22.000000000 +0000
@@ -1,3 +1,11 @@
+libchamplain (0.12.13-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Drop -dbg packages now that we have automatic dbsym packages.
+ * Bump Standards-Version to 3.9.7.
+
+ -- Michael Biebl Sun, 06 Mar 2016 23:02:21 +0100
+
libchamplain (0.12.12-1) unstable; urgency=medium
* New upstream release.
diff -Nru libchamplain-0.12.12/debian/control libchamplain-0.12.13/debian/control
--- libchamplain-0.12.12/debian/control 2015-12-02 23:39:02.000000000 +0000
+++ libchamplain-0.12.13/debian/control 2016-03-06 22:02:50.000000000 +0000
@@ -23,7 +23,7 @@
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
valac (>= 0.20)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: https://wiki.gnome.org/Projects/libchamplain
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libchamplain
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libchamplain/
@@ -78,22 +78,6 @@
This package contains the header files required if you wish
to develop software that uses libchamplain.
-Package: libchamplain-0.12-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: libchamplain-0.12-0 (= ${binary:Version}),
- ${misc:Depends}
-Description: C library providing ClutterActor to display maps (debug symbols)
- Libchamplain is a C library providing a ClutterActor to
- display maps.
- .
- It supports numerous free map sources such as
- OpenStreetMap (default), OpenArialMap and Maps for free.
- .
- This package contains debugging symbols for libchamplain
-
Package: gir1.2-champlain-0.12
Architecture: any
Multi-Arch: same
@@ -157,23 +141,6 @@
.
This package contains documentation for libchamplain-gtk.
-Package: libchamplain-gtk-0.12-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: libchamplain-gtk-0.12-0 (= ${binary:Version}),
- ${misc:Depends}
-Recommends: libchamplain-0.12-dbg
-Description: Gtk+ widget to display maps (debug symbols)
- Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
- to display rasterized maps and markers.
- .
- It supports numerous free map sources such as
- OpenStreetMap (default), OpenArialMap and Maps for free.
- .
- This package contains debugging symbols for libchamplain-gtk.
-
Package: gir1.2-gtkchamplain-0.12
Architecture: any
Multi-Arch: same
diff -Nru libchamplain-0.12.12/debian/control.in libchamplain-0.12.13/debian/control.in
--- libchamplain-0.12.12/debian/control.in 2015-10-10 00:43:52.000000000 +0000
+++ libchamplain-0.12.13/debian/control.in 2016-03-06 22:02:00.000000000 +0000
@@ -19,7 +19,7 @@
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
valac (>= 0.20)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: https://wiki.gnome.org/Projects/libchamplain
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libchamplain
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libchamplain/
@@ -74,22 +74,6 @@
This package contains the header files required if you wish
to develop software that uses libchamplain.
-Package: libchamplain-0.12-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: libchamplain-0.12-0 (= ${binary:Version}),
- ${misc:Depends}
-Description: C library providing ClutterActor to display maps (debug symbols)
- Libchamplain is a C library providing a ClutterActor to
- display maps.
- .
- It supports numerous free map sources such as
- OpenStreetMap (default), OpenArialMap and Maps for free.
- .
- This package contains debugging symbols for libchamplain
-
Package: gir1.2-champlain-0.12
Architecture: any
Multi-Arch: same
@@ -153,23 +137,6 @@
.
This package contains documentation for libchamplain-gtk.
-Package: libchamplain-gtk-0.12-dbg
-Architecture: any
-Multi-Arch: same
-Priority: extra
-Section: debug
-Depends: libchamplain-gtk-0.12-0 (= ${binary:Version}),
- ${misc:Depends}
-Recommends: libchamplain-0.12-dbg
-Description: Gtk+ widget to display maps (debug symbols)
- Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
- to display rasterized maps and markers.
- .
- It supports numerous free map sources such as
- OpenStreetMap (default), OpenArialMap and Maps for free.
- .
- This package contains debugging symbols for libchamplain-gtk.
-
Package: gir1.2-gtkchamplain-0.12
Architecture: any
Multi-Arch: same
diff -Nru libchamplain-0.12.12/demos/launcher-gtk.py libchamplain-0.12.13/demos/launcher-gtk.py
--- libchamplain-0.12.12/demos/launcher-gtk.py 2015-09-18 15:01:52.000000000 +0000
+++ libchamplain-0.12.13/demos/launcher-gtk.py 2016-02-12 15:40:16.000000000 +0000
@@ -121,8 +121,8 @@
def mouse_click_cb(self, actor, event, view):
x, y = event.x, event.y
- lat, lon = view.x_to_longitude(x), view.y_to_latitude(y)
- print "Mouse click at: %f %f" % (lon, lat)
+ lon, lat = view.x_to_longitude(x), view.y_to_latitude(y)
+ print "Mouse click at: %f %f" % (lat, lon)
return True
def zoom_changed(self, widget):
diff -Nru libchamplain-0.12.12/docs/reference/html/ChamplainExportable.html libchamplain-0.12.13/docs/reference/html/ChamplainExportable.html
--- libchamplain-0.12.12/docs/reference/html/ChamplainExportable.html 2015-12-02 19:43:24.000000000 +0000
+++ libchamplain-0.12.13/docs/reference/html/ChamplainExportable.html 2016-02-25 20:10:05.000000000 +0000
@@ -113,7 +113,7 @@
Known Implementations
ChamplainExportable is implemented by
- ChamplainPathLayer and ChamplainTile.
+ ChamplainMarkerLayer, ChamplainPathLayer, ChamplainPoint and ChamplainTile.
Description
diff -Nru libchamplain-0.12.12/docs/reference/html/ChamplainMarkerLayer.html libchamplain-0.12.13/docs/reference/html/ChamplainMarkerLayer.html
--- libchamplain-0.12.12/docs/reference/html/ChamplainMarkerLayer.html 2015-12-02 19:43:24.000000000 +0000
+++ libchamplain-0.12.13/docs/reference/html/ChamplainMarkerLayer.html 2016-02-25 20:10:05.000000000 +0000
@@ -228,7 +228,7 @@
Implemented Interfaces
ChamplainMarkerLayer implements
- ClutterContainer, ClutterScriptable, ClutterAnimatable and AtkImplementorIface.
+
ClutterContainer,
ClutterScriptable,
ClutterAnimatable, AtkImplementorIface and
ChamplainExportable.
Description
diff -Nru libchamplain-0.12.12/docs/reference/html/index.html libchamplain-0.12.13/docs/reference/html/index.html
--- libchamplain-0.12.12/docs/reference/html/index.html 2015-12-02 19:43:24.000000000 +0000
+++ libchamplain-0.12.13/docs/reference/html/index.html 2016-02-25 20:10:05.000000000 +0000
@@ -16,7 +16,7 @@
libchamplain Reference Manual |
---|
- for libchamplain 0.12.12
+ for libchamplain 0.12.13
diff -Nru libchamplain-0.12.12/docs/reference/html/libchamplain-ChamplainVersion.html libchamplain-0.12.13/docs/reference/html/libchamplain-ChamplainVersion.html
--- libchamplain-0.12.12/docs/reference/html/libchamplain-ChamplainVersion.html 2015-12-02 19:43:24.000000000 +0000
+++ libchamplain-0.12.13/docs/reference/html/libchamplain-ChamplainVersion.html 2016-02-25 20:10:05.000000000 +0000
@@ -112,7 +112,7 @@
CHAMPLAIN_MICRO_VERSION
-
#define CHAMPLAIN_MICRO_VERSION (12)
+#define CHAMPLAIN_MICRO_VERSION (13)
The micro version of libchamplain (3, if CHAMPLAIN_VERSION
is 1.2.3)
@@ -164,14 +164,14 @@
Types and Values
CHAMPLAIN_VERSION
-
#define CHAMPLAIN_VERSION 0.12.12
+#define CHAMPLAIN_VERSION 0.12.13
The full version of libchamplain, like 1.2.3
CHAMPLAIN_VERSION_S
-
#define CHAMPLAIN_VERSION_S "0.12.12"
+#define CHAMPLAIN_VERSION_S "0.12.13"
The full version of libchamplain, in string form (suited for
string concatenation)
diff -Nru libchamplain-0.12.12/docs/reference/version.xml libchamplain-0.12.13/docs/reference/version.xml
--- libchamplain-0.12.12/docs/reference/version.xml 2015-12-02 19:43:07.000000000 +0000
+++ libchamplain-0.12.13/docs/reference/version.xml 2016-02-25 20:09:48.000000000 +0000
@@ -1 +1 @@
-0.12.12
+0.12.13
diff -Nru libchamplain-0.12.12/docs/reference-gtk/html/index.html libchamplain-0.12.13/docs/reference-gtk/html/index.html
--- libchamplain-0.12.12/docs/reference-gtk/html/index.html 2015-12-02 19:43:24.000000000 +0000
+++ libchamplain-0.12.13/docs/reference-gtk/html/index.html 2016-02-25 20:10:06.000000000 +0000
@@ -16,7 +16,7 @@
libchamplain-gtk Reference Manual |
---|
- for libchamplain-gtk 0.12.12
+ for libchamplain-gtk 0.12.13
diff -Nru libchamplain-0.12.12/docs/reference-gtk/version.xml libchamplain-0.12.13/docs/reference-gtk/version.xml
--- libchamplain-0.12.12/docs/reference-gtk/version.xml 2015-12-02 19:43:07.000000000 +0000
+++ libchamplain-0.12.13/docs/reference-gtk/version.xml 2016-02-25 20:09:48.000000000 +0000
@@ -1 +1 @@
-0.12.12
+0.12.13
diff -Nru libchamplain-0.12.12/NEWS libchamplain-0.12.13/NEWS
--- libchamplain-0.12.12/NEWS 2015-12-02 18:55:12.000000000 +0000
+++ libchamplain-0.12.13/NEWS 2016-02-25 20:01:16.000000000 +0000
@@ -1,3 +1,18 @@
+libchamplain 0.12.13 (2016-02-25)
+=================================
+
+Stable release
+
+Changes:
+
+* Implement ChamplainExportable in MarkerLayer and ChamplainPoint
+ (Jonas Danielsson)
+* Avoid runtime warnings due to the use of deprecated API (Cosimo Cecchi)
+* Make sure enums are introspectable (Jonas Danielsson)
+* Fix occasional crash when closing map with layers (Jonas Danielsson)
+* Various minor fixes and improvements (Emmanuele Bassi, Hashem Nasarat,
+ Pavel Machek, Jiří Techet)
+
libchamplain 0.12.12 (2015-12-02)
=================================