From fc32d6f55207eed1cefce7c22fd60ff0169cd340 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Wed, 24 Sep 2014 07:18:52 +0400
Subject: [PATCH] gobject-introspection: Update to 1.42.0

---
 .../0060-fix-import-module.patch               | 16 ----------------
 mingw-w64-gobject-introspection/PKGBUILD       | 18 +++++++-----------
 2 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 mingw-w64-gobject-introspection/0060-fix-import-module.patch

diff --git a/mingw-w64-gobject-introspection/0060-fix-import-module.patch b/mingw-w64-gobject-introspection/0060-fix-import-module.patch
deleted file mode 100644
index dcbec76115..0000000000
--- a/mingw-w64-gobject-introspection/0060-fix-import-module.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
-index 63110a2..1c66aac 100644
---- a/giscanner/ccompiler.py
-+++ b/giscanner/ccompiler.py
-@@ -135,9 +135,9 @@ class CCompiler(object):
-         # When we are not using Visual C++ (i.e. we are using GCC)...
-         else:
-             is_msvc = False
--            libtool = get_libtool_command(options)
-+            libtool = utils.get_libtool_command(options)
-             if libtool:
--                args.append(which(os.environ.get('SHELL', 'sh.exe')))
-+                args.append(utils.which(os.environ.get('SHELL', 'sh.exe')))
-                 args.extend(libtool)
-                 args.append('--mode=execute')
-             # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe)
diff --git a/mingw-w64-gobject-introspection/PKGBUILD b/mingw-w64-gobject-introspection/PKGBUILD
index 3aee11c706..09b3a861a9 100644
--- a/mingw-w64-gobject-introspection/PKGBUILD
+++ b/mingw-w64-gobject-introspection/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=gobject-introspection
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.41.91
+pkgver=1.42.0
 pkgrel=1
 pkgdesc="GObject Introspection can scan C header and source files in order to generate introspection typelib files (mingw-w64)"
 arch=('any')
@@ -18,19 +18,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
 options=('strip' 'staticlibs')
 
 source=(http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/${pkgver%.*}/${_realname}-${pkgver}.tar.xz
-    0018-debug-rmtree-errors.mingw.patch
-    0021-tests-no-undefined.patch
-    0050-dont-load-msvcrt.patch
-    0055-fix-python-detection.patch
-    0060-fix-import-module.patch
-    )
+        0018-debug-rmtree-errors.mingw.patch
+        0021-tests-no-undefined.patch
+        0050-dont-load-msvcrt.patch
+        0055-fix-python-detection.patch)
 
-md5sums=('13c744adc4621d073cba9802ed9a54fd'
+md5sums=('4fa52f6b67367d9c1b99b98683ced202'
          'f0ecde986ebf1f0e28b752f9c36fb6c1'
          '69ef34e2f57abc8afe1b9f6fa3786e97'
          'e3598d539258678eef8dde2216419faf'
-         '6d809bf266e42a20b31a7acbaf0384d1'
-         '51a1d5f028d5881551bf8cd4df91a201')
+         '6d809bf266e42a20b31a7acbaf0384d1')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
@@ -38,7 +35,6 @@ prepare() {
   patch -p1 -i ${srcdir}/0021-tests-no-undefined.patch
   patch -p1 -i ${srcdir}/0050-dont-load-msvcrt.patch
   patch -p1 -i ${srcdir}/0055-fix-python-detection.patch
-  patch -p1 -i ${srcdir}/0060-fix-import-module.patch
 
   autoreconf -fi
 }