Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package geocode-glib for openSUSE:Factory
checked in at 2022-08-10 17:13:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geocode-glib (Old)
and /work/SRC/openSUSE:Factory/.geocode-glib.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geocode-glib"
Wed Aug 10 17:13:09 2022 rev:34 rq:994159 version:3.26.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/geocode-glib/geocode-glib.changes
2022-07-05 12:27:11.689845894 +0200
+++ /work/SRC/openSUSE:Factory/.geocode-glib.new.1521/geocode-glib.changes
2022-08-10 17:13:47.485784954 +0200
@@ -1,0 +2,7 @@
+Tue Aug 9 12:35:46 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to version 3.26.4:
+ + This release includes a fix to a test data file not being
+ installed, and a bug fix for a bug in the libsoup3 port.
+
+-------------------------------------------------------------------
Old:
----
geocode-glib-3.26.3.tar.xz
New:
----
geocode-glib-3.26.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geocode-glib.spec ++++++
--- /var/tmp/diff_new_pack.SVvRNH/_old 2022-08-10 17:13:48.017786342 +0200
+++ /var/tmp/diff_new_pack.SVvRNH/_new 2022-08-10 17:13:48.021786353 +0200
@@ -28,7 +28,7 @@
%endif
Name: geocode-glib%{?nsuffix}
-Version: 3.26.3
+Version: 3.26.4
Release: 0
Summary: Convenience library for the Yahoo! Place Finder APIs
License: LGPL-2.0-or-later
++++++ geocode-glib-3.26.3.tar.xz -> geocode-glib-3.26.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geocode-glib-3.26.3/.gitlab-ci.yml
new/geocode-glib-3.26.4/.gitlab-ci.yml
--- old/geocode-glib-3.26.3/.gitlab-ci.yml 2022-06-30 15:43:14.000000000
+0200
+++ new/geocode-glib-3.26.4/.gitlab-ci.yml 2022-08-08 14:33:42.000000000
+0200
@@ -5,6 +5,7 @@
glibc-langpack-fr
glibc-langpack-cs
glibc-langpack-en
+ glibc-langpack-sv
glib2-devel
json-glib-devel
gtk-doc
@@ -14,6 +15,7 @@
gcc-c++
glibc-devel
libabigail
+ gnome-desktop-testing
SOUP2_DEPS:
libsoup-devel
SOUP3_DEPS:
@@ -25,10 +27,11 @@
.build:
image: fedora:latest
script:
- - meson _build -Dsoup2=${SOUP2_ENABLED}
+ - meson _build -Dsoup2=${SOUP2_ENABLED} -Dprefix=/usr
- ninja -C _build install
- ninja -C _build test
- ninja -C _build dist
+ - gnome-desktop-testing-runner geocode-glib
artifacts:
name: "geocode-glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
when: always
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geocode-glib-3.26.3/NEWS new/geocode-glib-3.26.4/NEWS
--- old/geocode-glib-3.26.3/NEWS 2022-06-30 15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/NEWS 2022-08-08 14:33:42.000000000 +0200
@@ -1,3 +1,9 @@
+3.26.4
+------
+
+This release includes a fix to a test data file not being installed, and a
+bug fix for a bug in the libsoup3 port.
+
3.26.3
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geocode-glib-3.26.3/geocode-glib/geocode-glib.c
new/geocode-glib-3.26.4/geocode-glib/geocode-glib.c
--- old/geocode-glib-3.26.3/geocode-glib/geocode-glib.c 2022-06-30
15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/geocode-glib/geocode-glib.c 2022-08-08
14:33:42.000000000 +0200
@@ -27,7 +27,9 @@
#include <locale.h>
#include <gio/gio.h>
#include <libsoup/soup.h>
+#ifndef G_OS_WIN32
#include <langinfo.h>
+#endif
#include <geocode-glib/geocode-glib-private.h>
/**
@@ -228,7 +230,11 @@
char *
_geocode_object_get_lang (void)
{
+#ifdef G_OS_WIN32
+ return geocode_object_get_lang_for_locale (setlocale (LC_ALL, NULL));
+#else
return geocode_object_get_lang_for_locale (setlocale (LC_MESSAGES,
NULL));
+#endif
}
#if defined(__GLIBC__) && !defined(__UCLIBC__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geocode-glib-3.26.3/geocode-glib/geocode-nominatim.c
new/geocode-glib-3.26.4/geocode-glib/geocode-nominatim.c
--- old/geocode-glib-3.26.3/geocode-glib/geocode-nominatim.c 2022-06-30
15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/geocode-glib/geocode-nominatim.c 2022-08-08
14:33:42.000000000 +0200
@@ -890,9 +890,8 @@
SoupSession *session = SOUP_SESSION (object);
SoupMessage *query = soup_session_get_async_result_message (session,
result);
GError *error = NULL;
- GBytes *body = soup_session_send_and_read_finish (session, result,
&error);
+ g_autoptr(GBytes) body = soup_session_send_and_read_finish (session,
result, &error);
GTask *task = user_data;
- char *contents;
if (!body) {
g_task_return_new_error (task,
@@ -903,14 +902,16 @@
g_clear_error (&error);
} else if (soup_message_get_status (query) != SOUP_STATUS_OK) {
const char *reason_phrase = soup_message_get_reason_phrase
(query);
- g_bytes_unref (body);
g_task_return_new_error (task,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"%s",
reason_phrase ? reason_phrase : "Query
failed");
} else {
- contents = g_bytes_unref_to_data (body, NULL);
+ gsize size = 0;
+ gconstpointer data = g_bytes_get_data (body, &size);
+ gchar *contents = g_utf8_make_valid (data, size);
+
_geocode_glib_cache_save (query, contents);
g_task_return_pointer (task, contents, g_free);
}
@@ -932,7 +933,7 @@
"%s",
query->reason_phrase ?
query->reason_phrase : "Query failed");
else {
- contents = g_strndup (query->response_body->data,
query->response_body->length);
+ contents = g_utf8_make_valid (query->response_body->data,
query->response_body->length);
_geocode_glib_cache_save (query, contents);
g_task_return_pointer (task, contents, g_free);
}
@@ -1059,7 +1060,7 @@
if (_geocode_glib_cache_load (soup_query, &contents) == FALSE) {
#if SOUP_CHECK_VERSION (2, 99, 2)
GError *serror = NULL;
- GBytes *body = soup_session_send_and_read (soup_session,
soup_query, NULL, &serror);
+ g_autoptr(GBytes) body = soup_session_send_and_read
(soup_session, soup_query, NULL, &serror);
if (!body) {
g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_FAILED,
serror->message);
@@ -1067,12 +1068,14 @@
contents = NULL;
} else if (soup_message_get_status (soup_query) !=
SOUP_STATUS_OK) {
const char *reason_phrase =
soup_message_get_reason_phrase (soup_query);
- g_bytes_unref (body);
g_set_error_literal (error, G_IO_ERROR,
G_IO_ERROR_FAILED,
reason_phrase ? reason_phrase :
"Query failed");
contents = NULL;
} else {
- contents = g_bytes_unref_to_data (body, NULL);
+ gsize size = 0;
+ gconstpointer data = g_bytes_get_data (body, &size);
+ contents = g_utf8_make_valid (data, size);
+
_geocode_glib_cache_save (soup_query, contents);
}
#else
@@ -1081,7 +1084,7 @@
soup_query->reason_phrase ?
soup_query->reason_phrase : "Query failed");
contents = NULL;
} else {
- contents = g_strndup (soup_query->response_body->data,
soup_query->response_body->length);
+ contents = g_utf8_make_valid
(soup_query->response_body->data, soup_query->response_body->length);
_geocode_glib_cache_save (soup_query, contents);
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/geocode-glib-3.26.3/geocode-glib/tests/geocode-glib.c
new/geocode-glib-3.26.4/geocode-glib/tests/geocode-glib.c
--- old/geocode-glib-3.26.3/geocode-glib/tests/geocode-glib.c 2022-06-30
15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/geocode-glib/tests/geocode-glib.c 2022-08-08
14:33:42.000000000 +0200
@@ -410,10 +410,14 @@
{
g_autoptr (GHashTable) params = NULL;
GeocodeForward *object;
+ g_autofree char *old_locale = NULL;
GError *error = NULL;
GList *res;
GeocodePlace *place;
+ old_locale = g_strdup (setlocale(LC_ALL, NULL));
+ g_assert_nonnull (setlocale (LC_ALL, "en_GB.UTF-8"));
+
/* The query parameters the mock server expects to receive. */
params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
add_attr_string (params, "q", "Jack Cole Building, St Andrews");
@@ -439,6 +443,8 @@
g_assert_cmpstr (geocode_place_get_street_address (place), ==, "North
Haugh ??");
g_object_unref (place);
g_list_free (res);
+
+ setlocale (LC_ALL, old_locale);
}
static void
@@ -497,7 +503,7 @@
got_texas = FALSE;
old_locale = g_strdup (setlocale(LC_MESSAGES, NULL));
- setlocale (LC_MESSAGES, "en_GB.UTF-8");
+ g_assert_nonnull (setlocale (LC_MESSAGES, "en_GB.UTF-8"));
/* The query parameters the mock server expects to receive. */
params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
@@ -692,7 +698,7 @@
old_locale = g_strdup (setlocale(LC_ADDRESS, NULL));
/* Set to a locale that has number after street */
- setlocale (LC_ADDRESS, "sv_SE.utf8");
+ g_assert_nonnull (setlocale (LC_ADDRESS, "sv_SE.utf8"));
/* The query parameters the mock server expects to receive. */
params = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL);
@@ -743,7 +749,7 @@
add_attr_string (params, "bounded", "0");
/* Check Moscow's name in Czech */
- setlocale (LC_MESSAGES, "cs_CZ.UTF-8");
+ g_assert_nonnull (setlocale (LC_MESSAGES, "cs_CZ.UTF-8"));
object = create_forward_for_string ("moscow", params,
"locale_name.json");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geocode-glib-3.26.3/geocode-glib/tests/meson.build
new/geocode-glib-3.26.4/geocode-glib/tests/meson.build
--- old/geocode-glib-3.26.3/geocode-glib/tests/meson.build 2022-06-30
15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/geocode-glib/tests/meson.build 2022-08-08
14:33:42.000000000 +0200
@@ -1,10 +1,11 @@
install_dir = get_option('prefix') / get_option('datadir') / 'installed-tests'
/ library_name
+install_bindir = get_option('prefix') / get_option('libexecdir') / library_name
e = executable('geo-uri',
'geo-uri.c',
dependencies: geocode_glib_dep,
install: get_option('enable-installed-tests'),
- install_dir: install_dir)
+ install_dir: install_bindir)
test('Geo URI', e)
tests = ['geo-uri']
@@ -14,7 +15,7 @@
'geocode-glib.c',
dependencies: geocode_glib_dep,
install: get_option('enable-installed-tests'),
- install_dir: install_dir)
+ install_dir: install_bindir)
env = ['G_TEST_SRCDIR=' + meson.current_source_dir()]
test('API test', e, env: env)
tests += ['geocode-glib']
@@ -23,7 +24,7 @@
'mock-backend.c',
dependencies: geocode_glib_dep,
install: get_option('enable-installed-tests'),
- install_dir: install_dir)
+ install_dir: install_bindir)
test('Test mock backend', e)
tests += ['mock-backend']
@@ -31,6 +32,7 @@
foreach test_name: tests
conf_data = configuration_data()
conf_data.set('PATH', install_dir)
+ conf_data.set('BINPATH', install_bindir)
conf_data.set('NAME', test_name)
test_file = configure_file(
configuration: conf_data,
@@ -52,6 +54,7 @@
'osm_type0.json',
'osm_type1.json',
'osm_type2.json',
+ 'pi.json',
'pub.json',
'rev.json',
'rev_fail.json',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/geocode-glib-3.26.3/geocode-glib/tests/test-template.test.in
new/geocode-glib-3.26.4/geocode-glib/tests/test-template.test.in
--- old/geocode-glib-3.26.3/geocode-glib/tests/test-template.test.in
2022-06-30 15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/geocode-glib/tests/test-template.test.in
2022-08-08 14:33:42.000000000 +0200
@@ -1,5 +1,5 @@
[Test]
Description=@NAME@
-Exec=@PATH@/@NAME@
+Exec=sh -c "G_TEST_SRCDIR=@PATH@ @BINPATH@/@NAME@"
Type=session
Output=TAP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geocode-glib-3.26.3/meson.build
new/geocode-glib-3.26.4/meson.build
--- old/geocode-glib-3.26.3/meson.build 2022-06-30 15:43:14.000000000 +0200
+++ new/geocode-glib-3.26.4/meson.build 2022-08-08 14:33:42.000000000 +0200
@@ -1,4 +1,4 @@
-project('geocode-glib', 'c', version: '3.26.3', meson_version : '>= 0.49.0')
+project('geocode-glib', 'c', version: '3.26.4', meson_version : '>= 0.49.0')
gclib_version = meson.project_version() # set in project() below
ver_arr = gclib_version.split('.')
