From: Andrea Zagli <azagli@libero.it>
Date: Wed, 8 Apr 2015 16:11:12 +0000 (+0200)
Subject: evolution-data-server: rebuild e fix percorso dei locale.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=fffcf9b85f3f01f74cf8908c844316fda1e81dbd;p=msys2

evolution-data-server: rebuild e fix percorso dei locale.
---

diff --git a/packages/mingw-w64-evolution-data-server/003-fix-locale-path.patch b/packages/mingw-w64-evolution-data-server/003-fix-locale-path.patch
new file mode 100644
index 0000000..0dc526b
--- /dev/null
+++ b/packages/mingw-w64-evolution-data-server/003-fix-locale-path.patch
@@ -0,0 +1,66 @@
+--- ./m4/intltool.m4.orig	2015-04-08 14:04:21.671849500 +0200
++++ ./m4/intltool.m4	2015-04-08 14:04:26.072030700 +0200
+@@ -155,31 +155,6 @@
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+ 
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+-  AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([[]],
+-                     [[extern int _nl_msg_cat_cntr;
+-                       return _nl_msg_cat_cntr]])],
+-    [DATADIRNAME=share],
+-    [case $host in
+-    *-*-solaris*)
+-    dnl On Solaris, if bind_textdomain_codeset is in libc,
+-    dnl GNU format message catalog is always supported,
+-    dnl since both are added to the libc all together.
+-    dnl Hence, we'd like to go with DATADIRNAME=share
+-    dnl in this case.
+-    AC_CHECK_FUNC(bind_textdomain_codeset,
+-      [DATADIRNAME=share], [DATADIRNAME=lib])
+-    ;;
+-    *)
+-    [DATADIRNAME=lib]
+-    ;;
+-    esac])
+-fi
+-AC_SUBST(DATADIRNAME)
+-
+ IT_PO_SUBDIR([po])
+ 
+ ])
+--- ./po/Makefile.in.in.orig	2015-04-08 14:03:28.048036500 +0200
++++ ./po/Makefile.in.in	2015-04-08 14:04:03.277039100 +0200
+@@ -33,8 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++localedir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -108,7 +107,7 @@
+ install-data-yes: all
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
++	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkdir_p) $$dir; \
+ 	  if test -r $$lang.gmo; then \
+ 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+@@ -142,8 +141,8 @@
+ uninstall:
+ 	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ 	done
+ 
+ check: all $(GETTEXT_PACKAGE).pot
diff --git a/packages/mingw-w64-evolution-data-server/PKGBUILD b/packages/mingw-w64-evolution-data-server/PKGBUILD
index 3f92fbb..10d2c54 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
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.16.0
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="Evolution database backend server (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
@@ -18,7 +18,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-nspr"
          "${MINGW_PACKAGE_PREFIX}-nss")
 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")
@@ -28,16 +28,19 @@ 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
-        002-enable-introspection.patch)
+        002-enable-introspection.patch
+        003-fix-locale-path.patch)
 sha256sums=('caa3be9c9dda5cbd49ae5daf29cd9597658aa995f3c3ae2ab509bca8c9b217e2'
             '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
-            '01e22dfe9acf80b56b61bcc1a03e5fd5c173ef25def5e489718612ab8a148da6')
+            '01e22dfe9acf80b56b61bcc1a03e5fd5c173ef25def5e489718612ab8a148da6'
+            'be8d1174c65cbe688f80c89da57e2e4889823fd4f22afa14ab19e7e4bc211181')
 
 prepare() {
   cd ${_realname}-${pkgver}
 
   patch -p1 -i ${srcdir}/001-win.patch
   patch -p1 -i ${srcdir}/002-enable-introspection.patch
+  patch -p1 -i ${srcdir}/003-fix-locale-path.patch
 
   autoreconf -fi
 }
@@ -46,6 +49,11 @@ build() {
   mkdir -p build-${MINGW_CHOST}
   cd build-${MINGW_CHOST}
 
+  mkdir -p docs/reference/camel/html
+  cp -rf ../${_realname}-${pkgver}/docs/reference/camel/html/* docs/reference/camel/html
+  mkdir -p docs/reference/eds/html
+  cp -rf ../${_realname}-${pkgver}/docs/reference/eds/html/* docs/reference/eds/html
+
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \