From ee6ee6293d3306f635ccea9cb2b3f038dfcd22e9 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <andrea.zagli.free@gmail.com>
Date: Wed, 7 Jun 2017 21:50:44 +0200
Subject: [PATCH] template-glib: updated to 3.25.2. (#2562)

---
 mingw-w64-template-glib-git/001-win.patch | 19 -------
 mingw-w64-template-glib-git/PKGBUILD      | 60 -----------------------
 mingw-w64-template-glib/PKGBUILD          | 46 +++++++++++++++++
 3 files changed, 46 insertions(+), 79 deletions(-)
 delete mode 100644 mingw-w64-template-glib-git/001-win.patch
 delete mode 100644 mingw-w64-template-glib-git/PKGBUILD
 create mode 100644 mingw-w64-template-glib/PKGBUILD

diff --git a/mingw-w64-template-glib-git/001-win.patch b/mingw-w64-template-glib-git/001-win.patch
deleted file mode 100644
index 0b5f9bab75..0000000000
--- a/mingw-w64-template-glib-git/001-win.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./examples/Makefile.am.orig	2016-04-18 21:11:15.234531300 +0200
-+++ ./examples/Makefile.am	2016-04-18 21:11:48.046203700 +0200
-@@ -6,14 +6,14 @@
- noinst_PROGRAMS = simple
- 
- simple_SOURCES = simple.c
--simple_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src
-+simple_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src
- simple_LDADD = $(top_builddir)/src/libtemplate-glib-1.0.la
- 
- if ENABLE_VAPIGEN
- noinst_PROGRAMS += simple-vala
- 
- simple_vala_SOURCES = simple-vala.vala
--simple_vala_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src
-+simple_vala_CFLAGS = $(TMPL_CFLAGS) -I$(top_srcdir)/src -I$(top_builddir)/src
- simple_vala_LDADD = $(top_builddir)/src/libtemplate-glib-1.0.la
- simple_vala_VALAFLAGS = \
- 	--vapidir $(top_builddir)/src \
diff --git a/mingw-w64-template-glib-git/PKGBUILD b/mingw-w64-template-glib-git/PKGBUILD
deleted file mode 100644
index 6ab8296854..0000000000
--- a/mingw-w64-template-glib-git/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
-
-_realname=template-glib
-_base_ver=3.19.4
-pkgbase=mingw-w64-${_realname}-git
-pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
-pkgver=3.19.4.49.f2435ac
-pkgrel=1
-arch=('any')
-pkgdesc="A templating library for GLib (mingw-w64)"
-depends=("${MINGW_PACKAGE_PREFIX}-glib2"
-         "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-             "gtk-doc"
-             "flex"
-             "bison"
-             "autoconf-archive")
-options=('!strip' 'debug' 'staticlibs')
-license=("LGPL 2.1")
-url="http://www.gnome.org/"
-source=(git+http://git.gnome.org/browse/${_realname}
-        001-win.patch)
-sha256sums=('SKIP'
-            'c20511d44927c23f26641949ee4b9b4010c52d624b1818e2fe1a007e10fa850a')
-
-pkgver() {
-  cd "$srcdir/$_realname"
-  printf "%s.%s.%s" "${_base_ver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd ${_realname}
-
-  patch -b -V simple -p1 -i ${srcdir}/001-win.patch
-
-  aclocal --install -I build-aux || exit 1
-  gtkdocize || exit 1
-  autoreconf --force --install -Wno-portability || exit 1
-}
-
-build() {
-  mkdir -p build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
-
-  ../${_realname}/configure \
-    --host=${MINGW_CHOST} \
-    --target=${MINGW_CHOST} \
-    --build=${MINGW_CHOST} \
-    --prefix=${MINGW_PREFIX} \
-    --libexecdir=${MINGW_PREFIX}/lib \
-    --enable-vala=no
-  make
-}
-
-package() {
-  cd "$srcdir/build-${MINGW_CHOST}"
-  make DESTDIR=$pkgdir install
-
-  install -Dm644 "${srcdir}/${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
-}
diff --git a/mingw-w64-template-glib/PKGBUILD b/mingw-w64-template-glib/PKGBUILD
new file mode 100644
index 0000000000..472337a693
--- /dev/null
+++ b/mingw-w64-template-glib/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Andrea Zagli <andrea.zagli.free@gmail.com>
+
+_realname=template-glib
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=3.25.2
+pkgrel=1
+arch=('any')
+pkgdesc="A templating library for GLib (mingw-w64)"
+depends=("${MINGW_PACKAGE_PREFIX}-glib2"
+         "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
+makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
+             "gtk-doc"
+             "flex"
+             "bison"
+             "autoconf-archive")
+options=('!strip' 'debug' 'staticlibs')
+license=("LGPL 2.1")
+url="http://www.gnome.org/"
+source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
+sha256sums=('43d3cc81ffdd8f6cb49f8bd6bec63c52b82c56f386013643e95c5450d086313f')
+
+prepare() {
+  cd ${_realname}-${pkgver}
+
+}
+
+build() {
+  mkdir -p build-${MINGW_CHOST}
+  cd build-${MINGW_CHOST}
+
+  meson.py \
+    --buildtype plain \
+    -Dwith_introspection=false \
+    ../${_realname}-${pkgver}
+
+  ninja
+}
+
+package() {
+  cd "$srcdir/build-${MINGW_CHOST}"
+  DESTDIR=${pkgdir}${MINGW_PREFIX} ninja install
+
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+}