Hello community, here is the log from the commit of package libsoup for openSUSE:Factory checked in at 2019-05-03 22:11:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsoup (Old) and /work/SRC/openSUSE:Factory/.libsoup.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsoup" Fri May 3 22:11:13 2019 rev:114 rq:695692 version:2.66.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libsoup/libsoup.changes 2019-04-03 09:25:32.195745194 +0200 +++ /work/SRC/openSUSE:Factory/.libsoup.new.5148/libsoup.changes 2019-05-03 22:11:14.967374513 +0200 @@ -1,0 +2,11 @@ +Wed Apr 10 08:23:45 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 2.66.1: + + Fix dylib versioning in MacOS. + + Visual Studio build fixes. + + MinGW build fixes. + + Meson build system improvements. + + Fix random CI failures due to parallel apache tests. + + Code cleanups. + +------------------------------------------------------------------- Old: ---- libsoup-2.66.0.tar.xz New: ---- libsoup-2.66.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsoup.spec ++++++ --- /var/tmp/diff_new_pack.xOMlcf/_old 2019-05-03 22:11:15.415375371 +0200 +++ /var/tmp/diff_new_pack.xOMlcf/_new 2019-05-03 22:11:15.419375379 +0200 @@ -17,7 +17,7 @@ Name: libsoup -Version: 2.66.0 +Version: 2.66.1 Release: 0 Summary: HTTP client/server library for GNOME License: LGPL-2.1-or-later ++++++ libsoup-2.66.0.tar.xz -> libsoup-2.66.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.66.0/NEWS new/libsoup-2.66.1/NEWS --- old/libsoup-2.66.0/NEWS 2019-03-12 08:57:58.000000000 +0100 +++ new/libsoup-2.66.1/NEWS 2019-04-09 10:43:30.000000000 +0200 @@ -1,3 +1,17 @@ +Changes in libsoup from 2.66.0 to 2.66.1: + + * Fix dylib versioning in MacOS [Tom Schoonjans] + + * Visual Studio build fixes [Chun-wei Fan] + + * MinGW build fixes [Руслан Ижбулатов] + + * Meson build system improvements [Claudio Saavedra, Jakub Adam] + + * Fix random CI failures due to parallel apache tests [Claudio Saavedra] + + * Code cleanups [Claudio Saavedra] + Changes in libsoup from 2.65.92 to 2.66.0: * Fix lookup for libxml2 on Visual Studio builds [Chun-wei Fan] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.66.0/libsoup/meson.build new/libsoup-2.66.1/libsoup/meson.build --- old/libsoup-2.66.0/libsoup/meson.build 2019-03-12 08:57:58.000000000 +0100 +++ new/libsoup-2.66.1/libsoup/meson.build 2019-04-09 10:43:30.000000000 +0200 @@ -229,6 +229,7 @@ soup_enums, version : libversion, soversion : soversion, + darwin_versions: darwin_versions, c_args : libsoup_c_args + hidden_visibility_flag, include_directories : configinc, install : true, @@ -260,6 +261,7 @@ soup_gnome_sources + soup_gnome_headers, version : libversion, soversion : soversion, + darwin_versions: darwin_versions, c_args : libsoup_c_args + hidden_visibility_flag, include_directories : configinc, install : true, @@ -288,6 +290,7 @@ soup_enum_h, soup_version_h ], + dependencies : libsoup_dep, nsversion : apiversion, namespace : soup_ns, symbol_prefix : soup_ns.to_lower(), @@ -299,9 +302,8 @@ header: join_paths(meson.project_name(), 'soup.h'), ) - soup_gir_gen_dep = declare_dependency(link_with : libsoup, - include_directories : configinc, - dependencies : deps, + soup_gir_gen_dep = declare_dependency( + dependencies : libsoup_dep, sources : soup_gir_gen_sources) if enable_vapi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.66.0/libsoup/soup-auth-ntlm.c new/libsoup-2.66.1/libsoup/soup-auth-ntlm.c --- old/libsoup-2.66.0/libsoup/soup-auth-ntlm.c 2019-03-12 08:57:58.000000000 +0100 +++ new/libsoup-2.66.1/libsoup/soup-auth-ntlm.c 2019-04-09 10:43:30.000000000 +0200 @@ -812,7 +812,18 @@ hex_pos = hmac_hex; for (count = 0; count < HMAC_MD5_LENGTH; count++) { + /* The 'hh' sscanf format modifier is C99, so we enable it on + * non-Windows or if __USE_MINGW_ANSI_STDIO is enabled or` + * if we are building on Visual Studio 2015 or later + */ +#if !defined (G_OS_WIN32) || (__USE_MINGW_ANSI_STDIO == 1) || (_MSC_VER >= 1900) sscanf(hex_pos, "%2hhx", &hmac[count]); +#else + unsigned int tmp_hmac; + sscanf(hex_pos, "%2x", &tmp_hmac); + hmac[count] = (guint8)tmp_hmac; +#endif + hex_pos += 2; } g_free(hmac_hex); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.66.0/meson.build new/libsoup-2.66.1/meson.build --- old/libsoup-2.66.0/meson.build 2019-03-12 08:57:58.000000000 +0100 +++ new/libsoup-2.66.1/meson.build 2019-04-09 10:43:30.000000000 +0200 @@ -1,6 +1,6 @@ project('libsoup', 'c', - version: '2.66.0', - meson_version : '>=0.47', + version: '2.66.1', + meson_version : '>=0.48', license : 'LGPL2', default_options : 'c_std=c89') @@ -16,6 +16,11 @@ apiversion = '2.4' soversion = '1' libsoup_api_name = '@0@-@1@'.format(meson.project_name(), apiversion) +libversion_arr = libversion.split('.') +darwin_version_major = libversion_arr[0].to_int() +darwin_version_minor = libversion_arr[1].to_int() +darwin_version_micro = libversion_arr[2].to_int() +darwin_versions = [darwin_version_major + darwin_version_minor + 1, '@0@.@1@'.format(darwin_version_major + darwin_version_minor + 1, darwin_version_micro)] host_system = host_machine.system() @@ -52,6 +57,11 @@ common_flags += cc.get_supported_arguments(test_cflags) endif +if cc.get_id() != 'msvc' and host_system == 'windows' + # For "%2hhx" sscanf format and the like + add_project_arguments('-D__USE_MINGW_ANSI_STDIO=1', language : 'c') +endif + add_project_arguments(common_flags, language : 'c') glib_required_version = '>= 2.38' @@ -62,7 +72,8 @@ dependency('gio-2.0', version : glib_required_version, fallback: ['glib', 'libgio_dep'])] -sqlite_dep = dependency('sqlite3', required: false) +sqlite_dep = dependency('sqlite3', required: false, + fallback: ['sqlite', 'sqlite_dep']) # Fallback check for sqlite, not all platforms ship pkg-config file if not sqlite_dep.found() @@ -71,7 +82,8 @@ sqlite_dep = cc.find_library('sqlite3') endif -libxml_dep = dependency('libxml-2.0', required: false) +libxml_dep = dependency('libxml-2.0', required: false, + fallback: ['libxml2', 'xml2lib_dep']) # Fallback check for libxml2, not all platforms ship pkg-config file if not libxml_dep.found() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.66.0/tests/meson.build new/libsoup-2.66.1/tests/meson.build --- old/libsoup-2.66.0/tests/meson.build 2019-03-12 08:57:58.000000000 +0100 +++ new/libsoup-2.66.1/tests/meson.build 2019-04-09 10:43:30.000000000 +0200 @@ -2,10 +2,10 @@ if cc.get_id() == 'msvc' test_utils = static_library(test_utils_name, test_utils_name + '.c', - dependencies : [glib_dep, libsoup_dep]) + dependencies : libsoup_dep) else test_utils = library(test_utils_name, test_utils_name + '.c', - dependencies : [glib_dep, libsoup_dep]) + dependencies : libsoup_dep) endif test_resources = gnome.compile_resources('soup-tests', @@ -49,7 +49,7 @@ ['auth', false], ['connection', false], ['range', false], - ['proxy', true], + ['proxy', false], ['pull-api', false], ] @@ -96,9 +96,9 @@ env = environment() env.set('G_TEST_SRCDIR', meson.current_source_dir()) env.set('G_TEST_BUILDDIR', meson.current_build_dir()) -# See https://github.com/mesonbuild/meson/issues/4228 for the workaround below -env.prepend('LD_LIBRARY_PATH', meson.build_root() + '/libsoup') env.set('G_DEBUG', 'gc-friendly') +# See https://github.com/mesonbuild/meson/issues/1383 for the workaround below +env.prepend('LD_LIBRARY_PATH', meson.build_root() + '/libsoup') env.set('MALLOC_CHECK_', '2') # This is set by Meson if empty env.set('MALLOC_PERTURB_', '') @@ -108,11 +108,11 @@ test_target = executable(test_name, sources : [ test_name + '.c', test_resources ], link_with : test_utils, - dependencies : [glib_dep, libsoup_dep, platform_deps]) + dependencies : libsoup_dep) # Increase the timeout as on some architectures the tests could be slower # than the default 30 seconds. test(test_name, test_target, env : env, is_parallel : test[1], timeout : 60) endforeach executable('ntlm-test-helper', 'ntlm-test-helper.c', - dependencies : [glib_dep, libsoup_dep]) + dependencies : libsoup_dep)