Dr. Werner Fink 2022-08-23 06:15:10 +00:00 committed by Git OBS Bridge
parent 629c0a4c72
commit 80e04584f1
5 changed files with 15 additions and 21 deletions

View File

@ -4,7 +4,7 @@
--- lib/encodings.c
+++ lib/encodings.c 2016-12-15 14:07:01.072034899 +0000
@@ -228,6 +228,7 @@ static struct charset_entry charset_tabl
@@ -227,6 +227,7 @@ static struct charset_entry charset_tabl
{ "EUC-CN", "nippon" },
{ "EUC-JP", "nippon" },
{ "EUC-TW", "nippon" },
@ -12,7 +12,7 @@
{ "GBK", "nippon" },
# else /* !MULTIBYTE_GROFF */
/* If we have a smarter version of groff, this is better dealt with
@@ -315,6 +316,7 @@ static struct less_charset_entry less_ch
@@ -314,6 +315,7 @@ static struct less_charset_entry less_ch
#ifdef MULTIBYTE_GROFF
{ "CP1251", "windows", NULL },
@ -20,7 +20,7 @@
{ "EUC-JP", "iso8859", "japanese-ujis" },
{ "KOI8-R", "koi8-r", NULL },
/* close enough? */
@@ -453,6 +455,13 @@ char *get_page_encoding (const char *lan
@@ -452,6 +454,13 @@ char *get_page_encoding (const char *lan
* roff encoding = ISO-8859-15
* output encoding = ISO-8859-15
* ISO-8859-15 -> groff -Tascii8 -> ISO-8859-15 -> iconv -> UTF-8
@ -34,7 +34,7 @@
*/
const char *get_source_encoding (const char *lang)
{
@@ -620,7 +629,7 @@ static int compatible_encodings (const c
@@ -619,7 +628,7 @@ static int compatible_encodings (const c
*/
if ((STREQ (input, "BIG5") || STREQ (input, "BIG5HKSCS") ||
STREQ (input, "EUC-JP") ||
@ -43,7 +43,7 @@
STREQ (input, "EUC-KR") ||
STREQ (input, "EUC-TW")) &&
STREQ (output, "UTF-8"))
@@ -724,7 +733,7 @@ const char *get_roff_encoding (const cha
@@ -723,7 +732,7 @@ const char *get_roff_encoding (const cha
STRNEQ (ctype, "zh_HK", 5) ||
STRNEQ (ctype, "zh_SG", 5) ||
STRNEQ (ctype, "zh_TW", 5))

View File

@ -22,7 +22,7 @@
.B %man%
--- src/man.c
+++ src/man.c 2022-08-17 13:10:07.436205495 +0000
@@ -3572,12 +3572,141 @@ static int locate_page (const char *manp
@@ -3615,12 +3615,141 @@ static int locate_page (const char *manp
return found;
}
@ -164,7 +164,7 @@
global_manpath = is_global_mandir (candp->path);
if (!global_manpath)
drop_effective_privs ();
@@ -3599,9 +3728,56 @@ static int display_pages (struct candida
@@ -3642,9 +3771,56 @@ static int display_pages (struct candida
regain_effective_privs ();
if (found && !findall)

View File

@ -12,7 +12,7 @@
#include "argp.h"
#include "attribute.h"
@@ -4080,9 +4081,25 @@ static void locate_page_in_manpath (cons
@@ -4123,9 +4124,25 @@ static void locate_page_in_manpath (cons
{
char *mp;

View File

@ -790,16 +790,3 @@ Index: man-db-2.10.2/src/ult_src.c
include = test_for_include (buffer);
if (include) {
Index: man-db-2.10.2/src/tests/get-mtime.c
===================================================================
--- man-db-2.10.2.orig/src/tests/get-mtime.c
+++ man-db-2.10.2/src/tests/get-mtime.c
@@ -69,7 +69,7 @@ int main (int argc, char **argv)
if (lstat (path, &st) < 0)
fatal (errno, "can't lstat %s", path);
ts = get_stat_mtime (&st);
- printf ("%ld.%09ld\n", (long) ts.tv_sec, ts.tv_nsec);
+ printf ("%ld.%0.09ld\n", (long) ts.tv_sec, ts.tv_nsec);
exit (OK);
}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 23 06:13:49 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Corrrect some offsets of patch hunks
- Remove change in get-mtime.c as mandb-symlink-target-timestamp
now catch the random format changes
-------------------------------------------------------------------
Mon Aug 22 21:17:21 UTC 2022 - Dirk Müller <dmueller@suse.com>