Update to 2.56.1-1

3 files changed, 8 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5128fe52675..f78814dc6c43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Jul 29 01:17:47 UTC 2017
+# Sun Apr 22 20:03:46 UTC 2018
 pkgbase = mingw-w64-glib2
 	pkgdesc = Low level core library (mingw-w64)
-	pkgver = 2.52.3
+	pkgver = 2.56.1
 	pkgrel = 1
 	url = http://www.gtk.org/
 	arch = any
@@ -19,17 +19,15 @@ pkgbase = mingw-w64-glib2
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://git.gnome.org/browse/glib#commit=90bb8778f2eabf00bee5bff1259c48f1e7b791b8
+	source = git+https://git.gnome.org/browse/glib#commit=d0364b443805dcb832c200fcf8bf58a64fdf3e7d
 	source = 0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch
 	source = 0004-glib-prefer-constructors-over-DllMain.patch
-	source = 0027-no_sys_if_nametoindex.patch
 	source = 0028-inode_directory.patch
 	source = use-pkgconfig-file-for-intl.patch
 	source = skip-broken-timer-test.patch
 	sha256sums = SKIP
 	sha256sums = ef81e82e15fb3a71bad770be17fe4fea3f4d9cdee238d6caa39807eeea5da3e3
 	sha256sums = 7b099af0c562f397458542482d6d1debe437f220762aa2ed94b2e6c4d43dd8a6
-	sha256sums = 5cb481295ff86c2802030984d8b2bf6a3b1dcd5e5fe7b0be68b22d9116305837
 	sha256sums = f7f06a90156fe0a308412512c359072922f7f0d19dd4bed30d863db18e48940b
 	sha256sums = 1991eaa0471ff8d0b3dd3bccccd560ca6cc8c0995c6145b9bc93d5e90755e3f4
 	sha256sums = a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d
diff --git a/0027-no_sys_if_nametoindex.patch b/0027-no_sys_if_nametoindex.patch
deleted file mode 100644
index 456949797cce..000000000000
--- a/0027-no_sys_if_nametoindex.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur glib-2.46.0-orig/gio/gsocket.c glib-2.46.0/gio/gsocket.c
---- glib-2.46.0-orig/gio/gsocket.c	2015-08-31 16:08:34.000000000 +0300
-+++ glib-2.46.0/gio/gsocket.c	2015-09-22 09:09:04.614548700 +0300
-@@ -1951,7 +1951,7 @@
- 
- #if !defined(HAVE_IF_NAMETOINDEX) && defined(G_OS_WIN32)
- static guint
--if_nametoindex (const gchar *iface)
-+w32_if_nametoindex (const gchar *iface)
- {
-   PIP_ADAPTER_ADDRESSES addresses = NULL, p;
-   gulong addresses_len = 0;
-@@ -2004,6 +2004,7 @@
- }
- 
- #define HAVE_IF_NAMETOINDEX 1
-+#define if_nametoindex w32_if_nametoindex
- #endif
- 
- static gboolean
diff --git a/PKGBUILD b/PKGBUILD
index dafe2e621846..fc0547232f5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
+# Maintainer: drakkan <nicola.murino at gmail dot com>
 # Contributor: Filip Brcic <brcha@gna.org>
 # Contributor: ant32 <antreimer@gmail.com>
 # Contributor: Renato Silva <br.renatosilva@gmail.com>
 pkgname=mingw-w64-glib2
-pkgver=2.52.3
+pkgver=2.56.1
 pkgrel=1
-_commit=90bb8778f2eabf00bee5bff1259c48f1e7b791b8  # tags/2.52.3^0
+_commit=d0364b443805dcb832c200fcf8bf58a64fdf3e7d  # tags/2.56.1^0
 arch=(any)
 pkgdesc="Low level core library (mingw-w64)"
 depends=(mingw-w64-libffi mingw-w64-pcre mingw-w64-gettext)
@@ -15,14 +16,12 @@ url="http://www.gtk.org/"
 source=("git+https://git.gnome.org/browse/glib#commit=$_commit"
 "0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch"
 "0004-glib-prefer-constructors-over-DllMain.patch"
-"0027-no_sys_if_nametoindex.patch"
 "0028-inode_directory.patch"
 "use-pkgconfig-file-for-intl.patch"
 "skip-broken-timer-test.patch")
 sha256sums=('SKIP'
             'ef81e82e15fb3a71bad770be17fe4fea3f4d9cdee238d6caa39807eeea5da3e3'
             '7b099af0c562f397458542482d6d1debe437f220762aa2ed94b2e6c4d43dd8a6'
-            '5cb481295ff86c2802030984d8b2bf6a3b1dcd5e5fe7b0be68b22d9116305837'
             'f7f06a90156fe0a308412512c359072922f7f0d19dd4bed30d863db18e48940b'
             '1991eaa0471ff8d0b3dd3bccccd560ca6cc8c0995c6145b9bc93d5e90755e3f4'
             'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d')
@@ -36,10 +35,8 @@ pkgver() {
 
 prepare() {
   cd glib
-  git revert -n 6560b37450cd  # Noisy glib-compile-schemas
   patch -Np1 -i .."/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch"
   patch -Np1 -i ../0004-glib-prefer-constructors-over-DllMain.patch
-  patch -Np1 -i ../"0027-no_sys_if_nametoindex.patch"
   patch -Np1 -i ../"0028-inode_directory.patch"
   patch -p0  -i ../use-pkgconfig-file-for-intl.patch
   patch -Np1 -i ../skip-broken-timer-test.patch
@@ -78,3 +75,5 @@ package() {
 		rm -r "$pkgdir/static"
   done
 }
+
+# vim: ts=2 sw=2 et: