upgpkg: mingw-w64-recode 3.7.1-1

new upstream release

6 files changed, 106 insertions, 125 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82f68780106f..2717697778d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,27 @@
 # Generated by mksrcinfo v8
-# Fri Apr 14 09:47:45 UTC 2017
+# Wed Mar  6 22:52:02 UTC 2019
 pkgbase = mingw-w64-recode
 	pkgdesc = Converts files between various character sets and usages (mingw-w64)
-	pkgver = 3.6
-	pkgrel = 12
-	url = http://recode.progiciels-bpi.ca/index.html
+	pkgver = 3.7.1
+	pkgrel = 1
+	url = https://github.com/rrthomas/recode
 	arch = any
-	license = GPL
-	license = LGPL
+	license = GPL3
+	license = LGPL3
 	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-configure
+	makedepends = python
 	depends = mingw-w64-crt
 	depends = mingw-w64-gettext
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = recode-3.6.tar.gz::https://github.com/pinard/recode/tarball/v3.6
-	source = http://archive.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz
-	source = recode-3.6-as-if.patch
-	source = recode-3.6-gettextfix.diff
+	source = https://github.com/rrthomas/recode/releases/download/v3.7.1/recode-3.7.1.tar.gz
 	source = autotools.patch
-	source = mingw.patch
-	md5sums = f82e9a6ede9119268c13493c9add2809
-	md5sums = 3716ae269074e31add3d29387ff09438
-	md5sums = fca7484ba332c8ad59eb02334883cd92
-	md5sums = eb602e80a24b5448604bfebeacc55304
-	md5sums = 8680ae965cdcd26f0dea1b8f85c34226
-	md5sums = 515d43fe361a44f576fea310f85472ae
+	source = help2man.patch
+	sha256sums = da1195fce1d1c2887bc32108b4ef4ae09b7bcbe90e87f4f20390c20ca4832508
+	sha256sums = 596e9f287935406b8d68f24ffe999ad3a15e3e81702505745f57b2b05e63b22f
+	sha256sums = ca789328432b01ebe066ca594ac611ca43bd19083ed499e88c4410b15cc8492a
 
 pkgname = mingw-w64-recode
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d1ee5b7481c..20fecd2d3446 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,46 @@
 # Maintainer: Karl-Felix Glatzer <karl.glatzer@gmx.de>
 pkgname=mingw-w64-recode
-pkgver=3.6
-pkgrel=12
+pkgver=3.7.1
+pkgrel=1
 pkgdesc="Converts files between various character sets and usages (mingw-w64)"
 arch=('any')
-url="http://recode.progiciels-bpi.ca/index.html"
-license=('GPL' 'LGPL')
+url='https://github.com/rrthomas/recode'
+license=('GPL3' 'LGPL3')
 depends=('mingw-w64-crt' 'mingw-w64-gettext')
 options=('!strip' '!buildflags' 'staticlibs')
-makedepends=('mingw-w64-gcc')
-source=(recode-${pkgver}.tar.gz::"https://github.com/pinard/recode/tarball/v${pkgver}"
-        'http://archive.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz'
-        'recode-3.6-as-if.patch' 'recode-3.6-gettextfix.diff' 'autotools.patch' 'mingw.patch')
-md5sums=('f82e9a6ede9119268c13493c9add2809'
-         '3716ae269074e31add3d29387ff09438'
-         'fca7484ba332c8ad59eb02334883cd92'
-         'eb602e80a24b5448604bfebeacc55304'
-         '8680ae965cdcd26f0dea1b8f85c34226'
-         '515d43fe361a44f576fea310f85472ae')
+makedepends=('mingw-w64-gcc' 'mingw-w64-configure' 'python')
+source=("https://github.com/rrthomas/recode/releases/download/v${pkgver}/recode-${pkgver}.tar.gz"
+        "autotools.patch"
+        "help2man.patch")
+sha256sums=('da1195fce1d1c2887bc32108b4ef4ae09b7bcbe90e87f4f20390c20ca4832508'
+            '596e9f287935406b8d68f24ffe999ad3a15e3e81702505745f57b2b05e63b22f'
+            'ca789328432b01ebe066ca594ac611ca43bd19083ed499e88c4410b15cc8492a')
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
-  patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
-  patch -Np1 -i ${srcdir}/recode_3.6-17.diff
-  patch -Np1 -i ${srcdir}/autotools.patch
-  patch -Np1 -i ${srcdir}/mingw.patch
-  sed -i '1i#include <stdlib.h>' src/argmatch.c
-  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
-  configure.in src/Makefile.am
-  rm -f acinclude.m4
+  cd ${srcdir}/recode-${pkgver}
+
   autoreconf -fi
   libtoolize
