diff --git a/community/man-db/APKBUILD b/community/man-db/APKBUILD index 5ebf34daacb3b011850c22ba280de83ba2e3a316..e04d841eaef37bb73f2dc6ccc6c951b82bc1a6b9 100644 --- a/community/man-db/APKBUILD +++ b/community/man-db/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Simon Rupf <simon@rupf.net> pkgname=man-db -pkgver=2.12.1 +pkgver=2.13.0 pkgrel=0 pkgdesc="The man command and related utilities for examining on-line help files" url="https://man-db.gitlab.io/man-db/" @@ -43,6 +43,6 @@ package() { } sha512sums=" -0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329 man-db-2.12.1.tar.xz -5cde2df35dc4db182ed8290023c8f8ff4e34fe66f9aacb8bca63ac51f65a3433a0699e04e674dc57b489eed3cb4ff55b3605ca635394df1078ed79c81e372c07 ignore.patch +612ce39bb1e11aa7797e8e3a26f06a7154c48a13b2d74217c2c6701e0d33fa8f77ae2b8c9ee84353e364d16918f884115f2dfbf3cd743edd4ed32b763b87f723 man-db-2.13.0.tar.xz +839b03170f7810956a5769b0df732bed82058e92c879ba3fb5aae579d05b66b973da917690bb3d1c648ebf6f4c35f035214886c9345ea4d5f1bae48e1bca4402 ignore.patch " diff --git a/community/man-db/ignore.patch b/community/man-db/ignore.patch index ad2712df0d1ce77c4c4b90b644c2e85407920f05..a3afea68f78b80f452a8e934b85a5419a8b2de13 100644 --- a/community/man-db/ignore.patch +++ b/community/man-db/ignore.patch @@ -8,12 +8,12 @@ diff --git a/src/convert.c b/src/convert.c index 447240c..4f4d006 100644 --- a/src/convert.c +++ b/src/convert.c -@@ -56,7 +56,7 @@ char * ATTRIBUTE_MALLOC convert_to_locale (char *string) +@@ -59,7 +59,7 @@ char * ATTRIBUTE_MALLOC convert_to_locale (char *string) { if (!conv_to_locale_initialized) { - char *locale_charset = xasprintf -- ("%s//IGNORE", get_locale_charset ()); -+ ("%s", get_locale_charset ()); + char *locale_charset = +- xasprintf ("%s//IGNORE", get_locale_charset ()); ++ xasprintf ("%s", get_locale_charset ()); conv_to_locale = iconv_open (locale_charset, "UTF-8"); free (locale_charset); if (conv_to_locale != (iconv_t) -1) @@ -21,12 +21,11 @@ diff --git a/src/manconv.c b/src/manconv.c index e775b1b..41a11bd 100644 --- a/src/manconv.c +++ b/src/manconv.c -@@ -301,7 +301,7 @@ static tried_iconv try_iconv (decompress *decomp, const char *try_from_code, - iconv_t cd_utf8, cd = NULL; - bool to_utf8 = STREQ (try_to_code, "UTF-8") || - STRNEQ (try_to_code, "UTF-8//", 7); +@@ -304,7 +304,7 @@ static tried_iconv try_iconv (decompress *decomp, const char *try_from_code, + iconv_t cd_utf8, cd = NULL; + bool to_utf8 = STREQ (try_to_code, "UTF-8") || + STRNEQ (try_to_code, "UTF-8//", 7); - const char *utf8_target = last ? "UTF-8//IGNORE" : "UTF-8"; + const char *utf8_target = "UTF-8"; bool ignore_errors = (strstr (try_to_code, "//IGNORE") != NULL); tried_iconv ret = TRIED_ICONV_OK; -