From 0ce7edb6ba4d510036872507257a5d1e5ebbfd78 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <andrea.zagli@email.it>
Date: Tue, 20 Oct 2015 12:58:08 +0200
Subject: [PATCH] evolution-data-server: aggiornato a 3.18.1.

Riabilitata l'introspection; aggiunta la patch per installare gtk-doc.
---
 .../002-enable-introspection.patch            | 30 -------------------
 .../003-install-gtkdoc.patch                  | 12 ++++++++
 .../mingw-w64-evolution-data-server/PKGBUILD  | 13 ++++----
 3 files changed, 20 insertions(+), 35 deletions(-)
 delete mode 100644 packages/mingw-w64-evolution-data-server/002-enable-introspection.patch
 create mode 100644 packages/mingw-w64-evolution-data-server/003-install-gtkdoc.patch

diff --git a/packages/mingw-w64-evolution-data-server/002-enable-introspection.patch b/packages/mingw-w64-evolution-data-server/002-enable-introspection.patch
deleted file mode 100644
index 2a363ef..0000000
--- a/packages/mingw-w64-evolution-data-server/002-enable-introspection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./addressbook/libebook/Makefile.am.orig	2014-10-04 11:34:37.191511400 +0200
-+++ ./addressbook/libebook/Makefile.am	2014-10-04 11:34:48.870360200 +0200
-@@ -103,6 +103,7 @@
- 	--includedir=$(top_builddir)/libedataserver \
- 	--includedir=$(srcdir) \
- 	$(NULL)
-+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
- 
- if HAVE_INTROSPECTION
- introspection_sources = $(libebook_1_2_la_SOURCES)
---- ./addressbook/libebook-contacts/Makefile.am.orig	2014-10-04 11:34:57.933251400 +0200
-+++ ./addressbook/libebook-contacts/Makefile.am	2014-10-04 11:35:04.560144100 +0200
-@@ -117,6 +117,7 @@
- 	--includedir=$(top_builddir)/libedataserver \
- 	--includedir=$(srcdir) \
- 	$(NULL)
-+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
- 
- if HAVE_INTROSPECTION
- introspection_sources = $(libebook_contacts_1_2_la_SOURCES)
---- ./libedataserver/Makefile.am.orig	2014-10-04 11:32:46.396454000 +0200
-+++ ./libedataserver/Makefile.am	2014-10-04 11:32:57.285989300 +0200
-@@ -221,6 +221,7 @@
- 	--c-include="libedataserver/libedataserver.h" \
- 	$(NULL)
- INTROSPECTION_COMPILER_ARGS =
-+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
- 
- if HAVE_INTROSPECTION
- introspection_sources = \
diff --git a/packages/mingw-w64-evolution-data-server/003-install-gtkdoc.patch b/packages/mingw-w64-evolution-data-server/003-install-gtkdoc.patch
new file mode 100644
index 0000000..9db7a4b
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/003-install-gtkdoc.patch
@@ -0,0 +1,12 @@
+--- ./Makefile.am.orig	2015-10-20 11:29:45.184790900 +0200
++++ ./Makefile.am	2015-10-20 11:29:48.363985300 +0200
+@@ -29,9 +29,7 @@
+ 	po \
+ 	$(NULL)
+ 
+-if ENABLE_GTK_DOC
+ SUBDIRS += docs
+-endif
+ 
+ if BUILD_EXAMPLES
+ SUBDIRS += examples
diff --git a/packages/mingw-w64-evolution-data-server/PKGBUILD b/packages/mingw-w64-evolution-data-server/PKGBUILD
index 1b5ac50..5c83af7 100644
--- a/packages/mingw-w64-evolution-data-server/PKGBUILD
+++ b/packages/mingw-w64-evolution-data-server/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=evolution-data-server
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.18.0
+pkgver=3.18.1
 pkgrel=1
 arch=('any')
 pkgdesc="Evolution database backend server (mingw-w64)"
@@ -29,14 +29,17 @@ license=("LGPL 2.1")
 url="http://www.gnome.org/"
 install=${_realname}-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:4}/${_realname}-${pkgver}.tar.xz
-        001-win.patch)
-sha256sums=('ca4273b888912cadc474c1c2aebd2f02639381a9ddfa516a46cf9abd3dbc11f7'
-            '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd')
+        001-win.patch
+        003-install-gtkdoc.patch)
+sha256sums=('4fe7c520a49d4c7fd67ed6fc2dfb33667f6138368c7bbe3ecd8c4ad2356771bc'
+            '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
+            'aa573f3fc69ddcc877f7a33d4d31e667ca891fcdca4a38e0a16eaa8ec063db70')
 
 prepare() {
   cd ${_realname}-${pkgver}
 
   patch -p1 -i ${srcdir}/001-win.patch
+  patch -p1 -i ${srcdir}/003-install-gtkdoc.patch
 
   autoreconf -fi
 }
@@ -61,7 +64,7 @@ build() {
     --disable-uoa \
     --with-openldap \
     --disable-examples \
-    --disable-introspection
+    --enable-introspection
   make
 }
 
-- 
2.49.0