Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libsoup2 for openSUSE:Factory
checked in at 2021-11-29 17:28:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsoup2 (Old)
and /work/SRC/openSUSE:Factory/.libsoup2.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsoup2"
Mon Nov 29 17:28:18 2021 rev:4 rq:934069 version:2.74.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/libsoup2/libsoup2.changes 2021-10-29
22:34:37.111690852 +0200
+++ /work/SRC/openSUSE:Factory/.libsoup2.new.31177/libsoup2.changes
2021-12-02 02:17:12.626291252 +0100
@@ -1,0 +2,6 @@
+Wed Nov 24 21:45:21 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to version 2.74.2:
+ + Error when libsoup3 is already loaded before libsoup2.
+
+-------------------------------------------------------------------
Old:
----
libsoup-2.74.1.tar.xz
New:
----
libsoup-2.74.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsoup2.spec ++++++
--- /var/tmp/diff_new_pack.xFGui8/_old 2021-12-02 02:17:13.062289731 +0100
+++ /var/tmp/diff_new_pack.xFGui8/_new 2021-12-02 02:17:13.062289731 +0100
@@ -18,7 +18,7 @@
Name: libsoup2
%define _name libsoup
-Version: 2.74.1
+Version: 2.74.2
Release: 0
Summary: HTTP client/server library for GNOME
License: LGPL-2.1-or-later
++++++ libsoup-2.74.1.tar.xz -> libsoup-2.74.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libsoup-2.74.1/NEWS new/libsoup-2.74.2/NEWS
--- old/libsoup-2.74.1/NEWS 2021-10-24 18:04:54.536545500 +0200
+++ new/libsoup-2.74.2/NEWS 2021-11-24 21:32:05.952091000 +0100
@@ -1,3 +1,7 @@
+Changes in libsoup from 2.74.1 to 2.74.2:
+
+ * Error when libsoup3 is already loaded before libsoup2 [Patrick Griffis]
+
Changes in libsoup from 2.74.0 to 2.74.1:
* Fix support for older versions of Vala [Rico Tzschichholz]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libsoup-2.74.1/libsoup/soup-init.c
new/libsoup-2.74.2/libsoup/soup-init.c
--- old/libsoup-2.74.1/libsoup/soup-init.c 2021-10-24 18:04:54.541545400
+0200
+++ new/libsoup-2.74.2/libsoup/soup-init.c 2021-11-24 21:32:05.957091000
+0100
@@ -10,6 +10,7 @@
#endif
#include <glib/gi18n-lib.h>
+#include <gmodule.h>
#include "gconstructor.h"
#ifdef G_OS_WIN32
@@ -19,6 +20,21 @@
HMODULE soup_dll;
#endif
+static gboolean
+soup3_is_loaded (void)
+{
+ GModule *module = g_module_open (NULL, 0);
+ gpointer func;
+ gboolean result = FALSE;
+
+ if (g_module_symbol (module, "soup_date_time_new_from_http_string", &func))
+ result = TRUE;
+
+ g_module_close (module);
+
+ return result;
+}
+
static void
soup_init (void)
{
@@ -34,6 +50,9 @@
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#endif
+
+ if (soup3_is_loaded ())
+ g_error ("libsoup3 symbols detected. Using libsoup2 and
libsoup3 in the same process is not supported.");
}
#if defined (G_OS_WIN32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libsoup-2.74.1/meson.build
new/libsoup-2.74.2/meson.build
--- old/libsoup-2.74.1/meson.build 2021-10-24 18:04:54.546545500 +0200
+++ new/libsoup-2.74.2/meson.build 2021-11-24 21:32:05.962091200 +0100
@@ -1,5 +1,5 @@
project('libsoup', 'c',
- version: '2.74.1',
+ version: '2.74.2',
meson_version : '>=0.50',
license : 'LGPL2',
default_options : 'c_std=c99')
@@ -20,7 +20,7 @@
#
# When bumping the first component version, set the second and third components
# to 0. When bumping the second version, set the third one to zero.
-libversion = '1.11.1'
+libversion = '1.11.2'
apiversion = '2.4'
soversion = libversion.split('.')[0]
libsoup_api_name = '@0@-@1@'.format(meson.project_name(), apiversion)
@@ -83,12 +83,14 @@
glib_required_version = '>= 2.58'
glib_dep = dependency('glib-2.0', version : glib_required_version,
fallback: ['glib', 'libglib_dep'])
+gmodule_dep = dependency('gmodule-2.0', version : glib_required_version,
+ fallback: ['glib', 'libgmodule_dep'])
gobject_dep = dependency('gobject-2.0', version : glib_required_version,
fallback: ['glib', 'libgobject_dep'])
gio_dep = dependency('gio-2.0', version : glib_required_version,
fallback: ['glib', 'libgio_dep'])
-glib_deps = [glib_dep, gobject_dep, gio_dep]
+glib_deps = [glib_dep, gmodule_dep, gobject_dep, gio_dep]
sqlite_dep = dependency('sqlite3', required: false)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libsoup-2.74.1/tests/brotli-decompressor-test.c
new/libsoup-2.74.2/tests/brotli-decompressor-test.c
--- old/libsoup-2.74.1/tests/brotli-decompressor-test.c 2021-10-24
18:04:54.549545500 +0200
+++ new/libsoup-2.74.2/tests/brotli-decompressor-test.c 2021-11-24
21:32:05.965091000 +0100
@@ -54,6 +54,9 @@
g_assert_cmpint (result, ==, G_CONVERTER_FINISHED);
+ /* NUL terminate data so we can cmpstr below. */
+ g_byte_array_append (out_bytes, (const guint8*)"\0", 1);
+
g_free (contents);
g_assert_true (g_file_get_contents (uncompressed_filename, &contents,
&length, NULL));
g_assert_cmpstr ((char*)out_bytes->data, ==, contents);
