From f53ddefa32d0175ebb471463015821269a2cedb3 Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Thu, 23 Apr 2015 07:18:49 +0300
Subject: [PATCH] libyaml: Update to 0.1.6

---
 .../0002-libyaml-no-undefined.patch           |  9 ++++
 mingw-w64-libyaml/PKGBUILD                    | 47 ++++++++++---------
 2 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 mingw-w64-libyaml/0002-libyaml-no-undefined.patch

diff --git a/mingw-w64-libyaml/0002-libyaml-no-undefined.patch b/mingw-w64-libyaml/0002-libyaml-no-undefined.patch
new file mode 100644
index 0000000000..30c71238e7
--- /dev/null
+++ b/mingw-w64-libyaml/0002-libyaml-no-undefined.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile.am	2015-04-22 14:10:00.418785980 +0200
++++ b/src/Makefile.am	2015-04-22 14:10:10.562836277 +0200
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include -DYAML_DECLARE_EXPORT
+ lib_LTLIBRARIES = libyaml.la
+ libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
+-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
++libyaml_la_LDFLAGS = -no-undefined -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
diff --git a/mingw-w64-libyaml/PKGBUILD b/mingw-w64-libyaml/PKGBUILD
index 10a251900a..ac00532f64 100644
--- a/mingw-w64-libyaml/PKGBUILD
+++ b/mingw-w64-libyaml/PKGBUILD
@@ -1,41 +1,44 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 _realname=libyaml
-
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.1.4
-pkgrel=2
+pkgver=0.1.6
+pkgrel=1
 pkgdesc="YAML 1.1 library (mingw-w64)"
 arch=('any')
 url="http://pyyaml.org/wiki/LibYAML"
 license=("MIT")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config")
 options=('staticlibs' 'strip')
-source=("http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz"
-"0001-Proper-mingw-YAML_DECLARE-definition.patch")
-md5sums=('36c852831d02cf90508c29852361d01b'
-         '62993ee836b420adc99bc42dff09436b')
+source=(https://bitbucket.org/xi/libyaml/get/$pkgver.tar.bz2
+        "0001-Proper-mingw-YAML_DECLARE-definition.patch"
+        "0002-libyaml-no-undefined.patch")
+md5sums=('5b2d2f8c889fed55e98d6b1a0a89f607'
+         '62993ee836b420adc99bc42dff09436b'
+         'fb8fcb80f89abeee56310b2568749276')
 
 prepare() {
-    cd "$srcdir/yaml-$pkgver"
-    patch -Np1 -i "$srcdir/0001-Proper-mingw-YAML_DECLARE-definition.patch"
+  cd ${srcdir}/xi-libyaml-*
+  patch -Np1 -i "$srcdir/0001-Proper-mingw-YAML_DECLARE-definition.patch"
+  patch -Np1 -i "$srcdir/0002-libyaml-no-undefined.patch"
+  
+  autoreconf -fiv
 }
 
 build() {
-    mkdir -p "${srcdir}/${_realname}-${pkgver}-build-${CARCH}"
-    cd "${srcdir}/${_realname}-${pkgver}-build-${CARCH}"
-    "${srcdir}"/yaml-$pkgver/configure \
-      --prefix=${MINGW_PREFIX} \
-      --build=${MINGW_CHOST} \
-      --host=${MINGW_CHOST} \
-      --target=${MINGW_CHOST}
-    make
-    gcc -shared src/.libs/*.o -o libyaml.dll -Xlinker --out-implib -Xlinker libyaml.dll.a
+  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
+  mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
+
+  ../xi-libyaml-*/configure \
+    --prefix=${MINGW_PREFIX} \
+    --build=${MINGW_CHOST} \
+    --host=${MINGW_CHOST} \
+    --target=${MINGW_CHOST}
+
+  make
 }
 
 package() {
-    cd "${srcdir}/${_realname}-${pkgver}-build-${CARCH}"
-    make DESTDIR="$pkgdir" install
-    install -Dm644 "libyaml.dll" "${pkgdir}${MINGW_PREFIX}/bin/libyaml.dll"
-    install -m644 "libyaml.dll.a" "${pkgdir}${MINGW_PREFIX}/lib/libyaml.dll.a"
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR="$pkgdir" install
 }