diff --git a/glib-2.46.0.tar.xz b/glib-2.46.0.tar.xz deleted file mode 100644 index eea2b87..0000000 --- a/glib-2.46.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1cee83469ae7d80f17c267c37f090414e93960bd62d2b254a5a96fbc5baacb4 -size 7188812 diff --git a/glib-2.46.1.tar.xz b/glib-2.46.1.tar.xz new file mode 100644 index 0000000..a013412 --- /dev/null +++ b/glib-2.46.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb +size 7359208 diff --git a/glib2-remove_fam_debug_print.patch b/glib2-remove_fam_debug_print.patch new file mode 100644 index 0000000..672ef57 --- /dev/null +++ b/glib2-remove_fam_debug_print.patch @@ -0,0 +1,11 @@ +--- gio/fam/gfamfilemonitor.c ++++ gio/fam/gfamfilemonitor.c +@@ -140,7 +140,7 @@ + + g_mutex_unlock (&fam_lock); + +- g_print ("II %d\n", fam_initialised); ++ /* g_print ("II %d\n", fam_initialised); */ + + return fam_initialised; + } diff --git a/glib2.changes b/glib2.changes index 906de4f..d9dacd8 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Oct 20 17:03:40 CEST 2015 - ro@suse.de + +- Add glib2-remove_fam_debug_print.patch: remove debug output + "II 1" from the fam monitor (boo#951221, bgo#756879). + +------------------------------------------------------------------- +Wed Oct 14 15:36:13 UTC 2015 - zaitor@opensuse.org + +- Update to version 2.46.1: + + Remove system_header pragma (should fix lack of warnings with + things like g_return_if_fail). + + Move GStrv typedef (and auto-cleanup) from libgobject to + libglib. + + Fix order of trashing files to be closer to what is required in + the specification. Namely, trashinfo files are written first. + This should fix issues with the gvfs trash backend failing to + correctly read the info for recently trashed files (preventing + 'restore'). + + Tweak mime logic to return text/plain on all empty files + instead of returning application/octet-stream. This includes + files that have extensions that imply that they may be other + types of files, which is a slight change of behaviour with + respect to old GLib versions. + + Many win32 fixes. + + Many docs fixes. + + Bugs fixed: bgo#735754, bgo#743011, bgo#749161, bgo#751924, + bgo#752837, bgo#753310, bgo#755083, bgo#755351, bgo#755355, + bgo#755496, bgo#755795, bgo#756179, bgo#756251, bgo#756255. + + Updated translations. + ------------------------------------------------------------------- Mon Sep 21 13:34:21 UTC 2015 - dimstar@opensuse.org diff --git a/glib2.spec b/glib2.spec index 30c930b..f7e22b0 100644 --- a/glib2.spec +++ b/glib2.spec @@ -20,7 +20,7 @@ Name: glib2 %define _name glib -Version: 2.46.0 +Version: 2.46.1 Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package Summary: General-Purpose Utility Library @@ -50,6 +50,8 @@ Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch Patch13: glib2-suppress-schema-deprecated-path-warning.patch # PATCH-FIX-OPENSUSE glib2-dbus-socket-path.patch bnc#845287 dimstar@opensuse.org -- Have gio look for the system dbus socket in /run instead of /var/run. Patch14: glib2-dbus-socket-path.patch +# PATCH-FIX-UPSTREAM glib2-dbus-socket-path.patch boo#951221 bgo#756879 ro@suse.de -- remove debug output "II 1" from the fam monitor +Patch15: glib2-remove_fam_debug_print.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -258,6 +260,7 @@ translation-update-upstream %patch11 -p1 %patch13 -p1 %patch14 -p1 +%patch15 cp -a %{S:1} %{S:2} %{S:5} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then