Merge pull request #2999 from lazka/libunistring-1.0

libunistring: Update to 1.0

gnutls/PKGBUILD

@@ -4,7 +4,7 @@ pkgbase=gnutls
 pkgname=('gnutls' 'libgnutls' 'libgnutls-devel')
 _base_ver=3.7.5
 pkgver=${_base_ver}
-pkgrel=1
+pkgrel=2
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64' 'i686')
 license=('GPL3' 'LGPL2.1')

guile/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=guile
 pkgname=("$pkgbase" "lib${pkgbase}" "lib${pkgbase}-devel")
 pkgver=2.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="a portable, embeddable Scheme implementation written in C"
 url="https://www.gnu.org/software/guile/"
 arch=(i686 x86_64)
@@ -60,8 +60,7 @@ build() {
 }
 
 package_guile() {
-  depends=("libguile=${pkgver}" 'info')
+  depends=("libguile=${pkgver}")
-  install=${pkgbase}.install
 
   mkdir -p ${pkgdir}/usr/bin
   cp -rf ${srcdir}/dest/usr/bin ${pkgdir}/usr/

guile/guile.install

@@ -1,31 +0,0 @@
-infodir=/usr/share/info
-filelist="guile.info
-          guile.info-1
-          guile.info-2
-          guile.info-3
-          guile.info-4
-          guile.info-5
-          guile.info-6
-          guile.info-7
-          guile.info-8
-          guile.info-9
-          guile.info-10
-          r5rs.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}

libidn2/PKGBUILD

@@ -4,7 +4,7 @@ pkgbase=libidn2
 pkgname=('libidn2' 'libidn2-devel')
 _basever=2.3.2
 pkgver=${_basever}
-pkgrel=2
+pkgrel=3
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="https://www.gnu.org/software/libidn/"
 arch=('i686' 'x86_64')

libpsl/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=libpsl
 pkgname=("${pkgbase}" "${pkgbase}-devel")
 pkgver=0.21.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Public Suffix List library'
 url='https://github.com/rockdaboot/libpsl'
 arch=('i686' 'x86_64')

libunistring/PKGBUILD

@@ -1,22 +1,25 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=('libunistring' 'libunistring-devel')
-pkgver=0.9.10
+pkgver=1.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Library for manipulating Unicode strings and C strings."
 url="https://www.gnu.org/software/libunistring/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libiconv')
 makedepends=('libiconv-devel' 'autotools' 'gcc')
-source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
         libunistring-0.9.3-2.src.patch)
-sha256sums=('a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b'
+sha256sums=('5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741'
-            '8b00b7960b3e2f2e0db1f65bd2b2fea8eb36de98f48a40c8520d8fb00b57f249')
+            'SKIP'
+            'a30d2733981e001e60992d188f145831cd1578bf3cd44bcfe46feaba415abd2b')
+validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871'  # Daiki Ueno <ueno@unixuser.org>
+              '9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) <bruno@clisp.org>
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p2 -i ${srcdir}/libunistring-0.9.3-2.src.patch
+  patch -p1 -i ${srcdir}/libunistring-0.9.3-2.src.patch
 
   autoreconf -fi
 }

libunistring/libunistring-0.9.3-2.src.patch

@@ -1,5 +1,5 @@
---- origsrc/libunistring-0.9.3/configure.ac	2010-03-29 04:35:26.000000000 +0200
+--- libunistring-0.9.3/configure.ac	2010-03-29 04:35:26.000000000 +0200
-+++ src/libunistring-0.9.3/configure.ac	2011-10-07 17:42:13.943985300 +0200
++++ libunistring-0.9.3/configure.ac	2011-10-07 17:42:13.943985300 +0200
 @@ -61,7 +61,7 @@ LT_LANG([Windows Resource])
  dnl On mingw and Cygwin, we can activate special Makefile rules which add
  dnl version information to the shared libraries and executables.
@@ -18,14 +18,26 @@
      *) is_woe32dll=no ;;
    esac
  else
---- origsrc/libunistring-0.9.3/m4/woe32-dll.m4	2009-04-19 20:00:22.000000000 +0200
+--- libunistring-1.0/m4/woe32-dll.m4.orig	2022-05-13 23:14:12.117697400 +0200
-+++ src/libunistring-0.9.3/m4/woe32-dll.m4	2011-10-07 17:42:13.959585300 +0200
++++ libunistring-1.0/m4/woe32-dll.m4	2022-05-13 23:14:53.500794800 +0200
-@@ -29,7 +29,7 @@ AC_DEFUN([gl_WOE32_DLL],
+@@ -30,7 +30,7 @@
  [
    AC_REQUIRE([AC_CANONICAL_HOST])
    case "$host_os" in
 -    mingw* | cygwin*)
 +    mingw*)
-       AC_MSG_CHECKING([for auto-import of symbols])
+       AC_CACHE_CHECK([for auto-import of symbols],
-       AC_CACHE_VAL([gl_cv_ld_autoimport], [
+         [gl_cv_ld_autoimport],
-         gl_save_LDFLAGS="$LDFLAGS"
+         [dnl --disable-auto-import is unsupported in MSVC and in MSVC/clang.
+--- libunistring-1.0/lib/Makefile.am.orig	2022-05-14 08:56:53.657968900 +0200
++++ libunistring-1.0/lib/Makefile.am	2022-05-14 08:57:05.616166100 +0200
+@@ -265,8 +265,8 @@
+ # Tell the mingw or Cygwin linker which symbols to export.
+ if WOE32DLL
+ libunistring_la_SOURCES += ../woe32dll/unistring-exports.c
+-libunistring_la_LDFLAGS += -Wl,--export-all-symbols
+ endif
++libunistring_la_LDFLAGS += -Wl,--export-all-symbols
+ 
+ # Hide undesired symbols that are defined by libunistring_la_SOURCES or
+ # libunistring_la_LIBADD from the global namespace, by prefixing them with

wcd/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=wcd
 pkgver=6.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Wherever Change Directory'
 arch=('i686' 'x86_64')
 url='https://waterlan.home.xs4all.nl/'