From 63084785e0cdd0438bc6623ea6f63f4ca11ede75 Mon Sep 17 00:00:00 2001
From: Chaoting Liu <brli@chakralinux.org>
Date: Tue, 17 Jan 2017 09:44:42 +0000
Subject: [PATCH] lib32-gettext: upgrade accordingly

---
 lib32-gettext/PKGBUILD | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/lib32-gettext/PKGBUILD b/lib32-gettext/PKGBUILD
index 39ca2ea..4c57bc9 100644
--- a/lib32-gettext/PKGBUILD
+++ b/lib32-gettext/PKGBUILD
@@ -1,39 +1,19 @@
-# Lib32 Packages for Chakra, part of chakra-project.org
-#
-<<<<<<< HEAD
-# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
-=======
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
-# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
 
 _pkgbasename=gettext
 pkgname=lib32-$_pkgbasename
-<<<<<<< HEAD
-pkgver=0.18.1.1
-=======
-pkgver=0.19.4
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
+pkgver=0.19.8.1
 pkgrel=1
 pkgdesc="GNU internationalization library (32-bit)"
 arch=('x86_64')
 url="http://www.gnu.org/software/gettext/"
 license=('GPL')
-<<<<<<< HEAD
-depends=('lib32-acl' $_pkgbasename)
-makedepends=(gcc-multilib)
-optdepends=('cvs: for autopoint tool')
-options=(!libtool !docs)
-source=(ftp://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('3dd55b952826d2b32f51308f2f91aa89')
-=======
 depends=('lib32-acl' lib32-gcc-libs $_pkgbasename=$pkgver)
-makedepends=(gcc-multilib)
-options=(!libtool !docs)
-source=(ftp://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz{,.sig})
-md5sums=('d3511af1e604a3478900d2c2b4a4a48e'
+makedepends=(gcc)
+options=(!docs)
+source=(https://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz{,.sig})
+md5sums=('97e034cf8ce5ba73a28ff6c3c0638092'
          'SKIP')
 validpgpkeys=(462225C3B46F34879FC8496CD605848ED7E69871)
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
 
 build() {
   export CC="gcc -m32"
@@ -41,13 +21,6 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
-<<<<<<< HEAD
-  sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c
-  ./configure --prefix=/usr --enable-csharp --libdir=/usr/lib32
-  make
-}
-
-=======
   ./configure --prefix=/usr --libdir=/usr/lib32
   make
 }
@@ -55,9 +28,9 @@ build() {
 check() {
  cd "${srcdir}/${_pkgbasename}-${pkgver}"
  make check
+ # FAIL: 9
 }
 
->>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
 package() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
   make DESTDIR="${pkgdir}" install