+
+  patch -Np1 -i ${srcdir}/autotools.patch
+  patch -Np1 -i ${srcdir}/help2man.patch
 }
 
 build() {
   for _arch in ${_architectures}; do
-    mkdir -p ${srcdir}/build-${_arch} && cd ${srcdir}/build-${_arch}
-    unset LDFLAGS CPPFLAGS
-    export ac_cv_func_malloc_0_nonnull=yes
-    export jm_cv_func_working_malloc=yes
-    export jm_cv_func_working_realloc=yes
-    ${srcdir}/pinard-Recode-2127b34/configure --prefix=/usr/${_arch} --host=${_arch} \
+    mkdir -p ${srcdir}/recode-${pkgver}/build-${_arch} && cd ${srcdir}/recode-${pkgver}/build-${_arch}
+    ${_arch}-configure \
       --mandir=/usr/${_arch}/share/man \
-      --infodir=/usr/${_arch}/share/info --without-included-gettext
-    make
+      --infodir=/usr/${_arch}/share/info \
+      --without-included-gettext
+    make -j1
   done
 }
 
 package() {
   for _arch in ${_architectures}; do
-    cd ${srcdir}/build-${_arch}
+    cd ${srcdir}/recode-${pkgver}/build-${_arch}
     make DESTDIR="${pkgdir}" install
 
     rm -r "${pkgdir}/usr/${_arch}/share"
diff --git a/autotools.patch b/autotools.patch
index 3ff86b758dc8..a3130f39a498 100644
--- a/autotools.patch
+++ b/autotools.patch
@@ -1,17 +1,38 @@
---- pinard-Recode-2127b34/configure.in	2008-02-19 05:13:35.000000000 +0100
-+++ patched/configure.in	2014-01-01 18:42:41.561811995 +0100
-@@ -15,7 +15,7 @@
- AM_PROG_LIBTOOL
- 
- AC_ISC_POSIX
--AM_C_PROTOTYPES
-+#AM_C_PROTOTYPES
- AC_C_CONST
- AC_C_INLINE
- ad_AC_PROG_FLEX
-@@ -50,5 +50,13 @@
- LTLIBOBJS=`echo $LIBOBJS | sed 's/\.o /.lo /g;s/\.o$/.lo/'`
- AC_SUBST(LTLIBOBJS)
+diff -ruN recode-3.7/build-aux/ltmain.sh patched/build-aux/ltmain.sh
+--- recode-3.7/build-aux/ltmain.sh	2016-02-08 00:39:37.000000000 +0100
++++ patched/build-aux/ltmain.sh	2018-10-04 00:12:57.345230558 +0200
+@@ -7766,6 +7766,12 @@
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
++          case $deplib in
++          *.dll.a)
++	    deplibs="$deplib $deplibs"
++	    continue
++          ;;
++          esac
+ 	  case $linkmode in
+ 	  lib)
+ 	    # Linking convenience modules into shared libraries is allowed,
+diff -ruN recode-3.7/configure patched/configure
+--- recode-3.7/configure	2018-01-30 21:56:07.000000000 +0100
++++ patched/configure	2018-10-03 22:55:29.800468024 +0200
+@@ -7725,7 +7725,8 @@
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+-  if ( file / ) >/dev/null 2>&1; then
++  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+diff -ruN recode-3.7/configure.ac patched/configure.ac
+--- recode-3.7/configure.ac	2018-01-30 21:19:50.000000000 +0100
++++ patched/configure.ac	2018-10-03 22:51:03.225688695 +0200
+@@ -86,5 +86,13 @@
+ AM_GNU_GETTEXT(external)
+ AM_XGETTEXT_OPTION([--from-code=UTF-8])
  
 +LIBRECODE_LDFLAGS=""
 +case "$host_os" in mingw*)
@@ -21,25 +42,30 @@
 +AC_MSG_RESULT([$LIBRECODE_LDFLAGS])
 +AC_SUBST([LIBRECODE_LDFLAGS])
 +
