From 093918434e7e61c2d1d229250181683b8cc5d809 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Mon, 28 Sep 2015 11:11:25 +0200
Subject: [PATCH] libsecret: rebuild senza patch introspection.

---
 packages/mingw-w64-libsecret/001-win.patch | 56 +++++++++++-----------
 packages/mingw-w64-libsecret/PKGBUILD      |  4 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/packages/mingw-w64-libsecret/001-win.patch b/packages/mingw-w64-libsecret/001-win.patch
index b215e49..5a644e5 100644
--- a/packages/mingw-w64-libsecret/001-win.patch
+++ b/packages/mingw-w64-libsecret/001-win.patch
@@ -1,5 +1,5 @@
---- libsecret-0.18-orig/configure.ac	2014-03-06 12:47:18.000000000 +0100
-+++ libsecret-0.18/configure.ac	2014-09-04 15:44:52.791144000 +0200
+--- ./configure.ac.orig	2015-08-03 08:55:35.000000000 +0200
++++ ./configure.ac	2015-09-28 10:40:51.168825800 +0200
 @@ -79,12 +79,21 @@
  AC_CHECK_FUNCS(mlock)
  
@@ -24,18 +24,19 @@
  LIBS="$LIBS $GLIB_LIBS"
  CFLAGS="$CFLAGS $GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB_MIN -DGLIB_VERSION_MAX_ALLOWED=$GLIB_MAX"
  
---- libsecret-0.18-orig/Makefile.am	2014-03-06 12:47:17.000000000 +0100
-+++ libsecret-0.18/Makefile.am	2014-09-05 17:44:29.308119200 +0200
-@@ -139,6 +139,7 @@
- INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all \
- 	--add-include-path=$(srcdir) --add-include-path=$(builddir)
- INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(builddir)
-+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
+--- ./egg/egg-secure-memory.c.orig	2014-09-23 09:49:21.000000000 +0200
++++ ./egg/egg-secure-memory.c	2015-09-28 10:40:51.176816500 +0200
+@@ -913,7 +913,7 @@
+ 	DEBUG_ALLOC ("gkr-secure-memory: freed block ", sz);
  
- girdir = $(datadir)/gir-1.0
- gir_DATA =
---- libsecret-0.18-orig/egg/Makefile.am	2014-03-06 12:47:18.000000000 +0100
-+++ libsecret-0.18/egg/Makefile.am	2014-09-04 18:06:38.909344200 +0200
+ #else
+-	ASSERT (FALSE);
++	ASSERT (0);
+ #endif
+ }
+ 
+--- ./egg/Makefile.am.orig	2014-09-23 09:49:21.000000000 +0200
++++ ./egg/Makefile.am	2015-09-28 10:40:51.173829100 +0200
 @@ -20,7 +20,8 @@
  egg_LIBS =  \
  	libegg.la \
@@ -46,19 +47,8 @@
  
  egg_TESTS = \
  	test-hex \
---- libsecret-0.18-orig/egg/egg-secure-memory.c	2014-03-06 12:47:18.000000000 +0100
-+++ libsecret-0.18/egg/egg-secure-memory.c	2014-09-04 17:14:43.197799300 +0200
-@@ -913,7 +913,7 @@
- 	DEBUG_ALLOC ("gkr-secure-memory: freed block ", sz);
- 
- #else
--	ASSERT (FALSE);
-+	ASSERT (0);
- #endif
- }
- 
---- libsecret-0.18-orig/libsecret/Makefile.am	2014-03-06 12:47:19.000000000 +0100
-+++ libsecret-0.18/libsecret/Makefile.am	2014-09-04 20:39:25.136346600 +0200
+--- ./libsecret/Makefile.am.orig	2014-09-23 09:49:21.000000000 +0200
++++ ./libsecret/Makefile.am	2015-09-28 10:40:51.179818700 +0200
 @@ -68,7 +68,8 @@
  libsecret_@SECRET_MAJOR@_la_LIBADD = \
  	libegg.la \
@@ -100,8 +90,18 @@
  
  libsecret_LIBS = \
  	libsecret-testable.la \
---- libsecret-0.18-orig/tool/secret-tool.c	2014-03-06 12:47:20.000000000 +0100
-+++ libsecret-0.18/tool/secret-tool.c	2014-09-04 15:49:29.453198400 +0200
+--- ./Makefile.am.orig	2015-04-28 15:43:36.000000000 +0200
++++ ./Makefile.am	2015-09-28 10:40:51.171812600 +0200
+@@ -139,6 +139,7 @@
+ INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --warn-all \
+ 	--add-include-path=$(srcdir) --add-include-path=$(builddir)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(builddir)
++INTROSPECTION_SCANNER_ENV = CC="$(CC)"
+ 
+ girdir = $(datadir)/gir-1.0
+ gir_DATA =
+--- ./tool/secret-tool.c.orig	2014-09-23 09:49:21.000000000 +0200
++++ ./tool/secret-tool.c	2015-09-28 10:40:51.182820800 +0200
 @@ -19,6 +19,10 @@
  #include "libsecret/secret-service.h"
  #include "libsecret/secret-value.h"
diff --git a/packages/mingw-w64-libsecret/PKGBUILD b/packages/mingw-w64-libsecret/PKGBUILD
index 44af41b..a7d9857 100644
--- a/packages/mingw-w64-libsecret/PKGBUILD
+++ b/packages/mingw-w64-libsecret/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=libsecret
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.18.3
-pkgrel=2
+pkgrel=3
 arch=('any')
 pkgdesc="Secret store (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
@@ -22,7 +22,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_rea
         002-hack-unixy-paths.patch
         003-mock-service.patch)
 sha256sums=('f2bf1d0c5ab4640664f3e3c7ef6b086c180e50ff415720b5e22f96750dbf84c9'
-            '9eaa49ea5c345122233a5d8f26e61fb4b8885aebffcc5dc67be7ca4a9b0fb5e3'
+            'c50b68556b3aaa4ed2362c64f89246d2d2176c85a61241d32a45bf4331be0cd9'
             'a99a706ee646d13f978a2adc5b848a0b4d74a9f026634ebc43becc657e3a0a4d'
             '61b6115784cce52d1931cbb1ee120db659d5df821562be813ed67f2f1abcc58a')
 
-- 
2.49.0