Hello community, here is the log from the commit of package libchamplain for openSUSE:Factory checked in at 2017-03-22 23:01:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libchamplain (Old) and /work/SRC/openSUSE:Factory/.libchamplain.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libchamplain" Wed Mar 22 23:01:58 2017 rev:49 rq:478746 version:0.12.15 Changes: -------- --- /work/SRC/openSUSE:Factory/libchamplain/libchamplain.changes 2016-09-21 18:28:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libchamplain.new/libchamplain.changes 2017-03-22 23:01:59.982188755 +0100 @@ -1,0 +2,9 @@ +Wed Mar 8 12:53:48 UTC 2017 - zai...@opensuse.org + +- Update to version 0.12.15: + + Fix path layer surface exporting when no clone is visible. + + Fix printing in gnome-maps. + + Fix build on RHEL 7.3. + + Minor example updates. + +------------------------------------------------------------------- Old: ---- libchamplain-0.12.14.tar.xz New: ---- libchamplain-0.12.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchamplain.spec ++++++ --- /var/tmp/diff_new_pack.bgaXmX/_old 2017-03-22 23:02:01.313999980 +0100 +++ /var/tmp/diff_new_pack.bgaXmX/_new 2017-03-22 23:02:01.317999413 +0100 @@ -1,7 +1,7 @@ # # spec file for package libchamplain # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libchamplain -Version: 0.12.14 +Version: 0.12.15 Release: 0 Summary: Library to display maps License: LGPL-2.1+ ++++++ libchamplain-0.12.14.tar.xz -> libchamplain-0.12.15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/ChangeLog new/libchamplain-0.12.15/ChangeLog --- old/libchamplain-0.12.14/ChangeLog 2016-09-06 23:09:28.000000000 +0200 +++ new/libchamplain-0.12.15/ChangeLog 2017-03-08 11:53:57.000000000 +0100 @@ -1,5 +1,69 @@ # Generated by Makefile. Do not edit. +commit d5f50d3932e2fabae8f3f10df522d7716e5bed7b +Author: Jiří Techet <tec...@gmail.com> +Date: Wed Mar 8 11:50:17 2017 +0100 + + 0.12.15 + +commit c6cebf485bc1c5950ab2bee36c3190552c466622 +Author: Matthias Clasen <mcla...@redhat.com> +Date: Fri Mar 3 16:03:37 2017 +0100 + + build: Add pangocairo and cogl-pango-1.0 to *_gir_PACKAGES + + https://bugzilla.gnome.org/show_bug.cgi?id=779542 + +commit 528cdbf46e0e26503744409083d4c6360c709c30 +Author: Marcus Lundblad <m...@update.uu.se> +Date: Tue Oct 11 23:24:21 2016 +0200 + + Ensure path layer surface is created + + When getting the surface from a path layer, + ensure that the right and left surfaces are + merged if the surface isn't yet available. + This happens when a layer is realized "on-screen" + as is the case when printing routes in gnome-maps. + + https://bugzilla.gnome.org/show_bug.cgi?id=772477 + +commit be636b39e1208033850ca65b93ac69c3fab25378 +Author: Marius Stanciu <stanciumariu...@gmail.com> +Date: Thu Sep 29 21:39:54 2016 +0300 + + Fix path-layer surface exporting when no clone is visible. + + https://bugzilla.gnome.org/show_bug.cgi?id=771698 + +commit d682bea291049422427fc8fb961d6b721787bd94 +Author: Jiří Techet <tec...@gmail.com> +Date: Thu Sep 29 23:34:07 2016 +0200 + + launcher-gtk: Add missing NULL at the end of gdk_pixbuf_save_to_stream() + + gdk_pixbuf_save_to_stream() is a vararg function whose vararg parameters + have to be NULL-terminated. + +commit e1f6e591ca752f20bb29cbe46b7f2e4e41468a56 +Author: Jiří Techet <tec...@gmail.com> +Date: Tue Sep 27 00:34:36 2016 +0200 + + launcher-gtk: allow replacing exported map + + It's too easy to miss there's already a png export in the current directory + and expect the export happened alright even though it's still the original + file. + + Also close the output stream correctly which was missing in the original + code. + +commit cb478b22ab1a64f250eea117aa2e807b2fbf3b34 +Author: Jiří Techet <tec...@gmail.com> +Date: Mon Sep 26 23:22:36 2016 +0200 + + Post release version bump + commit a8453441f486773602a96d491ef5525a51e31f4d Author: Jiří Techet <tec...@gmail.com> Date: Tue Sep 6 23:08:01 2016 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/NEWS new/libchamplain-0.12.15/NEWS --- old/libchamplain-0.12.14/NEWS 2016-09-06 23:01:28.000000000 +0200 +++ new/libchamplain-0.12.15/NEWS 2017-03-08 11:49:52.000000000 +0100 @@ -1,4 +1,16 @@ -libchamplain 0.12.14 (2016-07-06) +libchamplain 0.12.15 (2016-03-08) +================================= + +Stable release + +Changes: + +* Fix path layer surface exporting when no clone is visible (Marius Stanciu) +* Fix printing in gnome-maps (Marcus Lundblad) +* Fix build on RHEL 7.3 (Matthias Clasen) +* Minor example updates (Jiří Techet) + +libchamplain 0.12.14 (2016-09-06) ================================= Stable release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/champlain/Makefile.am new/libchamplain-0.12.15/champlain/Makefile.am --- old/libchamplain-0.12.14/champlain/Makefile.am 2016-07-21 17:26:56.000000000 +0200 +++ new/libchamplain-0.12.15/champlain/Makefile.am 2017-03-08 11:31:56.000000000 +0100 @@ -177,7 +177,7 @@ Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = Champlain Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-@CHAMPLAIN_API_VERSION@.la -Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 +Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 cogl-pango-1.0 Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 $(memphis_gir_include) Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-@CHAMPLAIN_API_VERSION@ $(memphis_package) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/champlain/Makefile.in new/libchamplain-0.12.15/champlain/Makefile.in --- old/libchamplain-0.12.14/champlain/Makefile.in 2016-09-06 23:09:08.000000000 +0200 +++ new/libchamplain-0.12.15/champlain/Makefile.in 2017-03-08 11:53:37.000000000 +0100 @@ -665,7 +665,7 @@ @HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = Champlain @HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ @HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-@CHAMPLAIN_API_VERSION@.la -@HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 +@HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 cogl-pango-1.0 @HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) @HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 $(memphis_gir_include) @HAVE_INTROSPECTION_TRUE@Champlain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-@CHAMPLAIN_API_VERSION@ $(memphis_package) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/champlain/champlain-path-layer.c new/libchamplain-0.12.15/champlain/champlain-path-layer.c --- old/libchamplain-0.12.14/champlain/champlain-path-layer.c 2016-08-14 11:45:33.000000000 +0200 +++ new/libchamplain-0.12.15/champlain/champlain-path-layer.c 2016-10-15 22:11:30.000000000 +0200 @@ -485,6 +485,53 @@ g_object_notify (G_OBJECT (self), "surface"); } +static void +get_map_size (ChamplainView *view, gint *width, gint *height) +{ + gint size, rows, cols; + ChamplainMapSource *map_source = champlain_view_get_map_source (view); + gint zoom_level = champlain_view_get_zoom_level (view); + size = champlain_map_source_get_tile_size (map_source); + rows = champlain_map_source_get_row_count (map_source, + zoom_level); + cols = champlain_map_source_get_column_count (map_source, + zoom_level); + if (width) + *width = size * rows; + + if (height) + *height = size * cols; +} + +static cairo_surface_t * +create_merged_surface (ChamplainPathLayer *layer) +{ + ChamplainPathLayerPrivate *priv = layer->priv; + gfloat view_width, view_height; + gint map_width, viewport_x, anchor_x; + cairo_surface_t *new_surface; + cairo_t *cr; + + get_map_size (priv->view, &map_width, NULL); + clutter_actor_get_size (CLUTTER_ACTOR (priv->view), &view_width, &view_height); + champlain_view_get_viewport_origin (priv->view, &viewport_x, NULL); + champlain_view_get_viewport_anchor (priv->view, &anchor_x, NULL); + new_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, view_width, view_height); + cr = cairo_create (new_surface); + + cairo_set_source_surface (cr, + priv->right_surface, + 0, 0); + cairo_paint (cr); + + cairo_set_source_surface (cr, + priv->left_surface, + map_width - viewport_x - anchor_x, 0); + cairo_paint (cr); + cairo_destroy (cr); + + return new_surface; +} static cairo_surface_t * get_surface (ChamplainExportable *exportable) @@ -494,7 +541,16 @@ ChamplainPathLayer *self = CHAMPLAIN_PATH_LAYER (exportable); if (self->priv->visible) - return CHAMPLAIN_PATH_LAYER (exportable)->priv->surface; + { + /* if the surface hasn't yet been rendered, update it */ + if (!self->priv->surface) + { + cairo_surface_t *new_surface = create_merged_surface (self); + + set_surface (exportable, new_surface); + } + return CHAMPLAIN_PATH_LAYER (exportable)->priv->surface; + } else return NULL; } @@ -523,26 +579,6 @@ return g_object_new (CHAMPLAIN_TYPE_PATH_LAYER, NULL); } - -static void -get_map_size (ChamplainView *view, gint *width, gint *height) -{ - gint size, rows, cols; - ChamplainMapSource *map_source = champlain_view_get_map_source (view); - gint zoom_level = champlain_view_get_zoom_level (view); - size = champlain_map_source_get_tile_size (map_source); - rows = champlain_map_source_get_row_count (map_source, - zoom_level); - cols = champlain_map_source_get_column_count (map_source, - zoom_level); - if (width) - *width = size * rows; - - if (height) - *height = size * cols; -} - - static gboolean invalidate_canvas (ChamplainPathLayer *layer) { @@ -814,34 +850,16 @@ */ if (priv->left_surface_updated && priv->right_surface_updated) { - gfloat view_width, view_height; - gint map_width, viewport_x, anchor_x; cairo_surface_t *new_surface; - cairo_t *cr; - - get_map_size (priv->view, &map_width, NULL); - clutter_actor_get_size (CLUTTER_ACTOR (priv->view), &view_width, &view_height); - champlain_view_get_viewport_origin (priv->view, &viewport_x, NULL); - champlain_view_get_viewport_anchor (priv->view, &anchor_x, NULL); - - new_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, view_width, view_height); - cr = cairo_create (new_surface); - - cairo_set_source_surface (cr, - priv->right_surface, - 0, 0); - cairo_paint (cr); - - cairo_set_source_surface (cr, - priv->left_surface, - map_width - viewport_x - anchor_x, 0); - cairo_paint (cr); + new_surface = create_merged_surface (layer); set_surface (CHAMPLAIN_EXPORTABLE (layer), new_surface); cairo_surface_destroy (new_surface); - cairo_destroy (cr); } + /* When only the right actor is visible, no merging is required */ + else if (!CLUTTER_ACTOR_IS_VISIBLE (priv->left_actor)) + set_surface (CHAMPLAIN_EXPORTABLE (layer), priv->right_surface); } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/champlain/champlain-version.h new/libchamplain-0.12.15/champlain/champlain-version.h --- old/libchamplain-0.12.14/champlain/champlain-version.h 2016-09-06 23:09:11.000000000 +0200 +++ new/libchamplain-0.12.15/champlain/champlain-version.h 2017-03-08 11:53:39.000000000 +0100 @@ -49,14 +49,14 @@ * * The micro version of libchamplain (3, if %CHAMPLAIN_VERSION is 1.2.3) */ -#define CHAMPLAIN_MICRO_VERSION (14) +#define CHAMPLAIN_MICRO_VERSION (15) /** * CHAMPLAIN_VERSION: * * The full version of libchamplain, like 1.2.3 */ -#define CHAMPLAIN_VERSION 0.12.14 +#define CHAMPLAIN_VERSION 0.12.15 /** * 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.14" +#define CHAMPLAIN_VERSION_S "0.12.15" /** * CHAMPLAIN_VERSION_HEX: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/champlain-gtk/Makefile.am new/libchamplain-0.12.15/champlain-gtk/Makefile.am --- old/libchamplain-0.12.14/champlain-gtk/Makefile.am 2016-03-14 21:12:18.000000000 +0100 +++ new/libchamplain-0.12.15/champlain-gtk/Makefile.am 2017-03-08 11:31:56.000000000 +0100 @@ -77,7 +77,7 @@ GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la -GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 +GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 pangocairo GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-gtk-@CHAMPLAIN_API_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/champlain-gtk/Makefile.in new/libchamplain-0.12.15/champlain-gtk/Makefile.in --- old/libchamplain-0.12.14/champlain-gtk/Makefile.in 2016-09-06 23:09:08.000000000 +0200 +++ new/libchamplain-0.12.15/champlain-gtk/Makefile.in 2017-03-08 11:53:37.000000000 +0100 @@ -479,7 +479,7 @@ @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@ @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la -@HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 +@HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0 pangocairo @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources) @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain-gtk-@CHAMPLAIN_API_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/configure new/libchamplain-0.12.15/configure --- old/libchamplain-0.12.14/configure 2016-09-06 23:09:08.000000000 +0200 +++ new/libchamplain-0.12.15/configure 2017-03-08 11:53:36.000000000 +0100 @@ -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.14. +# Generated by GNU Autoconf 2.69 for libchamplain 0.12.15. # # 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.14' -PACKAGE_STRING='libchamplain 0.12.14' +PACKAGE_VERSION='0.12.15' +PACKAGE_STRING='libchamplain 0.12.15' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libchamplain' PACKAGE_URL='https://wiki.gnome.org/Projects/libchamplain' @@ -1463,7 +1463,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.14 to adapt to many kinds of systems. +\`configure' configures libchamplain 0.12.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1533,7 +1533,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libchamplain 0.12.14:";; + short | recursive ) echo "Configuration of libchamplain 0.12.15:";; esac cat <<\_ACEOF @@ -1674,7 +1674,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libchamplain configure 0.12.14 +libchamplain configure 0.12.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1952,7 +1952,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.14, which was +It was created by libchamplain $as_me 0.12.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2820,7 +2820,7 @@ # Define the identity of the package. PACKAGE='libchamplain' - VERSION='0.12.14' + VERSION='0.12.15' cat >>confdefs.h <<_ACEOF @@ -12326,13 +12326,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=9:0:9 +LIBRARY_VERSION=9:1:9 CHAMPLAIN_API_VERSION=0.12 CHAMPLAIN_API_VERSION_NORM=0_12 CHAMPLAIN_MAJOR_VERSION=0 CHAMPLAIN_MINOR_VERSION=12 -CHAMPLAIN_MICRO_VERSION=14 -CHAMPLAIN_VERSION=0.12.14 +CHAMPLAIN_MICRO_VERSION=15 +CHAMPLAIN_VERSION=0.12.15 CHAMPLAIN_MAJORMINOR=0.12 @@ -14781,7 +14781,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.14, which was +This file was extended by libchamplain $as_me 0.12.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14848,7 +14848,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.14 +libchamplain config.status 0.12.15 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/configure.ac new/libchamplain-0.12.15/configure.ac --- old/libchamplain-0.12.14/configure.ac 2016-09-06 23:04:20.000000000 +0200 +++ new/libchamplain-0.12.15/configure.ac 2017-03-08 11:36:47.000000000 +0100 @@ -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], [14]) +m4_define([champlain_micro_version], [15]) 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=9:0:9 +LIBRARY_VERSION=9:1:9 CHAMPLAIN_API_VERSION=champlain_api_version CHAMPLAIN_API_VERSION_NORM=champlain_major_version[_]champlain_minor_api_version CHAMPLAIN_MAJOR_VERSION=champlain_major_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/demos/launcher-gtk.c new/libchamplain-0.12.15/demos/launcher-gtk.c --- old/libchamplain-0.12.14/demos/launcher-gtk.c 2016-08-14 11:45:33.000000000 +0200 +++ new/libchamplain-0.12.15/demos/launcher-gtk.c 2016-09-29 23:15:47.000000000 +0200 @@ -223,14 +223,6 @@ static void -export_to_png_cb (GdkPixbuf *pixbuf, - GAsyncResult *res) -{ - gdk_pixbuf_save_to_stream_finish (res, NULL); -} - - -static void export_png (GtkButton *button, ChamplainView *view) { @@ -254,18 +246,15 @@ return; file = g_file_new_for_path ("champlain-map.png"); - os = g_file_create (file, G_FILE_CREATE_NONE, NULL, NULL); + os = g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL); if (!os) { g_object_unref (pixbuf); return; } - gdk_pixbuf_save_to_stream_async (pixbuf, - G_OUTPUT_STREAM (os), "png", - NULL, - (GAsyncReadyCallback) export_to_png_cb, - NULL); + gdk_pixbuf_save_to_stream (pixbuf, G_OUTPUT_STREAM (os), "png", NULL, NULL, NULL); + g_output_stream_close (G_OUTPUT_STREAM (os), NULL, NULL); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/docs/reference/html/index.html new/libchamplain-0.12.15/docs/reference/html/index.html --- old/libchamplain-0.12.14/docs/reference/html/index.html 2016-09-06 23:09:28.000000000 +0200 +++ new/libchamplain-0.12.15/docs/reference/html/index.html 2017-03-08 11:53:57.000000000 +0100 @@ -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.14 + for libchamplain 0.12.15 </p> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/docs/reference/html/libchamplain-ChamplainVersion.html new/libchamplain-0.12.15/docs/reference/html/libchamplain-ChamplainVersion.html --- old/libchamplain-0.12.14/docs/reference/html/libchamplain-ChamplainVersion.html 2016-09-06 23:09:28.000000000 +0200 +++ new/libchamplain-0.12.15/docs/reference/html/libchamplain-ChamplainVersion.html 2017-03-08 11:53:57.000000000 +0100 @@ -112,7 +112,7 @@ <hr> <div class="refsect2"> <a name="CHAMPLAIN-MICRO-VERSION:CAPS"></a><h3>CHAMPLAIN_MICRO_VERSION</h3> -<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION (14) +<pre class="programlisting">#define CHAMPLAIN_MICRO_VERSION (15) </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)</p> </div> @@ -164,14 +164,14 @@ <a name="libchamplain-ChamplainVersion.other_details"></a><h2>Types and Values</h2> <div class="refsect2"> <a name="CHAMPLAIN-VERSION:CAPS"></a><h3>CHAMPLAIN_VERSION</h3> -<pre class="programlisting">#define CHAMPLAIN_VERSION 0.12.14 +<pre class="programlisting">#define CHAMPLAIN_VERSION 0.12.15 </pre> <p>The full version of libchamplain, like 1.2.3</p> </div> <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.14" +<pre class="programlisting">#define CHAMPLAIN_VERSION_S "0.12.15" </pre> <p>The full version of libchamplain, in string form (suited for string concatenation)</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/docs/reference/version.xml new/libchamplain-0.12.15/docs/reference/version.xml --- old/libchamplain-0.12.14/docs/reference/version.xml 2016-09-06 23:09:11.000000000 +0200 +++ new/libchamplain-0.12.15/docs/reference/version.xml 2017-03-08 11:53:39.000000000 +0100 @@ -1 +1 @@ -0.12.14 +0.12.15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/docs/reference-gtk/html/index.html new/libchamplain-0.12.15/docs/reference-gtk/html/index.html --- old/libchamplain-0.12.14/docs/reference-gtk/html/index.html 2016-09-06 23:09:28.000000000 +0200 +++ new/libchamplain-0.12.15/docs/reference-gtk/html/index.html 2017-03-08 11:53:57.000000000 +0100 @@ -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.14 + for libchamplain-gtk 0.12.15 </p> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libchamplain-0.12.14/docs/reference-gtk/version.xml new/libchamplain-0.12.15/docs/reference-gtk/version.xml --- old/libchamplain-0.12.14/docs/reference-gtk/version.xml 2016-09-06 23:09:11.000000000 +0200 +++ new/libchamplain-0.12.15/docs/reference-gtk/version.xml 2017-03-08 11:53:39.000000000 +0100 @@ -1 +1 @@ -0.12.14 +0.12.15
