From aaa4d46dcb498a50bcf760ca123d1d656e69ca17 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <azagli@libero.it>
Date: Sun, 26 Apr 2015 18:24:53 +0200
Subject: [PATCH] libsecret: aggiornamento a 0.18.2.

---
 packages/mingw-w64-libsecret/001-win.patch    | 54 -------------------
 .../003-mock-service.patch                    | 25 +++++++++
 packages/mingw-w64-libsecret/PKGBUILD         | 18 ++++---
 3 files changed, 36 insertions(+), 61 deletions(-)
 create mode 100644 packages/mingw-w64-libsecret/003-mock-service.patch

diff --git a/packages/mingw-w64-libsecret/001-win.patch b/packages/mingw-w64-libsecret/001-win.patch
index 10aa261..b215e49 100644
--- a/packages/mingw-w64-libsecret/001-win.patch
+++ b/packages/mingw-w64-libsecret/001-win.patch
@@ -100,60 +100,6 @@
  
  libsecret_LIBS = \
  	libsecret-testable.la \
---- libsecret-0.18-orig/libsecret/mock-service.c	2014-03-06 12:47:19.000000000 +0100
-+++ libsecret-0.18/libsecret/mock-service.c	2014-09-04 15:47:43.018633100 +0200
-@@ -17,12 +17,27 @@
- 
- #include "mock-service.h"
- 
-+#ifdef G_OS_WIN32
-+#define WINVER 0x0501
-+#include <io.h>
-+#include <fcntl.h>
-+#include <stddef.h>
-+#include <windows.h>
-+#endif
-+
- #include "secret-private.h"
- 
- #include <errno.h>
- #include <stdio.h>
- #include <string.h>
- 
-+#ifndef G_OS_UNIX
-+#define WIFEXITED(x) 1
-+#define WEXITSTATUS(x) (x)
-+#define WIFSIGNALED(x) 0
-+#define WTERMSIG(x) (x)
-+#endif
-+
- static GTestDBus *test_bus = NULL;
- static GPid pid = 0;
- 
-@@ -52,7 +67,11 @@
- 
- 	g_setenv ("SECRET_SERVICE_BUS_NAME", MOCK_SERVICE_NAME, TRUE);
- 
-+#if defined(G_OS_UNIX)
- 	if (pipe (wait_pipe) < 0) {
-+#elif defined(G_OS_WIN32)
-+	if (_pipe (wait_pipe, 4096, _O_BINARY) < 0) {
-+#endif
- 		g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errno),
- 		                     "Couldn't create pipe for mock service");
- 		return FALSE;
-@@ -103,7 +122,11 @@
- 	if (!pid)
- 		return;
- 
-+#if defined(G_OS_UNIX)
- 	if (kill (pid, SIGTERM) < 0) {
-+#elif defined(G_OS_WIN32)
-+	if (!TerminateProcess (pid, 0)) {
-+#endif
- 		if (errno != ESRCH)
- 			g_warning ("kill() failed: %s", g_strerror (errno));
- 	}
 --- 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
 @@ -19,6 +19,10 @@
diff --git a/packages/mingw-w64-libsecret/003-mock-service.patch b/packages/mingw-w64-libsecret/003-mock-service.patch
new file mode 100644
index 0000000..2e7ee71
--- /dev/null
+++ b/packages/mingw-w64-libsecret/003-mock-service.patch
@@ -0,0 +1,25 @@
+--- ./libsecret/mock-service.c.orig	2015-04-26 17:58:33.836422600 +0200
++++ ./libsecret/mock-service.c	2015-04-26 18:01:50.764406100 +0200
+@@ -19,6 +19,10 @@
+ 
+ #include "secret-private.h"
+ 
++#ifdef G_OS_WIN32
++#include <windows.h>
++#endif
++
+ #include <errno.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -135,7 +139,11 @@
+ 	while (g_main_context_iteration (NULL, FALSE));
+ 
+ 	if (pid) {
++#if defined(G_OS_UNIX)
+ 		if (kill (pid, SIGTERM) < 0) {
++#elif defined(G_OS_WIN32)
++		if (!TerminateProcess (pid, 0)) {
++#endif
+ 			if (errno != ESRCH)
+ 				g_warning ("kill() failed: %s", g_strerror (errno));
+ 		}
diff --git a/packages/mingw-w64-libsecret/PKGBUILD b/packages/mingw-w64-libsecret/PKGBUILD
index a68afac..a92c319 100644
--- a/packages/mingw-w64-libsecret/PKGBUILD
+++ b/packages/mingw-w64-libsecret/PKGBUILD
@@ -2,15 +2,15 @@
 
 _realname=libsecret
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.18
-pkgrel=4
+pkgver=0.18.2
+pkgrel=1
 arch=('any')
 pkgdesc="Secret store (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-libgcrypt"
          "${MINGW_PACKAGE_PREFIX}-mman-win32")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
+             "gtk-doc"
              "${MINGW_PACKAGE_PREFIX}-vala"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
@@ -19,15 +19,19 @@ license=("LGPL 2.1")
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-$pkgver.tar.xz
         001-win.patch
-        002-hack-unixy-paths.patch)
-sha256sums=('0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3'
-            'a356fa355abc17f2fb3cf5c8c25d370d03a8370838bf5ef429ddf420157f0def'
-            'a99a706ee646d13f978a2adc5b848a0b4d74a9f026634ebc43becc657e3a0a4d')
+        002-hack-unixy-paths.patch
+        003-mock-service.patch)
+sha256sums=('12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443'
+            '9eaa49ea5c345122233a5d8f26e61fb4b8885aebffcc5dc67be7ca4a9b0fb5e3'
+            'a99a706ee646d13f978a2adc5b848a0b4d74a9f026634ebc43becc657e3a0a4d'
+            '61b6115784cce52d1931cbb1ee120db659d5df821562be813ed67f2f1abcc58a')
 
 prepare() {
   cd ${_realname}-${pkgver}
+
   patch -p1 -i ${srcdir}/001-win.patch
   patch -p1 -i ${srcdir}/002-hack-unixy-paths.patch
+  patch -p1 -i ${srcdir}/003-mock-service.patch
 
   autoreconf -fi
 }
-- 
2.49.0