[packages/crossmingw32-libiconv] - updated to 1.16 - added win32 patch (some constants need both winsock2.h and winerror.h)

[qboosh]

commit d315accba5148836b5a603d9932f65a663aa8462
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Apr 27 18:35:02 2019 +0200

    - updated to 1.16
    - added win32 patch (some constants need both winsock2.h and winerror.h)

 crossmingw32-libiconv.spec | 12 ++++++------
 libiconv-win32.patch       | 10 ++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/crossmingw32-libiconv.spec b/crossmingw32-libiconv.spec
index e955fea..cffb794 100644
--- a/crossmingw32-libiconv.spec
+++ b/crossmingw32-libiconv.spec
@@ -2,12 +2,13 @@ Summary:	Character set conversion library - MinGW32 cross version
 Summary(pl.UTF-8):	Biblioteka konwersji zestawów znaków - wersja skrośna dla MinGW32
 %define		realname   libiconv
 Name:		crossmingw32-%{realname}
-Version:	1.15
+Version:	1.16
 Release:	1
 License:	LGPL v3+
 Group:		Development/Libraries
-Source0:	http://ftp.gnu.org/gnu/libiconv/%{realname}-%{version}.tar.gz
-# Source0-md5:	ace8b5f2db42f7b3b3057585e80d9808
+Source0:	https://ftp.gnu.org/gnu/libiconv/%{realname}-%{version}.tar.gz
+# Source0-md5:	7d2a800b952942bb2880efb00cfd524c
+Patch0:		%{realname}-win32.patch
 URL:		http://www.gnu.org/software/libiconv/
 BuildRequires:	automake
 BuildRequires:	crossmingw32-gcc
@@ -77,6 +78,7 @@ Biblioteki DLL iconv dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
+%patch0 -p1
 
 %build
 cp -f /usr/share/automake/config.sub libcharset/build-aux
@@ -95,15 +97,13 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-# not used on win32
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/charset.alias
 # runtime only
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/iconv.exe
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{doc,locale,man}
diff --git a/libiconv-win32.patch b/libiconv-win32.patch
new file mode 100644
index 0000000..7abd607
--- /dev/null
+++ b/libiconv-win32.patch
@@ -0,0 +1,10 @@
+--- libiconv-1.16/srclib/strerror-override.c.orig	2019-01-06 09:51:41.000000000 +0100
++++ libiconv-1.16/srclib/strerror-override.c	2019-04-27 18:10:42.939685001 +0200
+@@ -25,6 +25,7 @@
+ 
+ #if GNULIB_defined_EWINSOCK /* native Windows platforms */
+ # if HAVE_WINSOCK2_H
++#  include <winerror.h>
+ #  include <winsock2.h>
+ # endif
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-libiconv.git/commitdiff/d315accba5148836b5a603d9932f65a663aa8462