From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Tue, 16 Jun 2015 09:05:20 +0000 (+0200)
Subject: evolution-data-server: aggiornamento a 3.16.3.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=a92d3ece9edf923f641ab3e7bcc3554d80ba605e;p=msys2

evolution-data-server: aggiornamento a 3.16.3.
---

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
deleted file mode 100644
index 0dc526b..0000000
--- a/packages/mingw-w64-evolution-data-server/003-fix-locale-path.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./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 8ae0197..baafa3d 100644
--- a/packages/mingw-w64-evolution-data-server/PKGBUILD
+++ b/packages/mingw-w64-evolution-data-server/PKGBUILD
@@ -2,7 +2,7 @@
 
 _realname=evolution-data-server
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.16.2
+pkgver=3.16.3
 pkgrel=1
 arch=('any')
 pkgdesc="Evolution database backend server (mingw-w64)"
@@ -28,19 +28,16 @@ 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
-        003-fix-locale-path.patch)
-sha256sums=('6e3da8a553b803571eb4ecf1e412da45bf4f2325e446fc23bffa2b2718d6b8b1'
+        002-enable-introspection.patch)
+sha256sums=('ee68a114012a7410559e712a0603f0ae7734a34f15c224da9cb7088829dcaca5'
             '440994245ea2c9bb1260d348c3c756751d9f687dccb418ff7365fd2894546cfd'
-            '01e22dfe9acf80b56b61bcc1a03e5fd5c173ef25def5e489718612ab8a148da6'
-            'be8d1174c65cbe688f80c89da57e2e4889823fd4f22afa14ab19e7e4bc211181')
+            '01e22dfe9acf80b56b61bcc1a03e5fd5c173ef25def5e489718612ab8a148da6')
 
 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
 }