- AC_OUTPUT(Makefile contrib/Makefile doc/Makefile i18n/Makefile lib/Makefile
- libiconv/Makefile m4/Makefile src/Makefile tests/Makefile tests/atconfig)
---- pinard-Recode-2127b34/src/Makefile.am	2008-02-19 05:13:35.000000000 +0100
-+++ patched/src/Makefile.am	2014-01-01 18:18:11.097703291 +0100
-@@ -48,7 +48,7 @@
- librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \
- hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \
- recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS)
+ AC_OUTPUT(Makefile contrib/Makefile doc/Makefile lib/Makefile
+           po/Makefile.in src/Makefile tests/Makefile tests/setup.py)
+diff -ruN recode-3.7/m4/libtool.m4 patched/m4/libtool.m4
+--- recode-3.7/m4/libtool.m4	2016-02-08 00:39:37.000000000 +0100
++++ patched/m4/libtool.m4	2018-10-03 22:55:28.410443103 +0200
+@@ -3480,7 +3480,8 @@
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+   # func_win32_libid shell function, so use a weaker test based on 'objdump',
+   # unless we find 'file', for example because we are cross-compiling.
+-  if ( file / ) >/dev/null 2>&1; then
++  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+     lt_cv_file_magic_cmd='func_win32_libid'
+   else
+diff -ruN recode-3.7/src/Makefile.am patched/src/Makefile.am
+--- recode-3.7/src/Makefile.am	2018-01-30 20:18:23.000000000 +0100
++++ patched/src/Makefile.am	2018-10-03 22:51:03.225688695 +0200
+@@ -56,7 +56,7 @@
+ librecode_la_SOURCES = charname.c combine.c fr-charname.c iconv.c \
+ names.c outer.c recode.c request.c strip-pool.c task.c $(ALL_STEPS) \
+ $(include_HEADERS) $(noinst_HEADERS) $(H_STEPS)
 -librecode_la_LDFLAGS = -version-info 0:0:0
 +librecode_la_LDFLAGS = @LIBRECODE_LDFLAGS@ -version-info 0:0:0
+ librecode_la_LIBADD = ../lib/libgnu.la libmerged.la
  
- INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv
- DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@
-@@ -99,7 +99,7 @@
- 	grep -v '^# *line [0-9]' merged.tm2 > $(srcdir)/merged.c
- 	rm merged.tm1 merged.tm2
- 
--$(srcdir)/recode.1: recode
-+$(srcdir)/recode.1: recode$(EXEEXT)
- 	@if test -r $@ && test ! -w $@; then \
- 	  echo "WARNING: Page \`$@' read only, not updated"; \
- 	elif $(PERL) $(top_srcdir)/doc/help2man --output=$@ ./recode; then \
+ libmerged_la_SOURCES = merged.c
diff --git a/help2man.patch b/help2man.patch
new file mode 100644
index 000000000000..46fc9c86da00
--- /dev/null
+++ b/help2man.patch
@@ -0,0 +1,12 @@
+diff -ruN recode-3.7/src/Makefile.am patched/src/Makefile.am
+--- recode-3.7/src/Makefile.am	2018-10-04 00:47:09.733993844 +0200
++++ patched/src/Makefile.am	2018-10-04 00:45:21.051955465 +0200
+@@ -104,7 +104,7 @@
+ 	$(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \
+ 	  $(top_srcdir)/build-aux/missing --run $(HELP2MAN) \
+ 		--name="converts files between character sets" \
+-		--output=$@ ./recode; \
++		--output=$@ ./recode$(EXEEXT); \
+ 	fi
+ 
+ main.o: main.c ../config.status
diff --git a/recode-3.6-as-if.patch b/recode-3.6-as-if.patch
deleted file mode 100644
index c7bcc27c8750..000000000000
--- a/recode-3.6-as-if.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/283029
-
---- a/m4/flex.m4
-+++ b/m4/flex.m4
-@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
- dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
- AC_DEFUN(ad_AC_PROG_FLEX,
- [AC_CHECK_PROGS(LEX, flex, missing)
--if test "$LEX" = missing; then
-+AS_IF([test "$LEX" = missing], [dnl
-   LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
-   LEX_OUTPUT_ROOT=lex.yy
-   AC_SUBST(LEX_OUTPUT_ROOT)dnl
--else
-+], [:
-   AC_PROG_LEX
-   AC_DECL_YYTEXT
--fi])
-+])])
diff --git a/recode-3.6-gettextfix.diff b/recode-3.6-gettextfix.diff
deleted file mode 100644
index 3b7eb8ba20e6..000000000000
--- a/recode-3.6-gettextfix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/239372
-
-patch by Dmitry Karasik
-
---- recode-3.6/m4/gettext.m4
-+++ recode-3.6/m4/gettext.m4
-@@ -109,12 +109,12 @@
-     else
-       ac_items="$LINGUAS"
-       for ac_item in $ac_items; do
--	case "$ALL_LINGUAS" in
--	  *$ac_item*)
-+        for supported_item in $ALL_LINGUAS; do
-+          if test "$ac_item" = "$supported_item"; then
- 	    ac_print="$ac_print $ac_item"
- 	    MOFILES="$MOFILES $ac_item.mo"
--	    ;;
--	esac
-+          fi
-+        done
-       done
-     fi
-     AC_SUBST(MOFILES)