diff options
| -rw-r--r-- | misc/uni2ascii/01_getline_posix2008_fix.diff | 28 | ||||
| -rw-r--r-- | misc/uni2ascii/uni2ascii.SlackBuild | 5 | ||||
| -rw-r--r-- | misc/uni2ascii/uni2ascii.info | 8 |
3 files changed, 5 insertions, 36 deletions
diff --git a/misc/uni2ascii/01_getline_posix2008_fix.diff b/misc/uni2ascii/01_getline_posix2008_fix.diff deleted file mode 100644 index 347063dfcc..0000000000 --- a/misc/uni2ascii/01_getline_posix2008_fix.diff +++ /dev/null @@ -1,28 +0,0 @@ -Description: -In eglibc <= 2.9, getline was only defined if _GNU_SOURCE was defined. In -eglibc 2.10, getline is always defined (since it became a standard in -POSIX2008). The uni2ascii already has a function named getline(), which now -conflicts with glibc's. Patch will rename getline() to get_line() to fix the -problem. -Author: Kartik Mistry <kartik@debian.org> -Debian bug: http://bugs.debian.org/552870 ---- a/ascii2uni.c -+++ b/ascii2uni.c -@@ -463,7 +463,7 @@ - fprintf(stderr,"Failed to allocate buffer for input line.\n"); - exit(2); - } -- while ((read = getline(&lbuf, &len, infp)) != -1) { -+ while ((read = get_line(&lbuf, &len, infp)) != -1) { - AddNewlineP = 1; - LineNo++; - last = read - 1; -@@ -848,7 +848,7 @@ - } - - int --getline (lineptr, n, stream) -+get_line (lineptr, n, stream) - char **lineptr; - size_t *n; - FILE *stream; diff --git a/misc/uni2ascii/uni2ascii.SlackBuild b/misc/uni2ascii/uni2ascii.SlackBuild index b42818ea7b..3b92a6ecc1 100644 --- a/misc/uni2ascii/uni2ascii.SlackBuild +++ b/misc/uni2ascii/uni2ascii.SlackBuild @@ -4,7 +4,7 @@ # Written by Oleg O. Chukaev <oleg.chukaev@mail.ru> PRGNAM=uni2ascii -VERSION=4.14 +VERSION=4.15 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -50,9 +50,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix some compilation errors... -patch -p1 -i $CWD/01_getline_posix2008_fix.diff - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/misc/uni2ascii/uni2ascii.info b/misc/uni2ascii/uni2ascii.info index 923665ec81..1c550a8515 100644 --- a/misc/uni2ascii/uni2ascii.info +++ b/misc/uni2ascii/uni2ascii.info @@ -1,10 +1,10 @@ PRGNAM="uni2ascii" -VERSION="4.14" +VERSION="4.15" HOMEPAGE="http://billposer.org/Software/uni2ascii.html" -DOWNLOAD="http://billposer.org/Software/Downloads/uni2ascii-4.14.tar.bz2" -MD5SUM="b26f3ac559ccd69161b93c2f4fed5f14" +DOWNLOAD="http://billposer.org/Software/Downloads/uni2ascii-4.15.tar.bz2" +MD5SUM="030c50d6c788eee9ff38e064dc56bf1b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Oleg O. Chukaev" EMAIL="oleg.chukaev@mail.ru" -APPROVED="rworkman" +APPROVED="dsomero" |