discount: Update to 2.1.8

mingw-w64-discount/PKGBUILD

@@ -2,8 +2,8 @@
 
 _realname=discount
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.1.6
-pkgrel=2
+pkgver=2.1.8
+pkgrel=1
 pkgdesc="A Markdown implementation written in C (mingw-w64)"
 arch=('any')
 url="http://www.pell.portland.or.us/~orc/Code/discount/"
@@ -11,14 +11,14 @@ license=('custom:BSD')
 provides=("${MINGW_PACKAGE_PREFIX}-markdown")
 conflicts=("${MINGW_PACKAGE_PREFIX}-markdown")
 options=('strip' 'staticlibs')
-source=(http://www.pell.portland.or.us/~orc/Code/discount/${_realname}-$pkgver.tar.bz2
+source=(http://www.pell.portland.or.us/~orc/Code/discount/${_realname}-$pkgver.tar.gz
         discount-mingw-building.patch)
-md5sums=('6f44e627777b6392f8f4a3280642482a'
-         '5235a54f0a3e8e61a11c42f3541e9582')
+md5sums=('fcb1e7a3d19c2e666655fa8a28066e76'
+         'f24ced063ce7229bcbdefc18db52b976')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  patch -p0 -i ${srcdir}/discount-mingw-building.patch
+  patch -p1 -i ${srcdir}/discount-mingw-building.patch
 }
 
 build() {

mingw-w64-discount/discount-mingw-building.patch

@@ -1,5 +1,5 @@
---- configure.inc.orig	2013-12-06 10:26:52.855400000 +0400
-+++ configure.inc	2013-12-06 13:49:37.149800000 +0400
+--- discount-2.1.8/configure.inc.orig	2015-01-25 05:07:28.000000000 +0300
++++ discount-2.1.8/configure.inc	2015-03-02 16:26:36.475000000 +0300
 @@ -725,7 +725,11 @@
      if [ "$DEST" ]; then
  	rm -f /tmp/b$$
@@ -13,7 +13,15 @@
  	    TLOG " ($DEST)"
  	    echo "$DEST exists, and ln -s works"
  	    PROG_LN_S="$DEST -s"
-@@ -1207,6 +1211,9 @@
+@@ -876,6 +880,7 @@
+ 	# windows machine; BYTE, WORD, DWORD already
+ 	# defined
+ 	echo "#include <WinDef.h>" >> $__cwd/config.h
++	echo "s;@DWORD@;DWORD;g" >> $__cwd/config.sub
+ 	TLOG " (defined in WinDef.h)"
+ 	return 0
+     fi
+@@ -1218,6 +1223,9 @@
      AC_PROG_CC
  
      LOGN "checking for C compiler option to produce PIC "
@@ -23,7 +31,7 @@
      echo "int some_variable = 0;" > ngc$$.c 
  
      if $AC_CC -c -fPIC -o ngc$$ ngc$$.c $LIBS; then
-@@ -1219,6 +1226,7 @@
+@@ -1230,6 +1238,7 @@
      fi
      __remove ngc$$ ngc$$.c
      return $__rc
@@ -31,7 +39,7 @@
  }
  
  
-@@ -1311,6 +1319,41 @@
+@@ -1322,6 +1331,41 @@
      chmod +x librarian.sh
  }
  
@@ -73,7 +81,7 @@
  
  #
  # AC_CC_SHLIBS checks if the C compiler can produce shared libraries
-@@ -1335,6 +1378,10 @@
+@@ -1346,6 +1390,10 @@
  	    LOG "(no)"
  	    __rc=1
  	fi
@@ -84,3 +92,24 @@
      elif $AC_CC $AC_PICFLAG -shared -o ngc$$.so ngc$$.c; then
  	__AC_ELF_LIBRARIAN
          LOG "(yes; -shared)"
+@@ -1402,7 +1450,7 @@
+ 
+     AC_SUB 'INSTALL' "$PROG_INSTALL"
+     AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
+-    AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
++    AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 644"
+ 
+     # finally build a little directory installer
+     # if mkdir -p works, use that, otherwise use install -d,
+--- discount-2.1.8/mkdio.h.in.orig	2015-03-02 16:30:39.824800000 +0300
++++ discount-2.1.8/mkdio.h.in	2015-03-02 16:33:45.267200000 +0300
+@@ -2,6 +2,9 @@
+ #define _MKDIO_D
+ 
+ #include <stdio.h>
++#ifdef _WIN32
++#include <windef.h>
++#endif
+ 
+ typedef void MMIOT;
+