2026-01-21 13:15:33 +00:00
committed by Git OBS Bridge
3 changed files with 29 additions and 14 deletions
+5
View File
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 20 14:30:48 UTC 2026 - Michal Suchanek <msuchanek@suse.de>
- Fix build with GCC 16
-------------------------------------------------------------------
Mon Oct 5 10:51:05 UTC 2020 - Michal Suchanek <msuchanek@suse.com>
+2 -1
View File
@@ -1,7 +1,7 @@
#
# spec file for package vilistextum
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -51,6 +51,7 @@ make %{?_smp_mflags}
make %{?_smp_mflags} test
%post
%postun
%files
+22 -13
View File
@@ -1,7 +1,8 @@
diff -ur vilistextum-2.6.9.orig/src/fileio.c vilistextum-2.6.9/src/fileio.c
--- vilistextum-2.6.9.orig/src/fileio.c 2006-04-22 18:42:26.000000000 +0200
+++ vilistextum-2.6.9/src/fileio.c 2019-10-07 15:27:08.866014317 +0200
@@ -61,9 +61,6 @@
Index: vilistextum-2.6.9/src/fileio.c
===================================================================
--- vilistextum-2.6.9.orig/src/fileio.c
+++ vilistextum-2.6.9/src/fileio.c
@@ -61,9 +61,6 @@ void open_files(char *input, char *outpu
#ifdef MULTIBYTE
void convert_string(char *str, CHAR *converted_string)
{
@@ -11,7 +12,7 @@ diff -ur vilistextum-2.6.9.orig/src/fileio.c vilistextum-2.6.9/src/fileio.c
iconv_t conv;
char output[DEF_STR_LEN];
char *inp, *outp;
@@ -88,7 +85,8 @@
@@ -88,7 +85,8 @@ void convert_string(char *str, CHAR *con
if ((conv = iconv_open("utf-8", "char"))==(iconv_t)(-1))
{ fprintf(stderr, "convert_string: iconv_open failed. Can't convert from %s to UTF-8.\n", getenv("LC_CTYPE")); exit(1); }
@@ -21,27 +22,26 @@ diff -ur vilistextum-2.6.9.orig/src/fileio.c vilistextum-2.6.9/src/fileio.c
fehlernr = errno;
if (fehlernr==E2BIG) { fprintf(stderr, "errno==E2BIG\n"); }
@@ -185,7 +183,6 @@
@@ -183,9 +181,7 @@ int read_char()
int c = ' ';
#ifdef MULTIBYTE
int fehlernr=0; /* tmp variable for errno */
static int i=0;
- static int i=0;
int j=0,k;
- size_t result=(size_t)(-1);
wchar_t outstring[33];
iconv_t conv;
char input[33], output[33];
@@ -216,9 +213,9 @@
@@ -218,7 +214,7 @@ int read_char()
input[j] = c;
- errno=0;
+ errno = 0;
errno=0;
insize = j+1;
- result = iconv(conv, &inp, &insize, &outp, &outsize);
+ iconv(conv, &inp, &insize, &outp, &outsize);
fehlernr = errno;
if (fehlernr==E2BIG) { fprintf(stderr, "read_char: errno==E2BIG\n"); }
@@ -237,7 +234,7 @@
@@ -237,7 +233,7 @@ int read_char()
/* valid character found */
else if (fehlernr==0) {
/* printf("\n1: c=%d ; %d\n",c,c); */
@@ -50,3 +50,12 @@ diff -ur vilistextum-2.6.9.orig/src/fileio.c vilistextum-2.6.9/src/fileio.c
if (convert_character(outstring[0], tmpstr)) {
c = outstring[0];
/* printf("2: c=%d ; %d\n",c,c); */
@@ -250,8 +246,6 @@ int read_char()
} while ((fehlernr!=0) && (c!=EOF));
iconv_close(conv);
- i++;
-
errno = 0;
#else