Accepting request 449330 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/449330
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=178

glib2-Add-missing-check-for-termios_h.patch

@@ -0,0 +1,28 @@
+From f4ccafc4245c19b6cb255c5e5765093f6e33086c Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy@redhat.com>
+Date: Fri, 2 Dec 2016 13:07:25 +0100
+Subject: Add missing check for termios.h
+
+Check for termios.h is missing and passwords in the new gio tool
+are echoed in the terminal consequently, which is really bad!
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775517
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 21623ec..fdacbd8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -712,6 +712,7 @@ AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h])
+ AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
+ AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
+ AC_CHECK_HEADERS([linux/magic.h])
++AC_CHECK_HEADERS([termios.h])
+ 
+ # Some versions of MSC lack these
+ AC_CHECK_HEADERS([dirent.h sys/time.h])
+-- 
+cgit v0.12
+

glib2-fix-notify-id-FDO-notification-backend.patch

@@ -0,0 +1,26 @@
+From accfe3826a15af9ba5249dca018a78968bee53ff Mon Sep 17 00:00:00 2001
+From: donadigo <donadigos159@gmail.com>
+Date: Wed, 7 Dec 2016 19:32:33 +0100
+Subject: Fixed notify id in FDO notification backend
+
+https://bugzilla.gnome.org/show_bug.cgi?id=775765
+---
+ gio/gfdonotificationbackend.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/gfdonotificationbackend.c b/gio/gfdonotificationbackend.c
+index 7b98027..9a39d75 100644
+--- a/gio/gfdonotificationbackend.c
++++ b/gio/gfdonotificationbackend.c
+@@ -424,7 +424,7 @@ g_fdo_notification_backend_withdraw_notification (GNotificationBackend *backend,
+                                   "org.freedesktop.Notifications",
+                                   "/org/freedesktop/Notifications",
+                                   "org.freedesktop.Notifications", "CloseNotification",
+-                                  g_variant_new ("(u)", n->id), NULL,
++                                  g_variant_new ("(u)", n->notify_id), NULL,
+                                   G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+         }
+ 
+-- 
+cgit v0.12
+

glib2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jan  8 13:58:31 UTC 2017 - zaitor@opensuse.org
+
+- Add glib2-Add-missing-check-for-termios_h.patch: Add missing
+  check for termios.h. Check for termios.h is missing and passwords
+  in the new gio tool are echoed in the terminal consequently,
+  which is really bad! (bgo#775517).
+- Add glib2-fix-notify-id-FDO-notification-backend.patch: Fixed
+  notify id in FDO notification backend (bgo#775765).
+
 -------------------------------------------------------------------
 Mon Nov  7 22:07:19 UTC 2016 - dimstar@opensuse.org
 

glib2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package glib2
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -52,6 +52,10 @@ Patch13:        glib2-suppress-schema-deprecated-path-warning.patch
 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
+# PATCH-FIX-UPSTREAM glib2-Add-missing-check-for-termios_h.patch bgo#775517 zaitor@opensuse.org -- Add missing check for termios.h
+Patch16:        glib2-Add-missing-check-for-termios_h.patch
+# PATCH-FIX-UPSTREAM glib2-fix-notify-id-FDO-notification-backend.patch bgo#775765 zaitor@opensuse.org -- Fixed notify id in FDO notification backend
+Patch17:        glib2-fix-notify-id-FDO-notification-backend.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -262,6 +266,8 @@ translation-update-upstream
 %patch13 -p1
 %patch14 -p1
 %patch15
+%patch16 -p1
+%patch17 -p1
 cp -a %{S:1} %{S:2} %{S:5} .
 cp -a %{S:4} gnome_defaults.conf
 if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then