Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2018-02-03 15:38:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Sat Feb 3 15:38:57 2018 rev:194 rq:572084 version:2.54.3 Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2017-12-16 20:45:39.055908554 +0100 +++ /work/SRC/openSUSE:Factory/.glib2.new/glib2.changes 2018-02-03 15:39:00.343170745 +0100 @@ -1,0 +2,14 @@ +Wed Jan 31 21:34:18 UTC 2018 - [email protected] + +- Update to version 2.54.3: + + Bugs fixed: bgo#691436, bgo#761102, bgo#776147, bgo#779182, + bgo#782057, bgo#785113, bgo#788990, bgo#789637, bgo#789894, + bgo#790030, bgo#790093, bgo#790126, bgo#790829, bgo#790934, + bgo#791235, bgo#791267, bgo#791296, bgo#791325, bgo#791334, + bgo#791337, bgo#791720, bgo#791744, bgo#791754, bgo#791906. + + Updated translations. +- Drop glib2-gtester-report-py3.patch: Fixed upstream. +- Add glib2-gmain-partial-revert.patch: gmain: Partial revert of + recent wakeup changes to gmain.c (bgo#761102). + +------------------------------------------------------------------- Old: ---- glib-2.54.2.tar.xz glib2-gtester-report-py3.patch New: ---- glib-2.54.3.tar.xz glib2-gmain-partial-revert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.tgOHFg/_old 2018-02-03 15:39:01.351123666 +0100 +++ /var/tmp/diff_new_pack.tgOHFg/_new 2018-02-03 15:39:01.355123479 +0100 @@ -1,7 +1,7 @@ # # spec file for package glib2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define with_systemtap 0 %define _name glib Name: glib2 -Version: 2.54.2 +Version: 2.54.3 Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package Summary: General-Purpose Utility Library @@ -51,10 +51,10 @@ Patch14: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch [email protected] -- Remove version string from files generated by gdbus-codegen Patch16: glib2-gdbus-codegen-version.patch -# PATCH-FIX-UPSTREAM glib2-gtester-report-py3.patch bgo#791298 boo#1071378 [email protected] -- gtester-reporter fails to run with python3 -Patch17: glib2-gtester-report-py3.patch # PATCH-FIX-UPSTREAM glib2-gsettings-overrides-per-session.patch bgo#746592 bsc#1070090 [email protected] -- gsettings default value can be overridden depending on session Patch18: glib2-gsettings-overrides-per-session.patch +# PATCH-FIX-UPSTREAM glib2-gmain-partial-revert.patch bgo#761102 [email protected] -- gmain: Partial revert of recent wakeup changes to gmain.c +Patch19: glib2-gmain-partial-revert.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -221,7 +221,7 @@ %package -n libgio-fam Summary: GIO module to use FAM -# we need gio-querymodules in %post/%postun +# we need gio-querymodules in %%post/%%postun Group: System/Libraries Requires(post): %{name}-tools Requires(postun): %{name}-tools @@ -269,8 +269,8 @@ %patch13 -p1 %patch14 -p1 %patch16 -p1 -%patch17 -p1 %patch18 -p1 +%patch19 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then ++++++ glib-2.54.2.tar.xz -> glib-2.54.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/glib2/glib-2.54.2.tar.xz /work/SRC/openSUSE:Factory/.glib2.new/glib-2.54.3.tar.xz differ: char 26, line 1 ++++++ glib2-gmain-partial-revert.patch ++++++ >From 94b38beff1347ec4a733199f7a7abdacaa958678 Mon Sep 17 00:00:00 2001 From: Philip Withnall <[email protected]> Date: Wed, 17 Jan 2018 11:38:50 +0000 Subject: gmain: Partial revert of recent wakeup changes to gmain.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts the following commits (but keeps the other recent changes to gmain.c): • e4ee3079c Do not wake up main loop if change is from same thread • 208702404 main: Create a helper function for "owner wakeup" optimization • 0c0469b56 gmain: Signal wakeups if context has never been acquired as well • 9ba95e25b gmain: only signal GWakeup right before or during a blocking poll Some combination of them is causing problems with LibreOffice and/or WebKit, and the safest thing to do at the moment is revert them all until we work out what’s going on. The previous revert (4976e8109) was not sufficient (it fixed WebKit, but re-broken LibreOffice). By reverting, we gain some spurious wakeups, but avoid dropping necessary wakeups, which is presumably what’s causing problems in the other modules. Signed-off-by: Philip Withnall <[email protected]> https://bugzilla.gnome.org/show_bug.cgi?id=761102 --- glib/gmain.c | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/glib/gmain.c b/glib/gmain.c index 8ca54de..67102cd 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -1118,29 +1118,6 @@ source_remove_from_context (GSource *source, } } -/* See https://bugzilla.gnome.org/show_bug.cgi?id=761102 for - * the introduction of this. - * - * The main optimization is to avoid waking up the main - * context if a change is made by the current owner. - */ -static void -conditional_wakeup (GMainContext *context) -{ - /* We want to signal wakeups in two cases: - * 1 When the context is owned by another thread - * 2 When the context owner is NULL (two subcases) - * 2a Possible if the context has never been acquired - * 2b Or if the context has no current owner - * - * At least case 2a) is necessary to ensure backwards compatibility with - * qemu's use of GMainContext. - * https://bugzilla.gnome.org/show_bug.cgi?id=761102#c14 - */ - if (context->owner != G_THREAD_SELF) - g_wakeup_signal (context->wakeup); -} - static guint g_source_attach_unlocked (GSource *source, GMainContext *context, @@ -1187,8 +1164,8 @@ g_source_attach_unlocked (GSource *source, /* If another thread has acquired the context, wake it up since it * might be in poll() right now. */ - if (do_wakeup) - conditional_wakeup (context); + if (do_wakeup && context->owner && context->owner != G_THREAD_SELF) + g_wakeup_signal (context->wakeup); return source->source_id; } @@ -1878,7 +1855,7 @@ g_source_set_ready_time (GSource *source, { /* Quite likely that we need to change the timeout on the poll */ if (!SOURCE_BLOCKED (source)) - conditional_wakeup (context); + g_wakeup_signal (context->wakeup); UNLOCK_CONTEXT (context); } } @@ -4318,7 +4295,7 @@ g_main_context_add_poll_unlocked (GMainContext *context, context->poll_changed = TRUE; /* Now wake up the main loop if it is waiting in the poll() */ - conditional_wakeup (context); + g_wakeup_signal (context->wakeup); } /** @@ -4378,7 +4355,7 @@ g_main_context_remove_poll_unlocked (GMainContext *context, context->poll_changed = TRUE; /* Now wake up the main loop if it is waiting in the poll() */ - conditional_wakeup (context); + g_wakeup_signal (context->wakeup); } /** -- cgit v0.12
