Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2021-11-06 18:15:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Sat Nov 6 18:15:11 2021 rev:245 rq:929575 version:2.70.1 Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2021-09-29 20:17:43.578810771 +0200 +++ /work/SRC/openSUSE:Factory/.glib2.new.1890/glib2.changes 2021-11-06 18:17:11.740858616 +0100 @@ -1,0 +2,14 @@ +Thu Oct 28 14:20:39 UTC 2021 - Bj??rn Lie <[email protected]> + +- Update to version 2.70.1: + + Fix network changes not being signalled from NetworkManager. + + Fix build when building with --fatal-meson-warnings. + + Bugs fixed: glgo#GNOME/GLib#2505, glgo#GNOME/GLib!2245, + glgo#GNOME/GLib!2253, glgo#GNOME/GLib!2256, + glgo#GNOME/GLib!2259, glgo#GNOME/GLib!2262, + glgo#GNOME/GLib!2271, glgo#GNOME/GLib!2276, + glgo#GNOME/GLib!2300, glgo#GNOME/GLib!2301, + glgo#GNOME/GLib!2302, glgo#GNOME/GLib!2304. +- Refresh patches with quilt. + +------------------------------------------------------------------- Old: ---- glib-2.70.0.tar.xz New: ---- glib-2.70.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.GVqm2a/_old 2021-11-06 18:17:14.388859986 +0100 +++ /var/tmp/diff_new_pack.GVqm2a/_new 2021-11-06 18:17:14.388859986 +0100 @@ -19,7 +19,7 @@ %bcond_without systemtap %bcond_without gtk_doc Name: glib2 -Version: 2.70.0 +Version: 2.70.1 Release: 0 Summary: General-Purpose Utility Library License: LGPL-2.1-or-later ++++++ glib-2.70.0.tar.xz -> glib-2.70.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/NEWS new/glib-2.70.1/NEWS --- old/glib-2.70.0/NEWS 2021-09-17 12:17:56.627959500 +0200 +++ new/glib-2.70.1/NEWS 2021-10-28 14:34:36.113245200 +0200 @@ -1,3 +1,26 @@ +Overview of changes in GLib 2.70.1 +================================== + +* Fix network changes not being signalled from NetworkManager (work by + Julian Andres Klode) (#2505) + +* Fix build when building with --fatal-meson-warnings (work by Eli Schwartz) (!2304) + +* Bugs fixed: + - #2505 g_network_monitor_nm never updates on connection change (listens for signal on wrong dbus interface) + - !2245 gdesktopappinfo: Do not call xterm when it does not exist, inform the caller the launch failed + - !2253 Backport !2251 ???GString: Bump minimum size??? to glib-2-70 + - !2256 Backport !2254 ???Small optimization for g_object_set??? to glib-2-70 + - !2259 Backport !2257 ???Fix documentation for g_dbus_object_manager_get_object().??? to glib-2-70 + - !2262 Backport !2244 ???gutils: Avoid segfault in g_get_user_database_entry??? to glib-2-70 + - !2271 Backport !2266 ???fix uninitial variable??? to glib-2-70 + - !2276 Backport !2274 ???Do not try to access errno after calling getpwnam_r.??? to glib-2-70 + - !2300 Backport !2285 ???fix issues found by svace static code analyzer??? to glib-2-70 + - !2301 Backport !2293 ???glib-private: Fix MSVC build with AddressSanitizer??? to glib-2-70 + - !2302 Backport !2291 ???gnetworkmonitornm: Stop using removed PropertiesChanged signal??? to glib-2-70 + - !2304 meson: fix warnings for extract_all_objects function + + Overview of changes in GLib 2.70.0 ================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gdbusauthmechanismsha1.c new/glib-2.70.1/gio/gdbusauthmechanismsha1.c --- old/glib-2.70.0/gio/gdbusauthmechanismsha1.c 2021-09-17 12:17:56.658959900 +0200 +++ new/glib-2.70.1/gio/gdbusauthmechanismsha1.c 2021-10-28 14:34:36.144245600 +0200 @@ -881,8 +881,8 @@ error)) { *out_id = 0; - *out_cookie = 0; g_free (*out_cookie); + *out_cookie = 0; ret = FALSE; goto out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gdbusobjectmanager.c new/glib-2.70.1/gio/gdbusobjectmanager.c --- old/glib-2.70.0/gio/gdbusobjectmanager.c 2021-09-17 12:17:56.664960100 +0200 +++ new/glib-2.70.1/gio/gdbusobjectmanager.c 2021-10-28 14:34:36.151245800 +0200 @@ -211,7 +211,7 @@ * @manager: A #GDBusObjectManager. * @object_path: Object path to look up. * - * Gets the #GDBusObjectProxy at @object_path, if any. + * Gets the #GDBusObject at @object_path, if any. * * Returns: (transfer full) (nullable): A #GDBusObject or %NULL. Free with * g_object_unref(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gdesktopappinfo.c new/glib-2.70.1/gio/gdesktopappinfo.c --- old/glib-2.70.0/gio/gdesktopappinfo.c 2021-09-17 12:17:56.670960200 +0200 +++ new/glib-2.70.1/gio/gdesktopappinfo.c 2021-10-28 14:34:36.157245900 +0200 @@ -2613,9 +2613,12 @@ if (check == NULL) check = g_find_program_in_path ("dtterm"); if (check == NULL) + check = g_find_program_in_path ("xterm"); + if (check == NULL) { - check = g_strdup ("xterm"); - g_debug ("Couldn???t find a terminal: falling back to xterm"); + g_debug ("Couldn???t find a known terminal"); + g_free (term_argv); + return FALSE; } term_argv[0] = check; term_argv[1] = g_strdup ("-e"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/glocalfile.c new/glib-2.70.1/gio/glocalfile.c --- old/glib-2.70.0/gio/glocalfile.c 2021-09-17 12:17:56.687960400 +0200 +++ new/glib-2.70.1/gio/glocalfile.c 2021-10-28 14:34:36.177246000 +0200 @@ -2011,7 +2011,16 @@ * trying to rename across a filesystem boundary, which doesn't work. So * we use g_stat here instead of g_lstat, to know where the symlink * points to. */ - g_stat (path, &file_stat); + if (g_stat (path, &file_stat)) + { + errsv = errno; + g_free (path); + + g_set_io_error (error, + _("Error trashing file %s: %s"), + file, errsv); + return FALSE; + } g_free (path); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/glocalfileinfo.c new/glib-2.70.1/gio/glocalfileinfo.c --- old/glib-2.70.0/gio/glocalfileinfo.c 2021-09-17 12:17:56.687960400 +0200 +++ new/glib-2.70.1/gio/glocalfileinfo.c 2021-10-28 14:34:36.177246000 +0200 @@ -2650,7 +2650,7 @@ { if (lazy_stat (filename, &statbuf, &got_stat) == 0) { - times[0].tv_sec = statbuf.st_mtime; + times[0].tv_sec = statbuf.st_atime; #if defined (HAVE_STRUCT_STAT_ST_ATIMENSEC) times[0].tv_usec = statbuf.st_atimensec / 1000; #elif defined (HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gmarshal-internal.c new/glib-2.70.1/gio/gmarshal-internal.c --- old/glib-2.70.0/gio/gmarshal-internal.c 2021-09-17 12:17:56.689960500 +0200 +++ new/glib-2.70.1/gio/gmarshal-internal.c 2021-10-28 14:34:36.179246200 +0200 @@ -490,14 +490,14 @@ gpointer arg0; va_list args_copy; + g_return_if_fail (return_value != NULL); + G_VA_COPY (args_copy, args); arg0 = (gpointer) va_arg (args_copy, gpointer); if ((param_types[0] & G_SIGNAL_TYPE_STATIC_SCOPE) == 0 && arg0 != NULL) arg0 = g_strdup (arg0); va_end (args_copy); - g_return_if_fail (return_value != NULL); - if (G_CCLOSURE_SWAP_DATA (closure)) { data1 = closure->data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gnetworkmonitornm.c new/glib-2.70.1/gio/gnetworkmonitornm.c --- old/glib-2.70.0/gio/gnetworkmonitornm.c 2021-09-17 12:17:56.693960400 +0200 +++ new/glib-2.70.1/gio/gnetworkmonitornm.c 2021-10-28 14:34:36.184246300 +0200 @@ -253,48 +253,11 @@ } static void -update_cached_property (GDBusProxy *proxy, - const char *property_name, - GVariantDict *dict) +proxy_properties_changed_cb (GDBusProxy *proxy, + GVariant *changed_properties, + GStrv invalidated_properties, + GNetworkMonitorNM *nm) { - GVariant *v; - - v = g_variant_dict_lookup_value (dict, property_name, NULL); - if (!v) - return; - g_dbus_proxy_set_cached_property (proxy, property_name, v); - g_variant_unref (v); -} - -static void -proxy_signal_cb (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, - GVariant *parameters, - GNetworkMonitorNM *nm) -{ - GVariant *asv; - GVariantDict *dict; - - if (g_strcmp0 (signal_name, "PropertiesChanged") != 0) - return; - - g_variant_get (parameters, "(@a{sv})", &asv); - if (!asv) - return; - - dict = g_variant_dict_new (asv); - g_variant_unref (asv); - if (!dict) - { - g_warning ("Failed to handle PropertiesChanged signal from NetworkManager"); - return; - } - - update_cached_property (nm->priv->proxy, "Connectivity", dict); - - g_variant_dict_unref (dict); - sync_properties (nm, TRUE); } @@ -361,8 +324,8 @@ return FALSE; } - nm->priv->signal_id = g_signal_connect (G_OBJECT (proxy), "g-signal", - G_CALLBACK (proxy_signal_cb), nm); + nm->priv->signal_id = g_signal_connect (G_OBJECT (proxy), "g-properties-changed", + G_CALLBACK (proxy_properties_changed_cb), nm); nm->priv->proxy = proxy; sync_properties (nm, FALSE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gopenuriportal.c new/glib-2.70.1/gio/gopenuriportal.c --- old/glib-2.70.0/gio/gopenuriportal.c 2021-09-17 12:17:56.694960400 +0200 +++ new/glib-2.70.1/gio/gopenuriportal.c 2021-10-28 14:34:36.185246200 +0200 @@ -108,6 +108,8 @@ errsv = errno; if (fd == -1) { + g_free (path); + g_variant_builder_clear (&opt_builder); g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv), "Failed to open '%s'", path); return FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gproxyaddressenumerator.c new/glib-2.70.1/gio/gproxyaddressenumerator.c --- old/glib-2.70.0/gio/gproxyaddressenumerator.c 2021-09-17 12:17:56.697960600 +0200 +++ new/glib-2.70.1/gio/gproxyaddressenumerator.c 2021-10-28 14:34:36.189246400 +0200 @@ -262,8 +262,12 @@ } dest_protocol = g_uri_parse_scheme (priv->dest_uri); - g_return_val_if_fail (G_IS_INET_SOCKET_ADDRESS (priv->proxy_address), - NULL); + if (!G_IS_INET_SOCKET_ADDRESS (priv->proxy_address)) + { + g_free (dest_hostname); + g_free (dest_protocol); + } + g_return_val_if_fail (G_IS_INET_SOCKET_ADDRESS (priv->proxy_address), NULL); inetsaddr = G_INET_SOCKET_ADDRESS (priv->proxy_address); inetaddr = g_inet_socket_address_get_address (inetsaddr); @@ -352,6 +356,11 @@ } dest_protocol = g_uri_parse_scheme (priv->dest_uri); + if (!G_IS_INET_SOCKET_ADDRESS (priv->proxy_address)) + { + g_free (dest_hostname); + g_free (dest_protocol); + } g_return_if_fail (G_IS_INET_SOCKET_ADDRESS (priv->proxy_address)); inetsaddr = G_INET_SOCKET_ADDRESS (priv->proxy_address); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gsettings-mapping.c new/glib-2.70.1/gio/gsettings-mapping.c --- old/glib-2.70.0/gio/gsettings-mapping.c 2021-09-17 12:17:56.699960500 +0200 +++ new/glib-2.70.1/gio/gsettings-mapping.c 2021-10-28 14:34:36.191246300 +0200 @@ -200,6 +200,8 @@ l = g_variant_get_int32 (variant); else if (g_variant_type_equal (type, G_VARIANT_TYPE_INT64)) l = g_variant_get_int64 (variant); + else if (g_variant_type_equal (type, G_VARIANT_TYPE_HANDLE)) + l = g_variant_get_handle (variant); else return FALSE; @@ -291,8 +293,6 @@ u = g_variant_get_uint32 (variant); else if (g_variant_type_equal (type, G_VARIANT_TYPE_UINT64)) u = g_variant_get_uint64 (variant); - else if (g_variant_type_equal (type, G_VARIANT_TYPE_HANDLE)) - u = g_variant_get_handle (variant); else return FALSE; @@ -459,7 +459,8 @@ else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_INT16) || g_variant_is_of_type (variant, G_VARIANT_TYPE_INT32) || - g_variant_is_of_type (variant, G_VARIANT_TYPE_INT64)) + g_variant_is_of_type (variant, G_VARIANT_TYPE_INT64) || + g_variant_is_of_type (variant, G_VARIANT_TYPE_HANDLE)) return g_settings_get_mapping_int (value, variant); else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_DOUBLE)) @@ -467,8 +468,7 @@ else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT16) || g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT32) || - g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT64) || - g_variant_is_of_type (variant, G_VARIANT_TYPE_HANDLE)) + g_variant_is_of_type (variant, G_VARIANT_TYPE_UINT64)) return g_settings_get_mapping_unsigned_int (value, variant); else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING) || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gsocket.c new/glib-2.70.1/gio/gsocket.c --- old/glib-2.70.0/gio/gsocket.c 2021-09-17 12:17:56.704960600 +0200 +++ new/glib-2.70.1/gio/gsocket.c 2021-10-28 14:34:36.196246400 +0200 @@ -621,7 +621,7 @@ (flags & FD_CLOEXEC) == 0) { flags |= FD_CLOEXEC; - fcntl (fd, F_SETFD, flags); + (void) fcntl (fd, F_SETFD, flags); } } #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/gsocks5proxy.c new/glib-2.70.1/gio/gsocks5proxy.c --- old/glib-2.70.0/gio/gsocks5proxy.c 2021-09-17 12:17:56.707960600 +0200 +++ new/glib-2.70.1/gio/gsocks5proxy.c 2021-10-28 14:34:36.199246400 +0200 @@ -328,7 +328,7 @@ * * The parser only requires 4 bytes. */ -#define SOCKS5_CONN_REP_LEN 255 +#define SOCKS5_CONN_REP_LEN 257 static gboolean parse_connect_reply (const guint8 *data, gint *atype, GError **error) { @@ -509,7 +509,7 @@ guint8 data[SOCKS5_CONN_REP_LEN]; gint atype; - if (!g_input_stream_read_all (in, data, 4, NULL, + if (!g_input_stream_read_all (in, data, 4 /* VER, REP, RSV, ATYP */, NULL, cancellable, error)) goto error; @@ -519,23 +519,26 @@ switch (atype) { case SOCKS5_ATYP_IPV4: - if (!g_input_stream_read_all (in, data, 6, NULL, - cancellable, error)) + if (!g_input_stream_read_all (in, data, + 4 /* IPv4 length */ + 2 /* port */, + NULL, cancellable, error)) goto error; break; case SOCKS5_ATYP_IPV6: - if (!g_input_stream_read_all (in, data, 18, NULL, - cancellable, error)) + if (!g_input_stream_read_all (in, data, + 16 /* IPv6 length */ + 2 /* port */, + NULL, cancellable, error)) goto error; break; case SOCKS5_ATYP_DOMAINNAME: - if (!g_input_stream_read_all (in, data, 1, NULL, - cancellable, error)) + if (!g_input_stream_read_all (in, data, 1 /* domain name length */, + NULL, cancellable, error)) goto error; - if (!g_input_stream_read_all (in, data, data[0] + 2, NULL, - cancellable, error)) + if (!g_input_stream_read_all (in, data, + data[0] /* domain name length */ + 2 /* port */, + NULL, cancellable, error)) goto error; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/meson.build new/glib-2.70.1/gio/meson.build --- old/glib-2.70.0/gio/meson.build 2021-09-17 12:17:56.720960900 +0200 +++ new/glib-2.70.1/gio/meson.build 2021-10-28 14:34:36.216246600 +0200 @@ -419,7 +419,7 @@ subdir('xdgmime') internal_deps += [xdgmime_lib] - internal_objects += [xdgmime_lib.extract_all_objects()] + internal_objects += [xdgmime_lib.extract_all_objects(recursive: false)] install_headers(gio_unix_include_headers, subdir : 'gio-unix-2.0/gio') @@ -758,20 +758,20 @@ if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 subdir('inotify') internal_deps += [ inotify_lib ] - internal_objects += [inotify_lib.extract_all_objects()] + internal_objects += [inotify_lib.extract_all_objects(recursive: false)] endif # kevent if have_func_kqueue and have_func_kevent subdir('kqueue') internal_deps += [ kqueue_lib ] - internal_objects += [kqueue_lib.extract_all_objects()] + internal_objects += [kqueue_lib.extract_all_objects(recursive: false)] endif if host_system == 'windows' subdir('win32') internal_deps += [ giowin32_lib ] - internal_objects += [giowin32_lib.extract_all_objects()] + internal_objects += [giowin32_lib.extract_all_objects(recursive: false)] endif if have_bash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gio/xdgmime/xdgmimemagic.c new/glib-2.70.1/gio/xdgmime/xdgmimemagic.c --- old/glib-2.70.0/gio/xdgmime/xdgmimemagic.c 2021-09-17 12:17:56.750961300 +0200 +++ new/glib-2.70.1/gio/xdgmime/xdgmimemagic.c 2021-10-28 14:34:36.250247200 +0200 @@ -99,6 +99,8 @@ XdgMimeMagicMatchlet *matchlet; matchlet = malloc (sizeof (XdgMimeMagicMatchlet)); + if (matchlet == NULL) + return NULL; matchlet->indent = 0; matchlet->offset = 0; @@ -351,6 +353,11 @@ return XDG_MIME_MAGIC_ERROR; matchlet = _xdg_mime_magic_matchlet_new (); + + /* OOM */ + if (matchlet == NULL) + return XDG_MIME_MAGIC_ERROR; + matchlet->indent = indent; matchlet->offset = _xdg_mime_magic_read_a_number (magic_file, &end_of_file); if (end_of_file) @@ -765,6 +772,11 @@ { case XDG_MIME_MAGIC_SECTION: match = _xdg_mime_magic_match_new (); + + /* OOM */ + if (match == NULL) + return; + state = _xdg_mime_magic_parse_header (magic_file, match); if (state == XDG_MIME_MAGIC_EOF || state == XDG_MIME_MAGIC_ERROR) _xdg_mime_magic_match_free (match); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gbacktrace.c new/glib-2.70.1/glib/gbacktrace.c --- old/glib-2.70.0/glib/gbacktrace.c 2021-09-17 12:17:56.754961300 +0200 +++ new/glib-2.70.1/glib/gbacktrace.c 2021-10-28 14:34:36.256247300 +0200 @@ -340,7 +340,11 @@ /* Save stderr for printing failure below */ int old_err = dup (2); if (old_err != -1) - fcntl (old_err, F_SETFD, fcntl (old_err, F_GETFD) | FD_CLOEXEC); + { + int getfd = fcntl (old_err, F_GETFD); + if (getfd != -1) + (void) fcntl (old_err, F_SETFD, getfd | FD_CLOEXEC); + } close (0); dup (in_fd[0]); /* set the stdin to the in pipe */ close (1); dup (out_fd[1]); /* set the stdout to the out pipe */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gkeyfile.c new/glib-2.70.1/glib/gkeyfile.c --- old/glib-2.70.0/glib/gkeyfile.c 2021-09-17 12:17:56.766961600 +0200 +++ new/glib-2.70.1/glib/gkeyfile.c 2021-10-28 14:34:36.270247500 +0200 @@ -2259,9 +2259,6 @@ if (translated_value) break; - - g_free (translated_value); - translated_value = NULL; } /* Fallback to untranslated key diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/glib-private.h new/glib-2.70.1/glib/glib-private.h --- old/glib-2.70.0/glib/glib-private.h 2021-09-17 12:17:56.768961400 +0200 +++ new/glib-2.70.1/glib/glib-private.h 2021-10-28 14:34:36.273247500 +0200 @@ -23,8 +23,14 @@ #include "gstdioprivate.h" /* gcc defines __SANITIZE_ADDRESS__, clang sets the address_sanitizer - * feature flag */ -#if defined(__SANITIZE_ADDRESS__) || g_macro__has_feature(address_sanitizer) + * feature flag. + * + * MSVC defines __SANITIZE_ADDRESS__ as well when AddressSanitizer + * is enabled but __lsan_ignore_object() equivalent method is not supported + * See also + * https://docs.microsoft.com/en-us/cpp/sanitizers/asan-building?view=msvc-160 + */ +#if !defined(_MSC_VER) && (defined(__SANITIZE_ADDRESS__) || g_macro__has_feature(address_sanitizer)) /* * %_GLIB_ADDRESS_SANITIZER: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/glib-unix.c new/glib-2.70.1/glib/glib-unix.c --- old/glib-2.70.0/glib/glib-unix.c 2021-09-17 12:17:56.768961400 +0200 +++ new/glib-2.70.1/glib/glib-unix.c 2021-10-28 14:34:36.273247500 +0200 @@ -463,7 +463,6 @@ } *buffer = NULL; gsize string_buffer_size = 0; GError *local_error = NULL; - int errsv = 0; g_return_val_if_fail (user_name != NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); @@ -493,10 +492,8 @@ */ buffer = g_malloc0 (sizeof (*buffer) + string_buffer_size + 6); - errno = 0; retval = getpwnam_r (user_name, &buffer->pwd, buffer->string_buffer, string_buffer_size, &passwd_file_entry); - errsv = errno; /* Bail out if: the lookup was successful, or if the user id can't be * found (should be pretty rare case actually), or if the buffer should be @@ -508,19 +505,19 @@ break; } else if (retval == 0 || - errsv == ENOENT || errsv == ESRCH || - errsv == EBADF || errsv == EPERM) + retval == ENOENT || retval == ESRCH || + retval == EBADF || retval == EPERM) { /* Username not found. */ - g_unix_set_error_from_errno (&local_error, errsv); + g_unix_set_error_from_errno (&local_error, retval); break; } - else if (errsv == ERANGE) + else if (retval == ERANGE) { /* Can???t allocate enough string buffer space. */ if (string_buffer_size > 32 * 1024) { - g_unix_set_error_from_errno (&local_error, errsv); + g_unix_set_error_from_errno (&local_error, retval); break; } @@ -529,7 +526,7 @@ } else { - g_unix_set_error_from_errno (&local_error, errsv); + g_unix_set_error_from_errno (&local_error, retval); break; } } @@ -543,7 +540,6 @@ { g_clear_pointer (&buffer, g_free); g_propagate_error (error, g_steal_pointer (&local_error)); - errno = errsv; } return (struct passwd *) g_steal_pointer (&buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gmessages.c new/glib-2.70.1/glib/gmessages.c --- old/glib-2.70.0/glib/gmessages.c 2021-09-17 12:17:56.772961600 +0200 +++ new/glib-2.70.1/glib/gmessages.c 2021-10-28 14:34:36.278247600 +0200 @@ -2321,7 +2321,10 @@ now = g_get_real_time (); now_secs = (time_t) (now / 1000000); now_tm = localtime (&now_secs); - strftime (time_buf, sizeof (time_buf), "%H:%M:%S", now_tm); + if (G_LIKELY (now_tm != NULL)) + strftime (time_buf, sizeof (time_buf), "%H:%M:%S", now_tm); + else + strcpy (time_buf, "(error)"); g_string_append_printf (gstring, "%s%s.%03d%s: ", use_color ? "\033[34m" : "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gslice.c new/glib-2.70.1/glib/gslice.c --- old/glib-2.70.0/glib/gslice.c 2021-09-17 12:17:56.783961800 +0200 +++ new/glib-2.70.1/glib/gslice.c 2021-10-28 14:34:36.290247700 +0200 @@ -1307,7 +1307,7 @@ allocator_aligned_page_size (Allocator *allocator, gsize n_bytes) { - gsize val = 1 << g_bit_storage (n_bytes - 1); + gsize val = (gsize) 1 << g_bit_storage (n_bytes - 1); val = MAX (val, allocator->min_page_size); return val; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gstdio.c new/glib-2.70.1/glib/gstdio.c --- old/glib-2.70.0/glib/gstdio.c 2021-09-17 12:17:56.784961700 +0200 +++ new/glib-2.70.1/glib/gstdio.c 2021-10-28 14:34:36.292247800 +0200 @@ -372,7 +372,7 @@ { DWORD error_code; DWORD returned_bytes = 0; - BYTE *data; + BYTE *data = NULL; gsize to_copy; /* This is 16k. It's impossible to make DeviceIoControl() tell us * the required size. NtFsControlFile() does have such a feature, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gstring.c new/glib-2.70.1/glib/gstring.c --- old/glib-2.70.0/glib/gstring.c 2021-09-17 12:17:56.786961800 +0200 +++ new/glib-2.70.1/glib/gstring.c 2021-10-28 14:34:36.293248000 +0200 @@ -123,7 +123,7 @@ string->len = 0; string->str = NULL; - g_string_maybe_expand (string, MAX (dfl_size, 2)); + g_string_maybe_expand (string, MAX (dfl_size, 64)); string->str[0] = 0; return string; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gutils.c new/glib-2.70.1/glib/gutils.c --- old/glib-2.70.0/glib/gutils.c 2021-09-17 12:17:56.803962000 +0200 +++ new/glib-2.70.1/glib/gutils.c 2021-10-28 14:34:36.310248100 +0200 @@ -692,14 +692,17 @@ { gchar **gecos_fields; gchar **name_parts; + gchar *uppercase_pw_name; /* split the gecos field and substitute '&' */ gecos_fields = g_strsplit (pw->pw_gecos, ",", 0); name_parts = g_strsplit (gecos_fields[0], "&", 0); - pw->pw_name[0] = g_ascii_toupper (pw->pw_name[0]); - e.real_name = g_strjoinv (pw->pw_name, name_parts); + uppercase_pw_name = g_strdup (pw->pw_name); + uppercase_pw_name[0] = g_ascii_toupper (uppercase_pw_name[0]); + e.real_name = g_strjoinv (uppercase_pw_name, name_parts); g_strfreev (gecos_fields); g_strfreev (name_parts); + g_free (uppercase_pw_name); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/gvariant.c new/glib-2.70.1/glib/gvariant.c --- old/glib-2.70.0/glib/gvariant.c 2021-09-17 12:17:56.806962000 +0200 +++ new/glib-2.70.1/glib/gvariant.c 2021-10-28 14:34:36.313248200 +0200 @@ -800,7 +800,13 @@ for (i = 0; i < n_children; i++) { - TYPE_CHECK (children[i], child_type, NULL); + if G_UNLIKELY (!g_variant_is_of_type (children[i], child_type)) + { + while (i != 0) + g_variant_unref (my_children[--i]); + g_free (my_children); + g_return_val_if_fail (g_variant_is_of_type (children[i], child_type), NULL); + } my_children[i] = g_variant_ref_sink (children[i]); trusted &= g_variant_is_trusted (children[i]); } @@ -3190,8 +3196,7 @@ #define GVSB_MAGIC ((gsize) 1033660112u) #define GVSB_MAGIC_PARTIAL ((gsize) 2942751021u) #define GVHB_MAGIC ((gsize) 3087242682u) -#define is_valid_builder(b) (b != NULL && \ - GVSB(b)->magic == GVSB_MAGIC) +#define is_valid_builder(b) (GVSB(b)->magic == GVSB_MAGIC) #define is_valid_heap_builder(b) (GVHB(b)->magic == GVHB_MAGIC) /* Just to make sure that by adding a union to GVariantBuilder, we @@ -3201,7 +3206,9 @@ static gboolean ensure_valid_builder (GVariantBuilder *builder) { - if (is_valid_builder (builder)) + if (builder == NULL) + return FALSE; + else if (is_valid_builder (builder)) return TRUE; if (builder->u.s.partial_magic == GVSB_MAGIC_PARTIAL) { @@ -3847,8 +3854,7 @@ #define GVSD_MAGIC ((gsize) 2579507750u) #define GVSD_MAGIC_PARTIAL ((gsize) 3488698669u) #define GVHD_MAGIC ((gsize) 2450270775u) -#define is_valid_dict(d) (d != NULL && \ - GVSD(d)->magic == GVSD_MAGIC) +#define is_valid_dict(d) (GVSD(d)->magic == GVSD_MAGIC) #define is_valid_heap_dict(d) (GVHD(d)->magic == GVHD_MAGIC) /* Just to make sure that by adding a union to GVariantDict, we didn't @@ -3858,7 +3864,9 @@ static gboolean ensure_valid_dict (GVariantDict *dict) { - if (is_valid_dict (dict)) + if (dict == NULL) + return FALSE; + else if (is_valid_dict (dict)) return TRUE; if (dict->u.s.partial_magic == GVSD_MAGIC_PARTIAL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/glib/meson.build new/glib-2.70.1/glib/meson.build --- old/glib-2.70.0/glib/meson.build 2021-09-17 12:17:56.809962000 +0200 +++ new/glib-2.70.1/glib/meson.build 2021-10-28 14:34:36.317248000 +0200 @@ -117,7 +117,7 @@ endif subdir('gnulib') - gnulib_objects = [gnulib_lib.extract_all_objects()] + gnulib_objects = [gnulib_lib.extract_all_objects(recursive: false)] endif glib_headers = files( @@ -359,7 +359,7 @@ libglib = library('glib-2.0', glib_dtrace_obj, glib_dtrace_hdr, sources : [deprecated_sources, glib_sources], - objects : [charset_lib.extract_all_objects()] + gnulib_objects, + objects : [charset_lib.extract_all_objects(recursive: false)] + gnulib_objects, version : library_version, soversion : soversion, darwin_versions : darwin_versions, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gobject/gobject.c new/glib-2.70.1/gobject/gobject.c --- old/glib-2.70.0/gobject/gobject.c 2021-09-17 12:17:56.837962600 +0200 +++ new/glib-2.70.1/gobject/gobject.c 2021-10-28 14:34:36.350248600 +0200 @@ -1570,15 +1570,9 @@ { class->set_property (object, param_id, &tmp_value, pspec); - if (~pspec->flags & G_PARAM_EXPLICIT_NOTIFY) - { - GParamSpec *notify_pspec; - - notify_pspec = get_notify_pspec (pspec); - - if (notify_pspec != NULL) - g_object_notify_queue_add (object, nqueue, notify_pspec); - } + if (~pspec->flags & G_PARAM_EXPLICIT_NOTIFY && + pspec->flags & G_PARAM_READABLE) + g_object_notify_queue_add (object, nqueue, pspec); } g_value_unset (&tmp_value); } @@ -2529,17 +2523,14 @@ g_object_ref (object); + memset (values, 0, n_properties * sizeof (GValue)); + obj_type = G_OBJECT_TYPE (object); for (i = 0; i < n_properties; i++) { - pspec = g_param_spec_pool_lookup (pspec_pool, - names[i], - obj_type, - TRUE); + pspec = g_param_spec_pool_lookup (pspec_pool, names[i], obj_type, TRUE); if (!g_object_get_is_valid_property (object, pspec, names[i])) break; - - memset (&values[i], 0, sizeof (GValue)); g_value_init (&values[i], pspec->value_type); object_get_property (object, pspec, &values[i]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/gobject/gtype.c new/glib-2.70.1/gobject/gtype.c --- old/glib-2.70.0/gobject/gtype.c 2021-09-17 12:17:56.841962600 +0200 +++ new/glib-2.70.1/gobject/gtype.c 2021-10-28 14:34:36.355248700 +0200 @@ -3159,11 +3159,14 @@ g_return_val_if_fail (g_class != NULL, NULL); node = lookup_type_node_I (G_TYPE_FROM_CLASS (g_class)); + + g_return_val_if_fail (node != NULL, NULL); + /* We used to acquire a read lock here. That is not necessary, since * parent->data->class.class is constant as long as the derived class * exists. */ - if (node && node->is_classed && node->data && NODE_PARENT_TYPE (node)) + if (node->is_classed && node->data && NODE_PARENT_TYPE (node)) { node = lookup_type_node_I (NODE_PARENT_TYPE (node)); class = node->data->class.class; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/meson.build new/glib-2.70.1/meson.build --- old/glib-2.70.0/meson.build 2021-09-17 12:17:56.849962700 +0200 +++ new/glib-2.70.1/meson.build 2021-10-28 14:34:36.365249000 +0200 @@ -1,5 +1,5 @@ project('glib', 'c', 'cpp', - version : '2.70.0', + version : '2.70.1', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', default_options : [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.70.0/subprojects/proxy-libintl.wrap new/glib-2.70.1/subprojects/proxy-libintl.wrap --- old/glib-2.70.0/subprojects/proxy-libintl.wrap 2021-09-17 12:17:56.950964200 +0200 +++ new/glib-2.70.1/subprojects/proxy-libintl.wrap 2021-10-28 14:34:36.492250700 +0200 @@ -1,5 +1,5 @@ [wrap-git] directory=proxy-libintl url=https://github.com/frida/proxy-libintl.git -revision=0.1 +revision=0.2 depth=1 ++++++ glib2-bgo569829-gettext-gkeyfile.patch ++++++ --- /var/tmp/diff_new_pack.GVqm2a/_old 2021-11-06 18:17:15.868860752 +0100 +++ /var/tmp/diff_new_pack.GVqm2a/_new 2021-11-06 18:17:15.872860754 +0100 @@ -1,8 +1,8 @@ -Index: glib-2.67.2/glib/gkeyfile.c +Index: glib-2.70.1/glib/gkeyfile.c =================================================================== ---- glib-2.67.2.orig/glib/gkeyfile.c -+++ glib-2.67.2/glib/gkeyfile.c -@@ -512,6 +512,7 @@ struct _GKeyFile +--- glib-2.70.1.orig/glib/gkeyfile.c ++++ glib-2.70.1/glib/gkeyfile.c +@@ -513,6 +513,7 @@ struct _GKeyFile gboolean checked_locales; gchar **locales; @@ -10,7 +10,7 @@ gint ref_count; /* (atomic) */ }; -@@ -636,6 +637,7 @@ g_key_file_init (GKeyFile *key_file) +@@ -637,6 +638,7 @@ g_key_file_init (GKeyFile *key_file) key_file->parse_buffer = NULL; key_file->list_separator = ';'; key_file->flags = 0; @@ -18,7 +18,7 @@ } static void -@@ -655,6 +657,12 @@ g_key_file_clear (GKeyFile *key_file) +@@ -657,6 +659,12 @@ g_key_file_clear (GKeyFile *key_file) key_file->parse_buffer = NULL; } @@ -31,7 +31,7 @@ tmp = key_file->groups; while (tmp != NULL) { -@@ -874,6 +882,11 @@ g_key_file_load_from_fd (GKeyFile +@@ -876,6 +884,11 @@ g_key_file_load_from_fd (GKeyFile return FALSE; } @@ -43,7 +43,7 @@ return TRUE; } -@@ -986,6 +999,11 @@ g_key_file_load_from_data (GKeyFile +@@ -988,6 +1001,11 @@ g_key_file_load_from_data (GKeyFile return FALSE; } @@ -55,7 +55,7 @@ return TRUE; } -@@ -2225,6 +2243,8 @@ g_key_file_get_locale_string (GKeyFile +@@ -2227,6 +2245,8 @@ g_key_file_get_locale_string (GKeyFile GError *key_file_error; gchar **languages; gboolean free_languages = FALSE; @@ -64,7 +64,7 @@ gint i; g_return_val_if_fail (key_file != NULL, NULL); -@@ -2246,6 +2266,23 @@ g_key_file_get_locale_string (GKeyFile +@@ -2248,6 +2268,23 @@ g_key_file_get_locale_string (GKeyFile free_languages = FALSE; } @@ -88,8 +88,8 @@ for (i = 0; languages[i]; i++) { candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]); -@@ -2262,6 +2299,39 @@ g_key_file_get_locale_string (GKeyFile - translated_value = NULL; +@@ -2261,6 +2298,39 @@ g_key_file_get_locale_string (GKeyFile + break; } + /* Fallback to gettext */ @@ -128,10 +128,10 @@ /* Fallback to untranslated key */ if (!translated_value) -Index: glib-2.67.2/glib/gkeyfile.h +Index: glib-2.70.1/glib/gkeyfile.h =================================================================== ---- glib-2.67.2.orig/glib/gkeyfile.h -+++ glib-2.67.2/glib/gkeyfile.h +--- glib-2.70.1.orig/glib/gkeyfile.h ++++ glib-2.70.1/glib/gkeyfile.h @@ -320,6 +320,7 @@ gboolean g_key_file_remove_group #define G_KEY_FILE_DESKTOP_KEY_URL "URL" #define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable" ++++++ glib2-dbus-socket-path.patch ++++++ --- /var/tmp/diff_new_pack.GVqm2a/_old 2021-11-06 18:17:15.884860760 +0100 +++ /var/tmp/diff_new_pack.GVqm2a/_new 2021-11-06 18:17:15.884860760 +0100 @@ -1,7 +1,7 @@ -Index: glib-2.67.3/gio/gdbusaddress.c +Index: glib-2.70.0/gio/gdbusaddress.c =================================================================== ---- glib-2.67.3.orig/gio/gdbusaddress.c -+++ glib-2.67.3/gio/gdbusaddress.c +--- glib-2.70.0.orig/gio/gdbusaddress.c ++++ glib-2.70.0/gio/gdbusaddress.c @@ -1337,7 +1337,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp if (ret == NULL) ++++++ glib2-fate300461-gettext-gkeyfile-suse.patch ++++++ --- /var/tmp/diff_new_pack.GVqm2a/_old 2021-11-06 18:17:15.900860769 +0100 +++ /var/tmp/diff_new_pack.GVqm2a/_new 2021-11-06 18:17:15.900860769 +0100 @@ -1,8 +1,8 @@ -Index: glib-2.67.2/glib/gkeyfile.c +Index: glib-2.70.0/glib/gkeyfile.c =================================================================== ---- glib-2.67.2.orig/glib/gkeyfile.c -+++ glib-2.67.2/glib/gkeyfile.c -@@ -513,6 +513,7 @@ struct _GKeyFile +--- glib-2.70.0.orig/glib/gkeyfile.c ++++ glib-2.70.0/glib/gkeyfile.c +@@ -514,6 +514,7 @@ struct _GKeyFile gboolean checked_locales; gchar **locales; gchar *gettext_domain; @@ -10,7 +10,7 @@ gint ref_count; /* (atomic) */ }; -@@ -638,6 +639,7 @@ g_key_file_init (GKeyFile *key_file) +@@ -639,6 +640,7 @@ g_key_file_init (GKeyFile *key_file) key_file->list_separator = ';'; key_file->flags = 0; key_file->gettext_domain = NULL; @@ -18,7 +18,7 @@ } static void -@@ -663,6 +665,12 @@ g_key_file_clear (GKeyFile *key_file) +@@ -665,6 +667,12 @@ g_key_file_clear (GKeyFile *key_file) key_file->gettext_domain = NULL; } @@ -31,7 +31,7 @@ tmp = key_file->groups; while (tmp != NULL) { -@@ -806,6 +814,39 @@ find_file_in_data_dirs (const gchar *f +@@ -808,6 +816,39 @@ find_file_in_data_dirs (const gchar *f return fd; } @@ -71,7 +71,7 @@ static gboolean g_key_file_load_from_fd (GKeyFile *key_file, gint fd, -@@ -887,6 +928,9 @@ g_key_file_load_from_fd (GKeyFile +@@ -889,6 +930,9 @@ g_key_file_load_from_fd (GKeyFile G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, NULL); @@ -81,7 +81,7 @@ return TRUE; } -@@ -943,6 +987,8 @@ g_key_file_load_from_file (GKeyFile +@@ -945,6 +989,8 @@ g_key_file_load_from_file (GKeyFile return FALSE; } @@ -90,7 +90,7 @@ return TRUE; } -@@ -1004,6 +1050,9 @@ g_key_file_load_from_data (GKeyFile +@@ -1006,6 +1052,9 @@ g_key_file_load_from_data (GKeyFile G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, NULL); @@ -100,7 +100,7 @@ return TRUE; } -@@ -1108,6 +1157,9 @@ g_key_file_load_from_dirs (GKeyFile +@@ -1110,6 +1159,9 @@ g_key_file_load_from_dirs (GKeyFile } } @@ -110,7 +110,7 @@ if (found_file && full_path) *full_path = output_path; else -@@ -2308,14 +2360,40 @@ g_key_file_get_locale_string (GKeyFile +@@ -2310,14 +2362,40 @@ g_key_file_get_locale_string (GKeyFile { gboolean codeset_set; const gchar *translated; @@ -156,10 +156,10 @@ g_free (orig_value); -Index: glib-2.67.2/glib/gkeyfile.h +Index: glib-2.70.0/glib/gkeyfile.h =================================================================== ---- glib-2.67.2.orig/glib/gkeyfile.h -+++ glib-2.67.2/glib/gkeyfile.h +--- glib-2.70.0.orig/glib/gkeyfile.h ++++ glib-2.70.0/glib/gkeyfile.h @@ -320,7 +320,7 @@ gboolean g_key_file_remove_group #define G_KEY_FILE_DESKTOP_KEY_URL "URL" #define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable" ++++++ glib2-gdbus-codegen-version.patch ++++++ --- /var/tmp/diff_new_pack.GVqm2a/_old 2021-11-06 18:17:15.912860775 +0100 +++ /var/tmp/diff_new_pack.GVqm2a/_new 2021-11-06 18:17:15.912860775 +0100 @@ -1,7 +1,7 @@ -Index: glib-2.67.2/gio/gdbus-2.0/codegen/codegen.py +Index: glib-2.70.0/gio/gdbus-2.0/codegen/codegen.py =================================================================== ---- glib-2.67.2.orig/gio/gdbus-2.0/codegen/codegen.py -+++ glib-2.67.2/gio/gdbus-2.0/codegen/codegen.py +--- glib-2.70.0.orig/gio/gdbus-2.0/codegen/codegen.py ++++ glib-2.70.0/gio/gdbus-2.0/codegen/codegen.py @@ -95,8 +95,7 @@ class HeaderCodeGenerator: # ---------------------------------------------------------------------------------------------------- ++++++ glib2-suppress-schema-deprecated-path-warning.patch ++++++ --- /var/tmp/diff_new_pack.GVqm2a/_old 2021-11-06 18:17:15.948860794 +0100 +++ /var/tmp/diff_new_pack.GVqm2a/_new 2021-11-06 18:17:15.948860794 +0100 @@ -1,8 +1,8 @@ -Index: glib-2.56.2/gio/glib-compile-schemas.c +Index: glib-2.70.0/gio/glib-compile-schemas.c =================================================================== ---- glib-2.56.2.orig/gio/glib-compile-schemas.c 2018-08-17 02:03:20.000000000 +0200 -+++ glib-2.56.2/gio/glib-compile-schemas.c 2018-08-17 10:53:47.342889761 +0200 -@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState *s +--- glib-2.70.0.orig/gio/glib-compile-schemas.c ++++ glib-2.70.0/gio/glib-compile-schemas.c +@@ -1232,6 +1232,7 @@ parse_state_start_schema (ParseState *s return; } @@ -10,7 +10,7 @@ if (path && (g_str_has_prefix (path, "/apps/") || g_str_has_prefix (path, "/desktop/") || g_str_has_prefix (path, "/system/"))) -@@ -1231,6 +1232,7 @@ parse_state_start_schema (ParseState *s +@@ -1244,6 +1245,7 @@ parse_state_start_schema (ParseState *s g_printerr ("%s\n", message); g_free (message); }
