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/0001-gdbus-Add-a-missing-include.patch b/0001-gdbus-Add-a-missing-include.patch new file mode 100644 index 0000000..f6410a5 --- /dev/null +++ b/0001-gdbus-Add-a-missing-include.patch @@ -0,0 +1,26 @@ +From 02f9e84709b4e4756f3e512dede3430f3538fbf5 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Sat, 22 Aug 2015 23:13:33 +0200 +Subject: [PATCH] gdbus: Add a missing include + +This fixes the build on non-unix platforms, such as win32 where +gunixfdlist.h is not included. +--- + gio/gdbusmethodinvocation.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c +index c5224be..91a7e39 100644 +--- a/gio/gdbusmethodinvocation.c ++++ b/gio/gdbusmethodinvocation.c +@@ -29,6 +29,7 @@ + #include "gdbusintrospection.h" + #include "gdbuserror.h" + #include "gdbusprivate.h" ++#include "gioerror.h" + + #ifdef G_OS_UNIX + #include "gunixfdlist.h" +-- +2.5.0 + diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 1c7c6e1..16db6a9 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -1,7 +1,7 @@ %?mingw_package_header Name: mingw-glib2 -Version: 2.45.3 +Version: 2.45.6 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -35,8 +35,8 @@ BuildRequires: gettext # Native version required for glib-genmarshal BuildRequires: glib2-devel >= 2.45.3 -# Patch from native package -Patch0: 0001-gapplication-Initialize-backend-before-withdrawing-n.patch +# Backported from upstream +Patch0: 0001-gdbus-Add-a-missing-include.patch # https://bugzilla.gnome.org/show_bug.cgi?id=674214 Patch1: 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch @@ -289,6 +289,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sat Aug 22 2015 Kalev Lember - 2.45.6-1 +- Update to 2.45.6 + * Thu Jul 2 2015 Thomas Sailer - 2.45.3-1 - Update to 2.45.3 diff --git a/sources b/sources index d2d3e84..a884bb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa6273d970d8f1026cbd47f4649349e0 glib-2.45.3.tar.xz +d6c3aef029c872c0b21109ec01efadec glib-2.45.6.tar.xz