From 2dcc4a3c3911cff85293ca5c2d2d3348193c083a Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 21 Jul 2015 08:32:50 +0100 Subject: [PATCH] Update to 2.45.4 --- ...tialize-backend-before-withdrawing-n.patch | 38 ------------------- glib2.spec | 10 ++--- sources | 2 +- 3 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 0001-gapplication-Initialize-backend-before-withdrawing-n.patch diff --git a/0001-gapplication-Initialize-backend-before-withdrawing-n.patch b/0001-gapplication-Initialize-backend-before-withdrawing-n.patch deleted file mode 100644 index f1d78f2..0000000 --- a/0001-gapplication-Initialize-backend-before-withdrawing-n.patch +++ /dev/null @@ -1,38 +0,0 @@ -From c612fcab0fb2d3f0bdaf011d5b566dc949dbd18a Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Mon, 22 Jun 2015 19:56:38 +0200 -Subject: [PATCH] gapplication: Initialize backend before withdrawing - notifications - -Make sure to initialize the notification backend in -g_application_withdraw_notification() the same way as is done in -g_application_send_notification(). - -This makes it possible for an app to withdraw notifications it has sent -in a previous execution of the application. - -https://bugzilla.gnome.org/show_bug.cgi?id=750625 ---- - gio/gapplication.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gio/gapplication.c b/gio/gapplication.c -index be7127a..37a8258 100644 ---- a/gio/gapplication.c -+++ b/gio/gapplication.c -@@ -2715,8 +2715,10 @@ g_application_withdraw_notification (GApplication *application, - g_return_if_fail (G_IS_APPLICATION (application)); - g_return_if_fail (id != NULL); - -- if (application->priv->notifications) -- g_notification_backend_withdraw_notification (application->priv->notifications, id); -+ if (application->priv->notifications == NULL) -+ application->priv->notifications = g_notification_backend_new_default (application); -+ -+ g_notification_backend_withdraw_notification (application->priv->notifications, id); - } - - /* Busy binding {{{1 */ --- -2.4.3 - diff --git a/glib2.spec b/glib2.spec index 84c4bca..c60c7e1 100644 --- a/glib2.spec +++ b/glib2.spec @@ -2,15 +2,13 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.45.3 -Release: 2%{?dist} +Version: 2.45.4 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org #VCS: git:git://git.gnome.org/glib Source: http://download.gnome.org/sources/glib/2.45/glib-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-gapplication-Initialize-backend-before-withdrawing-n.patch BuildRequires: pkgconfig BuildRequires: gettext @@ -83,7 +81,6 @@ the functionality of the installed glib2 package. %prep %setup -q -n glib-%{version} -%patch0 -p1 %build # Support builds of both git snapshots and tarballs packed with autogoo @@ -221,6 +218,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %{_datadir}/installed-tests %changelog +* Tue Jul 21 2015 David King - 2.45.4-1 +- Update to 2.45.4 + * Wed Jun 24 2015 Kalev Lember - 2.45.3-2 - Backport a patch to fix notification withdrawing in gnome-software diff --git a/sources b/sources index d2d3e84..28a4693 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa6273d970d8f1026cbd47f4649349e0 glib-2.45.3.tar.xz +1d7e531bb84500fff5a804dc5f6f37d6 glib-2.45.4.tar.xz