[glib2] Update to 2.48.0. Fixes JB#35228

rpm/0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch

@@ -1,11 +1,8 @@
-@@ -, +, @@ 
- volume
----
- gio/gunixvolume.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
---- a/gio/gunixvolume.c	
-+++ a/gio/gunixvolume.c	
-@@ -112,7 +112,8 @@ _g_unix_volume_new (GVolumeMonitor  *volume_monitor,
+diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
+index 981f703..48ea9fd 100644
+--- a/gio/gunixvolume.c
++++ b/gio/gunixvolume.c
+@@ -110,7 +110,8 @@ _g_unix_volume_new (GVolumeMonitor  *volume_monitor,
    GUnixVolume *volume;
 
    if (!(g_unix_mount_point_is_user_mountable (mountpoint) ||
@@ -15,4 +12,3 @@
        g_unix_mount_point_is_loopback (mountpoint))
      return NULL;
 
--- 

rpm/glib-2.36.3-syslog-message-handler.patch → rpm/glib-syslog-message-handler.patch

@@ -15,25 +15,27 @@ Subject: [PATCH] Add a custom log handling for MeeGo
     -  ...
     -  glib.syslog=6 logs debug messages
   It defaults to logging WARNING, CRITICAL and ERROR messages
---- a/glib/gmessages.c	2013-06-10 00:03:18.000000000 +0200
-+++ b/glib/gmessages.c	2013-07-15 17:12:04.190826951 +0200
-@@ -58,6 +58,7 @@
+diff --git a/glib/gmessages.c b/glib/gmessages.c
+index 6720a26..d378bf1 100644
+--- a/glib/gmessages.c
++++ b/glib/gmessages.c
+@@ -54,6 +54,7 @@
  #include <signal.h>
  #include <locale.h>
  #include <errno.h>
 +#include <syslog.h>
 
- #include "gmessages.h"
-
-@@ -70,6 +71,7 @@
+ #include "glib-init.h"
+ #include "gbacktrace.h"
+@@ -64,6 +65,7 @@
  #include "gprintfint.h"
  #include "gtestutils.h"
  #include "gthread.h"
 +#include "gstdio.h"
  #include "gstrfuncs.h"
  #include "gstring.h"
  #include "gpattern.h"
-@@ -1011,6 +1013,142 @@
+@@ -1120,6 +1122,142 @@ g_log (const gchar   *log_domain,
    va_end (args);
  }
 
@@ -173,17 +175,17 @@ Subject: [PATCH] Add a custom log handling for MeeGo
 +  return interactive;
 +}
 +
- void
- g_return_if_fail_warning (const char *log_domain,
- 			  const char *pretty_function,
-@@ -1375,7 +1513,12 @@
+ /**
+  * g_return_if_fail_warning: (skip)
+  * @log_domain: (nullable):
+@@ -1504,7 +1642,12 @@ g_log_default_handler (const gchar   *log_domain,
 
    string = g_string_free (gstring, FALSE);
 
--  write_string (fd, string);
+-  write_string (stream, string);
 +  /* only output a string to stdout/stderr if we are in an interactive shell */
 +  if (is_interactive ())
-+    write_string (fd, string);
++    write_string (stream, string);
 +
 +  /* */
 +  g_log_syslog_handler (log_domain, log_level, message, unused_data);

rpm/glib2.spec

@@ -3,7 +3,7 @@ Name:       glib2
 %define keepstatic 1
 
 Summary:    A library of handy utility functions
-Version:    2.38.2
+Version:    2.48.0
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2+
@@ -12,12 +12,9 @@ Source0:    %{name}-%{version}.tar.xz
 Source2:    glib2.sh
 Source3:    glib2.csh
 Source4:    %{name}-rpmlintrc
-Patch0:     0001-GDBusObjectManagerClient-keep-the-manager-alive-whil.patch
-Patch1:     glib-2.36.3-syslog-message-handler.patch
+Patch1:     glib-syslog-message-handler.patch
 Patch2:     0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch
 Patch3:     use-mtab-instead-of-fstab.patch
-Patch4:     0001-networkaddress-fix-parsing-of-uri-with-after-authori.patch
-Patch5:     gdbus-no-reply-expected.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(libpcre)
@@ -63,18 +60,12 @@ version 2 of the GLib library.
 %prep
 %setup -q -n %{name}-%{version}/upstream
 
-# 0001-GDBusObjectManagerClient-keep-the-manager-alive-whil.patch
-%patch0 -p1
-# glib-2.36.3-syslog-message-handler.patch
+# glib-syslog-message-handler.patch
 %patch1 -p1
 # 0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch
 %patch2 -p1
 # use-mtab-instead-of-fstab.patch
 %patch3 -p1
-# 0001-networkaddress-fix-parsing-of-uri-with-after-authori.patch
-%patch4 -p1
-# gdbus-no-reply-expected.patch
-%patch5 -p1
 
 %build
 # >> build pre
@@ -156,6 +147,8 @@ mv glib20.lang glib2.lang
 %{_bindir}/gdbus
 %{_bindir}/glib-compile-resources
 %{_bindir}/gresource
+%{_bindir}/gapplication
+%{_datarootdir}/gettext/its
 # << files
 
 %files static
@@ -182,7 +175,6 @@ mv glib20.lang glib2.lang
 %{_bindir}/gobject-query
 %{_bindir}/gtester
 %{_bindir}/gdbus-codegen
-%dir %{_datadir}/glib-2.0/codegen
-%{_datadir}/glib-2.0/codegen/*
+%{_datadir}/glib-2.0/codegen
 %attr (0755, root, root) %{_bindir}/gtester-report
 # << files devel

rpm/use-mtab-instead-of-fstab.patch

@@ -1,6 +1,8 @@
---- glib-2.32.4/gio/gunixmounts.c.orig	2013-12-05 20:04:49.919990399 +0000
-+++ glib-2.32.4/gio/gunixmounts.c	2013-12-05 20:05:26.217706386 +0000
-@@ -754,7 +754,7 @@
+diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
+index 2e2ff5e..ed036d9 100644
+--- a/gio/gunixmounts.c
++++ b/gio/gunixmounts.c
+@@ -755,7 +755,7 @@ _g_get_unix_mount_points (void)
    GUnixMountPoint *mount_entry;
    GList *return_list;