Skip to content
Snippets Groups Projects
Commit 8eabbcc7 authored by J0WI's avatar J0WI Committed by Milan P. Stanić
Browse files

main/libidn: upgrade to 1.37

parent 93e69bdf
No related branches found
No related tags found
1 merge request!21499main/libidn: upgrade to 1.37
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libidn
pkgver=1.35
pkgver=1.37
pkgrel=0
pkgdesc="Encode/Decode library for internationalized domain names"
url="https://www.gnu.org/software/libidn"
......@@ -9,8 +9,7 @@ arch="all"
license="GPL-2.0-or-later GPL-3.0-or-later LGPL-3.0-or-later"
checkdepends="diffutils"
subpackages="$pkgname-dev $pkgname-doc"
source="https://ftp.gnu.org/gnu/libidn/libidn-$pkgver.tar.gz
localename-test-fix.patch"
source="https://ftp.gnu.org/gnu/libidn/libidn-$pkgver.tar.gz"
# secfixes:
# 1.33-r0:
......@@ -42,5 +41,4 @@ package() {
rm -rf "$pkgdir"/usr/share/info
}
sha512sums="782260f73b1fd8ebea8a40e2b3a6866c4f67494b2b3df03748daa9c0f842a9578932e746eb4bbf2547fccb1d65d7fc99a7977759dbe58f87f2fdd26d0fe45a09 libidn-1.35.tar.gz
c37f9e318ab1f1e44a75074395bd8a93429265bdd3ccc6d7eae0f78beff53ff8ebac531a072d1859053ef517c7a1a6c1bf1b1f579d6dfc183df4cd016be4f825 localename-test-fix.patch"
sha512sums="198a5b2f0db3ad076e3726dda7f197835dd93a126ee796c138185abd09ee2f828042225dd570fa19b58b3e81b120daf929f348a55f9a536c546dd3311c29e27c libidn-1.37.tar.gz"
--- a/lib/gltests/localename.c 2018-02-03 19:27:45.000000000 +0000
+++ b/lib/gltests/localename.c 2018-04-01 15:54:44.383612550 +0000
@@ -40,7 +40,7 @@
# if defined __APPLE__ && defined __MACH__
# include <xlocale.h>
# endif
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || defined __CYGWIN__
+# if defined __linux__
# include <langinfo.h>
# endif
# if !defined IN_LIBINTL
@@ -2692,16 +2692,19 @@ gl_locale_name_thread_unsafe (int catego
locale_t thread_locale = uselocale (NULL);
if (thread_locale != LC_GLOBAL_LOCALE)
{
+# if defined(_NL_LOCALE_NAME)
+ const char *name = nl_langinfo(_NL_LOCALE_NAME(category));
# if __GLIBC__ >= 2 && !defined __UCLIBC__
/* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
glibc < 2.12.
See <https://sourceware.org/bugzilla/show_bug.cgi?id=10968>. */
- const char *name =
- nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
+ if (name[0] == '\0')
+ name = nl_langinfo (_NL_ITEM ((category), _NL_ITEM_INDEX (-1)));
if (name[0] == '\0')
/* Fallback code for glibc < 2.4, which did not implement
nl_langinfo (_NL_LOCALE_NAME (category)). */
name = thread_locale->__names[category];
+# endif
return name;
# elif (defined __FreeBSD__ || defined __DragonFly__) || (defined __APPLE__ && defined __MACH__)
/* FreeBSD, Mac OS X */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment