Merge pull request #2942 from lazka/libidn2-cleanup

libidn2: cleanup

libidn2/PKGBUILD

@@ -3,25 +3,21 @@
 pkgbase=libidn2
 pkgname=('libidn2' 'libidn2-devel')
 _basever=2.3.2
-_subver=
-pkgver=${_basever}${_subver}
-pkgrel=1
+pkgver=${_basever}
+pkgrel=2
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="https://www.gnu.org/software/libidn/"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
-makedepends=('gcc' 'texinfo' 'libunistring-devel' 'gtk-doc' 'autotools')
+makedepends=('gcc' 'texinfo' 'libunistring-devel' 'gettext-devel' 'gtk-doc' 'autotools')
 options=('!libtool' 'staticlibs')
-source=(https://ftp.gnu.org/gnu/libidn/${pkgname}-${pkgver}.tar.gz{,.sig}
-        libidn2-2.1.0-msys2.patch)
+source=(https://ftp.gnu.org/gnu/libidn/${pkgname}-${pkgver}.tar.gz{,.sig})
 sha256sums=('76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91'
-            'SKIP'
-            'fe42d024e9e4bd0d8abdab43b48ad4812a0a42f6a99f01f9862a3b9c03d1577d')
+            'SKIP')
 validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # Simon Josefsson <simon@josefsson.org>
 
 prepare() {
   cd ${srcdir}/${pkgname}-${_basever}
-  patch -p1 -i ${srcdir}/libidn2-2.1.0-msys2.patch
 
   autoreconf -ivf
 }
@@ -30,9 +26,11 @@ build() {
   [[ -d ${srcdir}/build-${CHOST} ]] && rm -rf ${srcdir}/build-${CHOST}
   mkdir ${srcdir}/build-${CHOST}
   cd ${srcdir}/build-${CHOST}
+
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ../${pkgname}-${_basever}/configure \
     --prefix=/usr \
-    --build=${CHOST} \
+    --build=${CYGWIN_CHOST} \
     --enable-shared \
     --enable-static
   make
@@ -41,8 +39,7 @@ build() {
 
 package_libidn2() {
   groups=('libraries')
-  depends=('info' 'libunistring')
-  install=libidn2.install
+  depends=('libunistring' 'libintl')
 
   mkdir -p ${pkgdir}/usr/bin
   cp -f ${srcdir}/dest-${CHOST}/usr/bin/*.dll ${pkgdir}/usr/bin/

libidn2/libidn2-2.1.0-msys2.patch

@@ -1,72 +0,0 @@
---- libidn2-2.3.2/build-aux/config.guess.orig	2021-08-26 06:39:53.435974200 +0200
-+++ libidn2-2.3.2/build-aux/config.guess	2021-08-26 06:43:28.455774200 +0200
-@@ -947,6 +947,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	GUESS=x86_64-pc-cygwin
- 	;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	GUESS=x86_64-pc-msys
-+	;;
-     prep*:SunOS:5.*:*)
- 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
- 	GUESS=powerpcle-unknown-solaris2$SUN_REL
-diff -Naur libidn2-2.1.0-orig/build-aux/config.rpath libidn2-2.1.0/build-aux/config.rpath
---- libidn2-2.1.0-orig/build-aux/config.rpath	2019-01-04 21:40:28.000000000 +0300
-+++ libidn2-2.1.0/build-aux/config.rpath	2019-01-14 11:49:38.068930800 +0300
-@@ -57,7 +57,7 @@
-     aix*)
-       wl='-Wl,'
-       ;;
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       ;;
-     hpux9* | hpux10* | hpux11*)
-       wl='-Wl,'
-@@ -149,7 +149,7 @@
- hardcode_minus_L=no
- 
- case "$host_os" in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -198,7 +198,7 @@
-         ld_shlibs=no
-       fi
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -348,7 +348,7 @@
-       ;;
-     bsdi[45]*)
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -533,7 +533,7 @@
-   bsdi[45]*)
-     library_names_spec='$libname$shrext'
-     ;;
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     shrext=.dll
-     library_names_spec='$libname.dll.a $libname.lib'
-     ;;
-diff -Naur libidn2-2.1.0-orig/m4/double-slash-root.m4 libidn2-2.1.0/m4/double-slash-root.m4
---- libidn2-2.1.0-orig/m4/double-slash-root.m4	2019-01-04 21:26:17.000000000 +0300
-+++ libidn2-2.1.0/m4/double-slash-root.m4	2019-01-14 11:49:38.084530800 +0300
-@@ -16,7 +16,7 @@
-         # special semantics and is distinct from /, please report it to
-         # <bug-gnulib@gnu.org>.
-         case $host in
--          *-cygwin | i370-ibm-openedition)
-+          *-cygwin | *-msys | i370-ibm-openedition)
-             gl_cv_double_slash_root=yes ;;
-           *)
-             # Be optimistic and assume that / and // are the same when we

libidn2/libidn2.install

@@ -1,26 +0,0 @@
-info_dir=usr/share/info
-info_files="libidn2.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  local oldIFS=$IFS
-  IFS=" "
-  for file in ${info_files}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-  IFS=$oldIFS
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  local oldIFS=$IFS
-  IFS=" "
-  for file in ${info_files}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-  IFS=$oldIFS
-}