# HG changeset patch
# User John D
# Date 1501770785 14400
# Node ID 5e88d6bf806cf7f94b4b991d88c516c9c7c47857
# Parent  966e35ba2610d9e719db330b9cd818fd4a59ffcc
libidn2: update to 2.0.3

* dist-files.mk: remove ref to patch file

* src/libidn2.mk: update version, checksum, disable docs

* src/libidn2-1-fixes.patch: deleted

diff -r 966e35ba2610 -r 5e88d6bf806c dist-files.mk
--- a/dist-files.mk	Thu Aug 03 10:33:02 2017 -0400
+++ b/dist-files.mk	Thu Aug 03 10:33:05 2017 -0400
@@ -250,7 +250,6 @@
   libidn-1-fixes.patch \
   libidn-test.c \
   libidn.mk \
-  libidn2-1-fixes.patch \
   libidn2.mk \
   libircclient-1-fixes.patch \
   libircclient-test.cpp \
diff -r 966e35ba2610 -r 5e88d6bf806c src/libidn2-1-fixes.patch
--- a/src/libidn2-1-fixes.patch	Thu Aug 03 10:33:02 2017 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Sun, 5 Mar 2017 03:01:18 +0100
-Subject: [PATCH] disable gentr46map.exe
-
-This tool was used to regenerate tr46map_data.c.
-The release has recent version of this file anyway.
-
-diff --git a/Makefile.in b/Makefile.in
-index 1111111..2222222 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -94,7 +94,6 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--noinst_PROGRAMS = gentr46map$(EXEEXT)
- @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/idn2.map
- @HAVE_LD_VERSION_SCRIPT_FALSE@am__append_2 = -export-symbols-regex '^idn2_.*|_idn2_punycode_..code'
- subdir = .
-@@ -198,9 +197,6 @@ libidn2_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libidn2_la_LDFLAGS) $(LDFLAGS) -o $@
- PROGRAMS = $(noinst_PROGRAMS)
--gentr46map_SOURCES = gentr46map.c
--gentr46map_OBJECTS = gentr46map.$(OBJEXT)
--gentr46map_DEPENDENCIES = $(am__DEPENDENCIES_1)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -235,8 +231,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
- am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
- am__v_CCLD_0 = @echo "  CCLD    " $@;
- am__v_CCLD_1 = 
--SOURCES = $(libidn2_la_SOURCES) gentr46map.c
--DIST_SOURCES = $(libidn2_la_SOURCES) gentr46map.c
-+SOURCES = $(libidn2_la_SOURCES)
-+DIST_SOURCES = $(libidn2_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- 	ctags-recursive dvi-recursive html-recursive info-recursive \
- 	install-data-recursive install-dvi-recursive \
-@@ -635,10 +631,9 @@ TR46MAP = IdnaMappingTable.txt
- TR46MAP_URL = http://www.unicode.org/Public/idna/6.3.0/IdnaMappingTable.txt
- NFCQC = DerivedNormalizationProps.txt
- NFCQC_URL = http://www.unicode.org/Public/6.3.0/ucd/DerivedNormalizationProps.txt
--BUILT_SOURCES = data.c tr46map_data.c
-+BUILT_SOURCES = data.c
- DISTCLEANFILES = tr46map_data.c
- MAINTAINERCLEANFILES = $(IDNA_TABLE) $(TR46MAP) $(NFCQC)
--gentr46map_LDADD = $(LTLIBUNISTRING)
- LCOV_INFO = libidn2.info
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -744,10 +739,6 @@ clean-noinstPROGRAMS:
- 	echo " rm -f" $$list; \
- 	rm -f $$list
- 
--gentr46map$(EXEEXT): $(gentr46map_OBJECTS) $(gentr46map_DEPENDENCIES) $(EXTRA_gentr46map_DEPENDENCIES) 
--	@rm -f gentr46map$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(gentr46map_OBJECTS) $(gentr46map_LDADD) $(LIBS)
--
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 
-@@ -759,7 +750,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gentr46map.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idna.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/punycode.Plo@am__quote@
-@@ -1261,10 +1251,6 @@ data.c: $(srcdir)/gen-tables-from-iana.pl $(IDNA_TABLE)
- 	cat $(IDNA_TABLE) | $(srcdir)/gen-tables-from-iana.pl > $@.new
- 	mv $@.new $@
- 
--tr46map_data.c: gentr46map.c gentr46map$(EXEEXT) $(TR46MAP) $(NFCQC)
--	$(builddir)/gentr46map$(EXEEXT) > $@.new
--	mv $@.new $@
--
- $(IDNA_TABLE):
- 	if ! echo "4ebaf0c72061474d20078897d254768d894507de $(IDNA_TABLE)" | sha1sum -c -; then \
- 	  rm -f $(IDNA_TABLE); \
diff -r 966e35ba2610 -r 5e88d6bf806c src/libidn2.mk
--- a/src/libidn2.mk	Thu Aug 03 10:33:02 2017 -0400
+++ b/src/libidn2.mk	Thu Aug 03 10:33:05 2017 -0400
@@ -3,11 +3,11 @@
 
 PKG             := libidn2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.16
-$(PKG)_CHECKSUM := 26311b538897a8ed0569922132f2139ee3ec6a28
+$(PKG)_VERSION  := 2.0.3
+$(PKG)_CHECKSUM := 9264dfafbad5979a9b38d8092e9f3fe6481843ea
 $(PKG)_SUBDIR   := libidn2-$($(PKG)_VERSION)
 $(PKG)_FILE     := libidn2-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := ftp://alpha.gnu.org/gnu/libidn/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE)
 $(PKG)_DEPS     := gettext libiconv libunistring
 
 define $(PKG)_UPDATE
@@ -22,6 +22,7 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
+        --disable-doc \
         && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
     $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'