Hello community,
here is the log from the commit of package geocode-glib for openSUSE:Factory checked in at 2014-09-30 19:39:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geocode-glib (Old)
and /work/SRC/openSUSE:Factory/.geocode-glib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geocode-glib"
Changes:
--------
--- /work/SRC/openSUSE:Factory/geocode-glib/geocode-glib.changes 2014-05-20 14:27:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.geocode-glib.new/geocode-glib.changes 2014-09-30 19:40:44.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Sep 23 15:28:52 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.14.0:
+ + Add category and programming language to doap file.
+
+-------------------------------------------------------------------
+Sat Jul 12 21:51:36 UTC 2014 - dimstar@opensuse.org
+
+- Update to version 3.13.3:
+ + Add types and icons for more amenity place types.
+ + Fix memory leaks in geo uri handling.
+ + Add description extension to geo uri.
+ + Add cancellable check to all GSimpleAsyncResult.
+
+-------------------------------------------------------------------
Old:
----
geocode-glib-3.12.2.tar.xz
New:
----
geocode-glib-3.14.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geocode-glib.spec ++++++
--- /var/tmp/diff_new_pack.uTMUMr/_old 2014-09-30 19:40:44.000000000 +0200
+++ /var/tmp/diff_new_pack.uTMUMr/_new 2014-09-30 19:40:44.000000000 +0200
@@ -17,13 +17,13 @@
Name: geocode-glib
-Version: 3.12.2
+Version: 3.14.0
Release: 0
Summary: Convenience library for the Yahoo! Place Finder APIs
License: LGPL-2.0+
Group: System/Libraries
Url: http://www.gnome.org/
-Source: http://download.gnome.org/sources/geocode-glib/3.12/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/geocode-glib/3.14/%{name}-%{version}.tar.xz
BuildRequires: gnome-doc-utils-devel
BuildRequires: gobject-introspection-devel
# Needed for post/postun scripts
++++++ geocode-glib-3.12.2.tar.xz -> geocode-glib-3.14.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/ChangeLog new/geocode-glib-3.14.0/ChangeLog
--- old/geocode-glib-3.12.2/ChangeLog 2014-05-13 07:13:37.000000000 +0200
+++ new/geocode-glib-3.14.0/ChangeLog 2014-09-23 17:07:20.000000000 +0200
@@ -1,14 +1,68 @@
-commit 093fb65e387f5429d2a417ca81a285cceccf211b
+commit ae38d319a9c1a85ae3c33bb68ad91d04ee50047c
Author: Jonas Danielsson
-Date: Tue May 13 07:12:47 2014 +0200
+Date: Tue Sep 23 17:05:19 2014 +0200
- Release 3.12.2
+ Release 3.14.0
- NEWS | 11 +++++++++++
+ NEWS | 12 ++++++++++++
+ configure.ac | 4 ++--
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+commit f27719627334c2d79039641394e092e2c5ca1a52
+Author: Andre Klapper
+Date: Fri Aug 1 11:55:28 2014 +0200
+
+ doap: add <programming-language>
+
+ geocode-glib.doap | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 410668f49dc51769c4aaab3f00e100d436e705cf
+Author: Olav Vitters
+Date: Wed Jul 30 19:46:02 2014 +0200
+
+ doap category core
+
+ geocode-glib.doap | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit ed1a162a781baa106e0e72ca6374d89e58b86819
+Author: Jonas Danielsson
+Date: Wed Jun 25 00:37:17 2014 +0200
+
+ Release 3.13.3
+
+ NEWS | 16 ++++++++++++++++
configure.ac | 2 +-
- 2 files changed, 12 insertions(+), 1 deletion(-)
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+commit 6fa239b5aba73d135432410250449bd351993eb6
+Author: Giovanni Campagna
+Date: Wed Jun 18 21:59:31 2014 +0200
+
+ Set the cancellable to check on each GSimpleAsyncResult
+
+ This provides the expected semantics that cancelling an async call
+ trumps on any successful result or previous error.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=731880
+
+ geocode-glib/geocode-forward.c | 1 +
+ geocode-glib/geocode-reverse.c | 1 +
+ 2 files changed, 2 insertions(+)
-commit 12c116d619eea25c6f779a91b51b289ca6b6d0ff
+commit 538e625aac0fae7ea65c0187920cd03a807ecddd
+Author: Jonas Danielsson
+Date: Tue Apr 8 22:24:44 2014 +0200
+
+ forward: Document geo URI scheme usage
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=727861
+
+ geocode-glib/geocode-location.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+commit a7fb78ec5b506e0bfd600529e672a13b81a22f64
Author: Jonas Danielsson
Date: Thu May 8 12:15:02 2014 +0200
@@ -19,7 +73,7 @@
geocode-glib/geocode-location.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
-commit 88ed3f18cb5e72185dcf7e54456c7edd86a6446b
+commit 227618ca6ba81646506ddfc879f41bbe91bbaf07
Author: Jonas Danielsson
Date: Thu May 8 12:15:19 2014 +0200
@@ -30,6 +84,97 @@
geocode-glib/test-geouri.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
+commit 931bd04172e87dacd7dbcd0001a271f328c429cf
+Author: Jonas Danielsson
+Date: Tue Apr 8 22:09:38 2014 +0200
+
+ forward: Add description extension to geo uri
+
+ Android and Google Maps support an extention to geo uri that allows
+ specifying a label to a location.
+
+ The form is
+ geo:0,0?q=lat,lng(label)
+
+ This patch adds parsing of that format to GeocodeLocation.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=727861
+
+ geocode-glib/geocode-location.c | 55 +++++++++++++++++++++++++++++++++++++++++
+ geocode-glib/test-geouri.c | 8 +++++-
+ 2 files changed, 62 insertions(+), 1 deletion(-)
+
+commit e55be63af2c689076994ec621578d2d7888b6564
+Author: Frédéric Péters
+Date: Mon Apr 14 18:09:27 2014 +0200
+
+ Fix Nominatim API URL in README file
+
+ README | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7eb14903833a5897466e4585c2b07d1a47681f14
+Author: Jonas Danielsson
+Date: Wed Mar 26 22:19:28 2014 +0100
+
+ forward: Include airport place type in results
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725899
+
+ geocode-glib/geocode-forward.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 4d4d5b5aa1f3436b64b221172e5abdf69e7a4eaa
+Author: Jonas Danielsson
+Date: Wed Mar 26 22:20:49 2014 +0100
+
+ build: Add icon for airtport place type
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725899
+
+ icons/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit abbba5b45428bdf8ea2fdf2cbd435cdca7c8942e
+Author: Jonas Danielsson
+Date: Wed Mar 26 22:24:13 2014 +0100
+
+ Add icons for new amenity place types
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725899
+
+ geocode-glib/geocode-place.c | 16 +++
+ icons/Makefile.am | 6 +-
+ icons/maki/scalable_places_poi-bar.svg | 141 ++++++++++++++++++++
+ .../maki/scalable_places_poi-place-of-worship.svg | 138 ++++++++++++++++++++
+ icons/maki/scalable_places_poi-restaurant.svg | 143 +++++++++++++++++++++
+ icons/maki/scalable_places_poi-school.svg | 142 ++++++++++++++++++++
+ 6 files changed, 585 insertions(+), 1 deletion(-)
+
+commit 9b0b84c6f0b2360d10f8ca5760aa6a0747dabc0c
+Author: Jonas Danielsson
+Date: Wed Mar 26 22:23:39 2014 +0100
+
+ Add amenity place types to GeocodePlace
+
+ The place types selected here are among the top of the amenity
+ category from http://taginfo.openstreetmap.org/keys/amenity#values
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725899
+
+ geocode-glib/geocode-forward.c | 10 ++++++++++
+ geocode-glib/geocode-place.h | 10 +++++++++-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+commit 6a85e979936fcdbc14a89a077fdd4a1022a4d13e
+Author: Jonas Danielsson
+Date: Mon Mar 24 21:32:52 2014 +0100
+
+ Bump minor version of unstable branch
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit 9872e314172928b1c352fd6dd3011d2ad84ee4ac
Author: Jonas Danielsson
Date: Mon Mar 24 21:27:01 2014 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/NEWS new/geocode-glib-3.14.0/NEWS
--- old/geocode-glib-3.12.2/NEWS 2014-05-13 07:12:17.000000000 +0200
+++ new/geocode-glib-3.14.0/NEWS 2014-09-23 17:05:09.000000000 +0200
@@ -1,12 +1,29 @@
-3.12.2
+3.14.0
+------
+
+Changes since 3.13.3:
+
+- Add category and programming language to doap file
+
+All contributors to this release:
+
+Olav Vitters
+Andre Klapper
+
+3.13.3
------
Changes since 3.12.0:
-- Fix memory leaks in 'geo' URI parsing and testing
+- Add types and icons for more amenity place types
+- Fix memory leaks in geo uri handling
+- Add description extension to geo uri
+- Add cancellable check to all GSimpleAsyncResult
All contributors to this release:
+Frédéric Péters
+Giovanni Campagna
Jonas Danielsson
3.12.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/README new/geocode-glib-3.14.0/README
--- old/geocode-glib-3.12.2/README 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/README 2014-06-25 00:37:44.000000000 +0200
@@ -19,7 +19,7 @@
-----
Nominatim API:
-http://http://wiki.openstreetmap.org/wiki/Nominatim
+http://wiki.openstreetmap.org/wiki/Nominatim
Geocoding:
http://en.wikipedia.org/wiki/Geocoding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/aclocal.m4 new/geocode-glib-3.14.0/aclocal.m4
--- old/geocode-glib-3.12.2/aclocal.m4 2014-05-13 07:13:29.000000000 +0200
+++ new/geocode-glib-3.14.0/aclocal.m4 2014-09-23 17:06:46.000000000 +0200
@@ -1375,6 +1375,120 @@
fi[]dnl
])# PKG_CHECK_MODULES
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_check_enable_debug.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# Check for the presence of an --enable-debug option to configure and
+# allow/avoid compiled debugging flags appropriately.
+#
+# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no],
+# [ENABLE DEBUG VARIABLES …],
+# [DISABLE DEBUG VARIABLES NDEBUG …])
+#
+# DESCRIPTION
+#
+# Check for the presence of an --enable-debug option to configure, with the
+# specified default value used when the option is not present. Return the
+# value in the variable $ax_enable_debug.
+#
+# Specifying 'yes' adds '-g -O0' to the compilation flags for all languages.
+# Specifying 'info' adds '-g' to the compilation flags. Specifying 'profile'
+# adds '-g -pg' to the compilation flags and '-pg' to the linking flags.
+# Otherwise, nothing is added.
+#
+# Define the variables listed in the second argument if debug is enabled,
+# defaulting to no variables. Defines the variables listed in the third
+# argument if debug is disabled, defaulting to NDEBUG. All lists of
+# variables should be space-separated.
+#
+# If debug is not enabled, ensure AC_PROG_* will not add debugging flags.
+# Should be invoked prior to any AC_PROG_* compiler checks.
+#
+# LAST MODIFICATION
+#
+# 2014-05-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2011 Rhys Ulerich
+# Copyright © 2014 Philip Withnall
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+
+AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
+ AC_BEFORE([$0],[AC_PROG_CC])dnl
+ AC_BEFORE([$0],[AC_PROG_CXX])dnl
+ AC_BEFORE([$0],[AC_PROG_F77])dnl
+ AC_BEFORE([$0],[AC_PROG_FC])dnl
+
+ AC_MSG_CHECKING(whether to enable debugging)
+
+ m4_define(ax_enable_debug_default,[m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))])
+ m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))])
+ m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))])
+
+ AC_ARG_ENABLE(debug,
+ [AS_HELP_STRING([--enable-debug]@<:@=ax_enable_debug_default@:>@,[compile with debugging; one of yes/info/profile/no])],
+ [],enable_debug=ax_enable_debug_default)
+ if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then
+ AC_MSG_RESULT(yes)
+ CFLAGS="${CFLAGS} -g -O0"
+ CXXFLAGS="${CXXFLAGS} -g -O0"
+ FFLAGS="${FFLAGS} -g -O0"
+ FCFLAGS="${FCFLAGS} -g -O0"
+ OBJCFLAGS="${OBJCFLAGS} -g -O0"
+
+ dnl Define various variables if debugging is enabled.
+ m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])
+ else
+ if test "x$enable_debug" = "xinfo"; then
+ AC_MSG_RESULT(info)
+ CFLAGS="${CFLAGS} -g"
+ CXXFLAGS="${CXXFLAGS} -g"
+ FFLAGS="${FFLAGS} -g"
+ FCFLAGS="${FCFLAGS} -g"
+ OBJCFLAGS="${OBJCFLAGS} -g"
+ elif test "x$enable_debug" = "xprofile"; then
+ AC_MSG_RESULT(profile)
+ CFLAGS="${CFLAGS} -g -pg"
+ CXXFLAGS="${CXXFLAGS} -g -pg"
+ FFLAGS="${FFLAGS} -g -pg"
+ FCFLAGS="${FCFLAGS} -g -pg"
+ OBJCFLAGS="${OBJCFLAGS} -g -pg"
+ LDFLAGS="${LDFLAGS} -pg"
+ else
+ AC_MSG_RESULT(no)
+ dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags
+ dnl by setting any unset environment flag variables
+ if test "x${CFLAGS+set}" != "xset"; then
+ CFLAGS=""
+ fi
+ if test "x${CXXFLAGS+set}" != "xset"; then
+ CXXFLAGS=""
+ fi
+ if test "x${FFLAGS+set}" != "xset"; then
+ FFLAGS=""
+ fi
+ if test "x${FCFLAGS+set}" != "xset"; then
+ FCFLAGS=""
+ fi
+ if test "x${OBJCFLAGS+set}" != "xset"; then
+ OBJCFLAGS=""
+ fi
+ fi
+
+ dnl Define various variables if debugging is disabled.
+ dnl assert.h is a NOP if NDEBUG is defined, so define it by default.
+ m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])
+ fi
+ ax_enable_debug=$enable_debug
+])
+
# gnome-common.m4
#
# serial 3
@@ -1400,23 +1514,18 @@
in your top-level Makefile.am, instead, where "m4" is the macro directory set
with AC_CONFIG_MACRO_DIR() in your configure.ac]])
-AC_DEFUN([GNOME_DEBUG_CHECK],
+AU_DEFUN([GNOME_DEBUG_CHECK],
[
- AC_ARG_ENABLE([debug],
- AC_HELP_STRING([--enable-debug],
- [turn on debugging]),,
- [enable_debug=no])
-
- if test x$enable_debug = xyes ; then
- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
- [Enable additional debugging at the expense of performance and size])
- fi
-])
+ AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG])
+],
+[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and
+replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG.
+See: https://savannah.gnu.org/patch/?8452]])
dnl GNOME_MAINTAINER_MODE_DEFINES ()
dnl define DISABLE_DEPRECATED
dnl
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
[
AC_REQUIRE([AM_MAINTAINER_MODE])
@@ -1429,7 +1538,9 @@
fi
AC_SUBST(DISABLE_DEPRECATED)
-])
+],
+[[$0: This macro is deprecated. All of the modules it disables deprecations for
+are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]])
# gnome-compiler-flags.m4
#
@@ -1491,7 +1602,7 @@
case "$enable_compile_warnings" in
no)
- warning_flags=
+ warning_flags="-w"
;;
minimum)
warning_flags="-Wall"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/config.h.in new/geocode-glib-3.14.0/config.h.in
--- old/geocode-glib-3.12.2/config.h.in 2014-05-13 07:13:30.000000000 +0200
+++ new/geocode-glib-3.14.0/config.h.in 2014-09-23 17:06:47.000000000 +0200
@@ -7,7 +7,7 @@
/* The name of the gettext domain */
#undef GETTEXT_PACKAGE
-/* Enable additional debugging at the expense of performance and size */
+/* Define if debugging is enabled */
#undef GNOME_ENABLE_DEBUG
/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
@@ -65,6 +65,9 @@
*/
#undef LT_OBJDIR
+/* Define if debugging is disabled */
+#undef NDEBUG
+
/* Name of package */
#undef PACKAGE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/configure new/geocode-glib-3.14.0/configure
--- old/geocode-glib-3.12.2/configure 2014-05-13 07:13:29.000000000 +0200
+++ new/geocode-glib-3.14.0/configure 2014-09-23 17:06:46.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for geocode-glib 3.12.2.
+# Generated by GNU Autoconf 2.69 for geocode-glib 3.14.0.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=geocode-glib.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='geocode-glib'
PACKAGE_TARNAME='geocode-glib'
-PACKAGE_VERSION='3.12.2'
-PACKAGE_STRING='geocode-glib 3.12.2'
+PACKAGE_VERSION='3.14.0'
+PACKAGE_STRING='geocode-glib 3.14.0'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=geocode-glib'
PACKAGE_URL=''
@@ -1396,7 +1396,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 geocode-glib 3.12.2 to adapt to many kinds of systems.
+\`configure' configures geocode-glib 3.14.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1466,7 +1466,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of geocode-glib 3.12.2:";;
+ short | recursive ) echo "Configuration of geocode-glib 3.14.0:";;
esac
cat <<\_ACEOF
@@ -1495,7 +1495,7 @@
--enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
--enable-introspection=[no/auto/yes]
Enable introspection for this build
- --enable-debug turn on debugging
+ --enable-debug[=no] compile with debugging; one of yes/info/profile/no
--enable-compile-warnings=[no/minimum/yes/maximum/error]
Turn on compiler warnings
--enable-iso-c Try to warn if code is not ISO C
@@ -1608,7 +1608,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-geocode-glib configure 3.12.2
+geocode-glib configure 3.14.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1886,7 +1886,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by geocode-glib $as_me 3.12.2, which was
+It was created by geocode-glib $as_me 3.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2756,7 +2756,7 @@
# Define the identity of the package.
PACKAGE='geocode-glib'
- VERSION='3.12.2'
+ VERSION='3.14.0'
cat >>confdefs.h <<_ACEOF
@@ -14358,19 +14358,78 @@
- # Check whether --enable-debug was given.
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5
+$as_echo_n "checking whether to enable debugging... " >&6; }
+
+
+
+
+
+ # Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug;
else
enable_debug=no
fi
+ if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ CFLAGS="${CFLAGS} -g -O0"
+ CXXFLAGS="${CXXFLAGS} -g -O0"
+ FFLAGS="${FFLAGS} -g -O0"
+ FCFLAGS="${FCFLAGS} -g -O0"
+ OBJCFLAGS="${OBJCFLAGS} -g -O0"
- if test x$enable_debug = xyes ; then
-$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h
+$as_echo "#define GNOME_ENABLE_DEBUG /**/" >>confdefs.h
+
+ else
+ if test "x$enable_debug" = "xinfo"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5
+$as_echo "info" >&6; }
+ CFLAGS="${CFLAGS} -g"
+ CXXFLAGS="${CXXFLAGS} -g"
+ FFLAGS="${FFLAGS} -g"
+ FCFLAGS="${FCFLAGS} -g"
+ OBJCFLAGS="${OBJCFLAGS} -g"
+ elif test "x$enable_debug" = "xprofile"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5
+$as_echo "profile" >&6; }
+ CFLAGS="${CFLAGS} -g -pg"
+ CXXFLAGS="${CXXFLAGS} -g -pg"
+ FFLAGS="${FFLAGS} -g -pg"
+ FCFLAGS="${FCFLAGS} -g -pg"
+ OBJCFLAGS="${OBJCFLAGS} -g -pg"
+ LDFLAGS="${LDFLAGS} -pg"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ if test "x${CFLAGS+set}" != "xset"; then
+ CFLAGS=""
+ fi
+ if test "x${CXXFLAGS+set}" != "xset"; then
+ CXXFLAGS=""
+ fi
+ if test "x${FFLAGS+set}" != "xset"; then
+ FFLAGS=""
+ fi
+ if test "x${FCFLAGS+set}" != "xset"; then
+ FCFLAGS=""
+ fi
+ if test "x${OBJCFLAGS+set}" != "xset"; then
+ OBJCFLAGS=""
+ fi
+ fi
+
+
+$as_echo "#define NDEBUG /**/" >>confdefs.h
+
+ fi
+ ax_enable_debug=$enable_debug
- fi
@@ -14409,7 +14468,7 @@
case "$enable_compile_warnings" in
no)
- warning_flags=
+ warning_flags="-w"
;;
minimum)
warning_flags="-Wall"
@@ -15146,7 +15205,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by geocode-glib $as_me 3.12.2, which was
+This file was extended by geocode-glib $as_me 3.14.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15212,7 +15271,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-geocode-glib config.status 3.12.2
+geocode-glib config.status 3.14.0
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/geocode-glib-3.12.2/configure.ac new/geocode-glib-3.14.0/configure.ac
--- old/geocode-glib-3.12.2/configure.ac 2014-05-13 07:12:24.000000000 +0200
+++ new/geocode-glib-3.14.0/configure.ac 2014-09-23 17:04:44.000000000 +0200
@@ -1,8 +1,8 @@
AC_PREREQ([2.63])
m4_define(gclib_version_major, 3)
-m4_define(gclib_version_minor, 12)
-m4_define(gclib_version_micro, 2)
+m4_define(gclib_version_minor, 14)
+m4_define(gclib_version_micro, 0)
AC_INIT([geocode-glib],
[gclib_version_major.gclib_version_minor.gclib_version_micro],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/GeocodeBoundingBox.html new/geocode-glib-3.14.0/docs/html/GeocodeBoundingBox.html
--- old/geocode-glib-3.12.2/docs/html/GeocodeBoundingBox.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/GeocodeBoundingBox.html 2014-09-23 17:07:20.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="geocode-glib-geocode-enum-types.html" title="geocode-enum-types">
<link rel="next" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -375,6 +375,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/GeocodeForward.html new/geocode-glib-3.14.0/docs/html/GeocodeForward.html
--- old/geocode-glib-3.12.2/docs/html/GeocodeForward.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/GeocodeForward.html 2014-09-23 17:07:20.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="geocode-glib-geocode-error.html" title="geocode-error">
<link rel="next" href="GeocodeLocation.html" title="GeocodeLocation">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -593,6 +593,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/GeocodeLocation.html new/geocode-glib-3.14.0/docs/html/GeocodeLocation.html
--- old/geocode-glib-3.12.2/docs/html/GeocodeLocation.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/GeocodeLocation.html 2014-09-23 17:07:21.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="GeocodeForward.html" title="GeocodeForward">
<link rel="next" href="GeocodePlace.html" title="GeocodePlace">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -367,8 +367,14 @@
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
<p>Initialize a <a class="link" href="GeocodeLocation.html" title="GeocodeLocation"><span class="type">GeocodeLocation</span></a> object with the given <em class="parameter"><code>uri</code></em>
.</p>
+<p>The URI should be in the geo scheme (RFC 5870) which in its simplest form
+looks like:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>geo:latitude,longitude</p></li></ul></div>
+<p>An <a class="ulink" href="http://developer.android.com/guide/components/intents-common.html#Maps" target="_top">
+Android extension</a> to set a description is also supported in the form of:</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>geo:0,0?q=latitude,longitude(description)</p></li></ul></div>
<div class="refsect3">
-<a name="id-1.2.4.9.4.5"></a><h4>Parameters</h4>
+<a name="id-1.2.4.9.4.9"></a><h4>Parameters</h4>
<div class="informaltable"><table width="100%" border="0">
<colgroup>
<col width="150px" class="parameters_name">
@@ -395,7 +401,7 @@
</table></div>
</div>
<div class="refsect3">
-<a name="id-1.2.4.9.4.6"></a><h4>Returns</h4>
+<a name="id-1.2.4.9.4.10"></a><h4>Returns</h4>
<p> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success and <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on error.</p>
<p></p>
</div>
@@ -887,6 +893,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/GeocodePlace.html new/geocode-glib-3.14.0/docs/html/GeocodePlace.html
--- old/geocode-glib-3.12.2/docs/html/GeocodePlace.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/GeocodePlace.html 2014-09-23 17:07:20.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="GeocodeLocation.html" title="GeocodeLocation">
<link rel="next" href="GeocodeReverse.html" title="GeocodeReverse">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1787,6 +1787,34 @@
</td>
<td class="enum_member_annotations"> </td>
</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GEOCODE-PLACE-TYPE-SCHOOL:CAPS"></a>GEOCODE_PLACE_TYPE_SCHOOL</p></td>
+<td class="enum_member_description">
+<p>Institution designed for learning under the supervision of teachers.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GEOCODE-PLACE-TYPE-PLACE-OF-WORSHIP:CAPS"></a>GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP</p></td>
+<td class="enum_member_description">
+<p>All places of worship independently of the religion or denomination.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GEOCODE-PLACE-TYPE-RESTAURANT:CAPS"></a>GEOCODE_PLACE_TYPE_RESTAURANT</p></td>
+<td class="enum_member_description">
+<p>Generally formal place with sit-down facilities selling full meals served by waiters.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
+<tr>
+<td class="enum_member_name"><p><a name="GEOCODE-PLACE-TYPE-BAR:CAPS"></a>GEOCODE_PLACE_TYPE_BAR</p></td>
+<td class="enum_member_description">
+<p>A bar or pub.</p>
+</td>
+<td class="enum_member_annotations"> </td>
+</tr>
</tbody>
</table></div>
</div>
@@ -1939,6 +1967,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/GeocodeReverse.html new/geocode-glib-3.14.0/docs/html/GeocodeReverse.html
--- old/geocode-glib-3.12.2/docs/html/GeocodeReverse.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/GeocodeReverse.html 2014-09-23 17:07:21.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="GeocodePlace.html" title="GeocodePlace">
<link rel="next" href="geocode-glib-geocode-enum-types.html" title="geocode-enum-types">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -285,6 +285,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/annotation-glossary.html new/geocode-glib-3.14.0/docs/html/annotation-glossary.html
--- old/geocode-glib-3.12.2/docs/html/annotation-glossary.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/annotation-glossary.html 2014-09-23 17:07:20.000000000 +0200
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="geocode-glib Reference Manual">
<link rel="up" href="index.html" title="geocode-glib Reference Manual">
<link rel="prev" href="api-index-full.html" title="API Index">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -36,6 +36,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/api-index-full.html new/geocode-glib-3.14.0/docs/html/api-index-full.html
--- old/geocode-glib-3.12.2/docs/html/api-index-full.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/api-index-full.html 2014-09-23 17:07:21.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="index.html" title="geocode-glib Reference Manual">
<link rel="prev" href="GeocodeBoundingBox.html" title="GeocodeBoundingBox">
<link rel="next" href="annotation-glossary.html" title="Annotation Glossary">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -537,6 +537,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/ch01.html new/geocode-glib-3.14.0/docs/html/ch01.html
--- old/geocode-glib-3.12.2/docs/html/ch01.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/ch01.html 2014-09-23 17:07:20.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="index.html" title="geocode-glib Reference Manual">
<link rel="prev" href="index.html" title="geocode-glib Reference Manual">
<link rel="next" href="geocode-glib-geocode-error.html" title="geocode-error">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -48,6 +48,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/geocode-glib-geocode-enum-types.html new/geocode-glib-3.14.0/docs/html/geocode-glib-geocode-enum-types.html
--- old/geocode-glib-3.12.2/docs/html/geocode-glib-geocode-enum-types.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/geocode-glib-geocode-enum-types.html 2014-09-23 17:07:20.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="GeocodeReverse.html" title="GeocodeReverse">
<link rel="next" href="GeocodeBoundingBox.html" title="GeocodeBoundingBox">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -49,6 +49,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/geocode-glib-geocode-error.html new/geocode-glib-3.14.0/docs/html/geocode-glib-geocode-error.html
--- old/geocode-glib-3.12.2/docs/html/geocode-glib-geocode-error.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/geocode-glib-geocode-error.html 2014-09-23 17:07:20.000000000 +0200
@@ -8,7 +8,7 @@
<link rel="up" href="ch01.html" title="Geocode-glib">
<link rel="prev" href="ch01.html" title="Geocode-glib">
<link rel="next" href="GeocodeForward.html" title="GeocodeForward">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -163,6 +163,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/html/index.html new/geocode-glib-3.14.0/docs/html/index.html
--- old/geocode-glib-3.12.2/docs/html/index.html 2014-05-13 07:13:44.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/html/index.html 2014-09-23 17:07:21.000000000 +0200
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
<link rel="home" href="index.html" title="geocode-glib Reference Manual">
<link rel="next" href="ch01.html" title="Geocode-glib">
-<meta name="generator" content="GTK-Doc V1.20.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.21.1 (XML mode)">
<link rel="stylesheet" href="style.css" type="text/css">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -15,7 +15,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">geocode-glib Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- for geocode-glib 3.12.2
+ for geocode-glib 3.14.0
The latest version of this documentation can be found on-line at
<a class="ulink" href="http://library.gnome.org/devel/geocode-glib/index.html" target="_top">http://library.gnome.org/devel/geocode-glib/</a>.
@@ -54,6 +54,6 @@
</div>
<div class="footer">
<hr>
- Generated by GTK-Doc V1.20.1</div>
+ Generated by GTK-Doc V1.21.1</div>
</body>
</html>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/docs/version.xml new/geocode-glib-3.14.0/docs/version.xml
--- old/geocode-glib-3.12.2/docs/version.xml 2014-05-13 07:13:35.000000000 +0200
+++ new/geocode-glib-3.14.0/docs/version.xml 2014-09-23 17:06:52.000000000 +0200
@@ -1 +1 @@
-3.12.2
+3.14.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/geocode-enum-types.c new/geocode-glib-3.14.0/geocode-glib/geocode-enum-types.c
--- old/geocode-glib-3.12.2/geocode-glib/geocode-enum-types.c 2014-05-13 07:13:38.000000000 +0200
+++ new/geocode-glib-3.14.0/geocode-glib/geocode-enum-types.c 2014-06-25 00:38:14.000000000 +0200
@@ -88,6 +88,10 @@
{ GEOCODE_PLACE_TYPE_HISTORICAL_TOWN, "GEOCODE_PLACE_TYPE_HISTORICAL_TOWN", "historical-town" },
{ GEOCODE_PLACE_TYPE_OCEAN, "GEOCODE_PLACE_TYPE_OCEAN", "ocean" },
{ GEOCODE_PLACE_TYPE_SEA, "GEOCODE_PLACE_TYPE_SEA", "sea" },
+ { GEOCODE_PLACE_TYPE_SCHOOL, "GEOCODE_PLACE_TYPE_SCHOOL", "school" },
+ { GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP, "GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP", "place-of-worship" },
+ { GEOCODE_PLACE_TYPE_RESTAURANT, "GEOCODE_PLACE_TYPE_RESTAURANT", "restaurant" },
+ { GEOCODE_PLACE_TYPE_BAR, "GEOCODE_PLACE_TYPE_BAR", "bar" },
{ 0, NULL, NULL }
};
etype = g_enum_register_static ("GeocodePlaceType", values);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/geocode-forward.c new/geocode-glib-3.14.0/geocode-glib/geocode-forward.c
--- old/geocode-glib-3.12.2/geocode-glib/geocode-forward.c 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/geocode-glib/geocode-forward.c 2014-06-25 00:37:44.000000000 +0200
@@ -540,6 +540,7 @@
callback,
user_data,
geocode_forward_search_async);
+ g_simple_async_result_set_check_cancellable (simple, cancellable);
query = get_search_query_for_params (forward, &error);
if (!query) {
@@ -745,6 +746,19 @@
else if (rank == 4)
place_type = GEOCODE_PLACE_TYPE_COUNTRY;
}
+ } else if (g_strcmp0 (category, "amenity") == 0) {
+ if (g_strcmp0 (type, "school") == 0)
+ place_type = GEOCODE_PLACE_TYPE_SCHOOL;
+ else if (g_strcmp0 (type, "place_of_worship") == 0)
+ place_type = GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP;
+ else if (g_strcmp0 (type, "restaurant") == 0)
+ place_type = GEOCODE_PLACE_TYPE_RESTAURANT;
+ else if (g_strcmp0 (type, "bar") == 0 ||
+ g_strcmp0 (type, "pub") == 0)
+ place_type = GEOCODE_PLACE_TYPE_BAR;
+ } else if (g_strcmp0 (category, "aeroway") == 0) {
+ if (g_strcmp0 (type, "aerodrome") == 0)
+ place_type = GEOCODE_PLACE_TYPE_AIRPORT;
}
return place_type;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/geocode-location.c new/geocode-glib-3.14.0/geocode-glib/geocode-location.c
--- old/geocode-glib-3.12.2/geocode-glib/geocode-location.c 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/geocode-glib/geocode-location.c 2014-06-25 00:37:44.000000000 +0200
@@ -202,6 +202,57 @@
}
}
+static void
+parse_geo_uri_special_parameters (GeocodeLocation *loc,
+ const char *params,
+ GError **error)
+{
+ char *end_ptr;
+ char *next_token;
+ char *description;
+ char *token_end;
+ int description_len;
+
+ if (loc->priv->latitude != 0 || loc->priv->longitude != 0)
+ goto err;
+
+ if (strncmp (params, "q=", 2) != 0)
+ goto err;
+
+ next_token = ((char *)params) + 2;
+
+ loc->priv->latitude = g_ascii_strtod (next_token, &end_ptr);
+ if (*end_ptr != ',' || *end_ptr == *params)
+ goto err;
+ next_token = end_ptr + 1;
+
+ loc->priv->longitude = g_ascii_strtod (next_token, &end_ptr);
+ if (*end_ptr == *next_token)
+ goto err;
+
+ if (*end_ptr != '(' || *end_ptr == *next_token)
+ goto err;
+ next_token = end_ptr + 1;
+
+ if ((token_end = strchr (next_token, ')')) == NULL)
+ goto err;
+
+ description_len = token_end - next_token;
+ if (description_len <= 0)
+ goto err;
+
+ description = g_strndup (next_token, description_len);
+ geocode_location_set_description (loc, description);
+ g_free (description);
+ return;
+
+ err:
+ g_set_error_literal (error,
+ GEOCODE_ERROR,
+ GEOCODE_ERROR_PARSE,
+ "Failed to parse geo URI parameters");
+}
+
/*
From RFC 5870:
Both 'crs' and 'u' parameters MUST NOT appear more than once each.
@@ -356,6 +407,10 @@
next_token = end_ptr + 1;
parse_geo_uri_parameters (loc, next_token, error);
return;
+ } else if (*end_ptr == '?') {
+ next_token = end_ptr + 1;
+ parse_geo_uri_special_parameters (loc, next_token, error);
+ return;
} else if (*end_ptr == '\0') {
return;
}
@@ -593,6 +648,17 @@
*
* Initialize a #GeocodeLocation object with the given @uri.
*
+ * The URI should be in the geo scheme (RFC 5870) which in its simplest form
+ * looks like:
+ *
+ * - geo:latitude,longitude
+ *
+ * An http://developer.android.com/guide/components/intents-common.html#Maps">
+ * Android extension</ulink> to set a description is also supported in the form of:
+ *
+ * - geo:0,0?q=latitude,longitude(description)
+ *
* Returns: %TRUE on success and %FALSE on error.
**/
gboolean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/geocode-place.c new/geocode-glib-3.14.0/geocode-glib/geocode-place.c
--- old/geocode-glib-3.12.2/geocode-glib/geocode-place.c 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/geocode-glib/geocode-place.c 2014-06-25 00:37:44.000000000 +0200
@@ -1128,6 +1128,22 @@
icon_name = "poi-car";
break;
+ case GEOCODE_PLACE_TYPE_SCHOOL:
+ icon_name = "poi-school";
+ break;
+
+ case GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP:
+ icon_name = "poi-place-of-worship";
+ break;
+
+ case GEOCODE_PLACE_TYPE_RESTAURANT:
+ icon_name = "poi-restaurant";
+ break;
+
+ case GEOCODE_PLACE_TYPE_BAR:
+ icon_name = "poi-bar";
+ break;
+
default:
icon_name = "poi-marker"; /* generic marker */
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/geocode-place.h new/geocode-glib-3.14.0/geocode-glib/geocode-place.h
--- old/geocode-glib-3.12.2/geocode-glib/geocode-place.h 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/geocode-glib/geocode-place.h 2014-06-25 00:37:44.000000000 +0200
@@ -97,6 +97,10 @@
* @GEOCODE_PLACE_TYPE_HISTORICAL_TOWN: A historical populated settlement that is no longer known by its original name.
* @GEOCODE_PLACE_TYPE_OCEAN: One of the five major bodies of water on the Earth.
* @GEOCODE_PLACE_TYPE_SEA: An area of open water smaller than an ocean.
+ * @GEOCODE_PLACE_TYPE_SCHOOL: Institution designed for learning under the supervision of teachers.
+ * @GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP: All places of worship independently of the religion or denomination.
+ * @GEOCODE_PLACE_TYPE_RESTAURANT: Generally formal place with sit-down facilities selling full meals served by waiters.
+ * @GEOCODE_PLACE_TYPE_BAR: A bar or pub.
*
* Type of the place.
*/
@@ -130,7 +134,11 @@
GEOCODE_PLACE_TYPE_ESTATE,
GEOCODE_PLACE_TYPE_HISTORICAL_TOWN,
GEOCODE_PLACE_TYPE_OCEAN,
- GEOCODE_PLACE_TYPE_SEA
+ GEOCODE_PLACE_TYPE_SEA,
+ GEOCODE_PLACE_TYPE_SCHOOL,
+ GEOCODE_PLACE_TYPE_PLACE_OF_WORSHIP,
+ GEOCODE_PLACE_TYPE_RESTAURANT,
+ GEOCODE_PLACE_TYPE_BAR
} GeocodePlaceType;
#define GEOCODE_TYPE_PLACE (geocode_place_get_type ())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/geocode-reverse.c new/geocode-glib-3.14.0/geocode-glib/geocode-reverse.c
--- old/geocode-glib-3.12.2/geocode-glib/geocode-reverse.c 2014-03-03 12:37:32.000000000 +0100
+++ new/geocode-glib-3.14.0/geocode-glib/geocode-reverse.c 2014-06-25 00:37:44.000000000 +0200
@@ -412,6 +412,7 @@
callback,
user_data,
geocode_reverse_resolve_async);
+ g_simple_async_result_set_check_cancellable (simple, cancellable);
query = get_resolve_query_for_params (object->priv->ht);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/geocode-glib/test-geouri.c new/geocode-glib-3.14.0/geocode-glib/test-geouri.c
--- old/geocode-glib-3.12.2/geocode-glib/test-geouri.c 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/geocode-glib/test-geouri.c 2014-06-25 00:37:44.000000000 +0200
@@ -34,7 +34,13 @@
{ "geo:13.37alpha,42.42", FALSE },
{ "geo:13.37,alpha42.42", FALSE },
{ "geo:13.37,42.42,12.alpha", FALSE },
- { "geo:,13.37,42.42", FALSE }
+ { "geo:,13.37,42.42", FALSE },
+ { "geo:0,0?q=13.36,4242(description)", TRUE },
+ { "geo:0,0?q=-13.36,4242(description)", TRUE },
+ { "geo:0,0?q=13.36,-4242(description)", TRUE },
+ { "geo:1,2?q=13.36,4242(description)", FALSE },
+ { "geo:0,0?q=13.36,4242(description", FALSE },
+ { "geo:0,0?q=13.36,4242()", FALSE }
};
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/icons/Makefile.am new/geocode-glib-3.14.0/icons/Makefile.am
--- old/geocode-glib-3.12.2/icons/Makefile.am 2014-05-13 07:10:46.000000000 +0200
+++ new/geocode-glib-3.14.0/icons/Makefile.am 2014-06-25 00:37:44.000000000 +0200
@@ -5,7 +5,12 @@
scalable_places_poi-car.svg \
scalable_places_poi-marker.svg \
scalable_places_poi-railway-station.svg \
- scalable_places_poi-town.svg
+ scalable_places_poi-town.svg \
+ scalable_places_poi-school.svg \
+ scalable_places_poi-place-of-worship.svg \
+ scalable_places_poi-restaurant.svg \
+ scalable_places_poi-bar.svg \
+ scalable_places_poi-airport.svg
gtk_update_icon_cache = gtk-update-icon-cache -f -t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/icons/Makefile.in new/geocode-glib-3.14.0/icons/Makefile.in
--- old/geocode-glib-3.12.2/icons/Makefile.in 2014-05-13 07:13:31.000000000 +0200
+++ new/geocode-glib-3.14.0/icons/Makefile.in 2014-09-23 17:06:48.000000000 +0200
@@ -283,7 +283,12 @@
scalable_places_poi-car.svg \
scalable_places_poi-marker.svg \
scalable_places_poi-railway-station.svg \
- scalable_places_poi-town.svg
+ scalable_places_poi-town.svg \
+ scalable_places_poi-school.svg \
+ scalable_places_poi-place-of-worship.svg \
+ scalable_places_poi-restaurant.svg \
+ scalable_places_poi-bar.svg \
+ scalable_places_poi-airport.svg
gtk_update_icon_cache = gtk-update-icon-cache -f -t
EXTRA_DIST = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geocode-glib-3.12.2/po/geocode-glib.pot new/geocode-glib-3.14.0/po/geocode-glib.pot
--- old/geocode-glib-3.12.2/po/geocode-glib.pot 2014-05-13 07:13:38.000000000 +0200
+++ new/geocode-glib-3.14.0/po/geocode-glib.pot 2014-09-23 17:07:20.000000000 +0200
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: geocode-glib 3.12.2\n"
+"Project-Id-Version: geocode-glib 3.14.0\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=geocode-glib\n"
-"POT-Creation-Date: 2014-05-13 07:13+0200\n"
+"POT-Creation-Date: 2014-09-23 17:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org