From 798abc11197dc6537e05a0d35b7400a6e0560645 Mon Sep 17 00:00:00 2001
From: Peter Wagner <tripolar@gmx.at>
Date: Mon, 28 Jan 2019 17:54:37 +0100
Subject: [PATCH] glib2: update to 2.58.3

Signed-off-by: Peter Wagner <tripolar@gmx.at>
---
 libs/glib2/Makefile                                | 6 +++---
 libs/glib2/patches/001-automake-compat.patch       | 3 ---
 libs/glib2/patches/002-fix-gthreadedresolver.patch | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 426aa1e3ad..6d6bc31a4d 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2016 OpenWrt.org
+# Copyright (C) 2007-2019 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.58.2
+PKG_VERSION:=2.58.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
 PKG_SOURCE_URL:=@GNOME/glib/2.58
-PKG_HASH:=c7b24ed6536f1a10fc9bce7994e55c427b727602e78342821f1f07fb48753d4b
+PKG_HASH:=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
 
 PKG_BUILD_PARALLEL:=1
 HOST_BUILD_PARALLEL:=1
diff --git a/libs/glib2/patches/001-automake-compat.patch b/libs/glib2/patches/001-automake-compat.patch
index dec6f3c9ec..5e0ec1515d 100644
--- a/libs/glib2/patches/001-automake-compat.patch
+++ b/libs/glib2/patches/001-automake-compat.patch
@@ -1,6 +1,3 @@
-diff --git a/gtk-doc.make b/gtk-doc.make
-new file mode 100644
-index 0000000..14f18fd
 --- /dev/null
 +++ b/gtk-doc.make
 @@ -0,0 +1,2 @@
diff --git a/libs/glib2/patches/002-fix-gthreadedresolver.patch b/libs/glib2/patches/002-fix-gthreadedresolver.patch
index 62c526d514..38a2391a12 100644
--- a/libs/glib2/patches/002-fix-gthreadedresolver.patch
+++ b/libs/glib2/patches/002-fix-gthreadedresolver.patch
@@ -1,6 +1,6 @@
 --- a/gio/gthreadedresolver.c
 +++ b/gio/gthreadedresolver.c
-@@ -871,6 +871,8 @@ do_lookup_records (GTask         *task,
+@@ -873,6 +873,8 @@ do_lookup_records (GTask         *task,
  
  #ifdef HAVE_RES_NQUERY
  
@@ -9,7 +9,7 @@
  #if defined(HAVE_RES_NDESTROY)
    res_ndestroy (&res);
  #elif defined(HAVE_RES_NCLOSE)
-@@ -881,6 +883,8 @@ do_lookup_records (GTask         *task,
+@@ -883,6 +885,8 @@ do_lookup_records (GTask         *task,
  
  #endif  /* HAVE_RES_NQUERY */