From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- .../files/pinfo-0.6.10-clearfilenameprefix.patch | 10 -- app-text/pinfo/files/pinfo-0.6.10-dir-file.patch | 11 --- .../pinfo/files/pinfo-0.6.10-gcc-7-inline.patch | 42 -------- .../pinfo/files/pinfo-0.6.10-gettext-0.19.patch | 110 --------------------- .../pinfo/files/pinfo-0.6.10-info-suffix.patch | 28 ------ .../pinfo/files/pinfo-0.6.10-libc-basename.patch | 33 ------- .../pinfo/files/pinfo-0.6.10-ncurses-check.patch | 14 --- app-text/pinfo/files/pinfo-0.6.10-tinfo.patch | 40 -------- app-text/pinfo/files/pinfo-0.6.10-version.patch | 11 --- app-text/pinfo/files/pinfo-0.6.9-as-needed.patch | 22 ----- 10 files changed, 321 deletions(-) delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-dir-file.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-tinfo.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.10-version.patch delete mode 100644 app-text/pinfo/files/pinfo-0.6.9-as-needed.patch (limited to 'app-text/pinfo/files') diff --git a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch b/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch deleted file mode 100644 index 0835d166932e..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/filehandling_functions.c -+++ b/src/filehandling_functions.c -@@ -758,6 +758,7 @@ - tmpfilename = tmpfilename2; /* later we will refere only to tmp2 */ - } - -+ clearfilenameprefix(); - for (i = -1; i < infopathcount; i++) /* go through all paths */ - { - if (i == -1) diff --git a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch deleted file mode 100644 index 7a282f354baa..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/filehandling_functions.c -+++ b/src/filehandling_functions.c -@@ -742,7 +742,7 @@ - int i, j; - char *tmpfilename; - -- if (strncmp(filename, "dir", 3) == 0) -+ if (strncmp(filename, "dir", 3) == 0 && !isalnum(filename[3])) - { - xfree(buf); - return opendirfile(number); diff --git a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch deleted file mode 100644 index d73ad947c7df..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/initializelinks.c -+++ b/src/initializelinks.c -@@ -75,7 +75,7 @@ - * checks if an item belongs to tag table. returns 1 on success and 0 on - * failure. It should be optimised... - */ --inline int -+int - exists_in_tag_table(char *item) - { - if (gettagtablepos(item) != -1) ---- a/src/filehandling_functions.c -+++ b/src/filehandling_functions.c -@@ -554,7 +554,7 @@ - return 1; - } - --inline void -+void - buildcommand(char *dest, char *command, char *filename, const char *tmpfilename) - { - strcpy(dest, command); -@@ -564,7 +564,7 @@ - strcat(dest, tmpfilename); - } - --inline void -+void - builddircommand(char *dest, char *command, char *filename, const char *tmpfilename) - { - strcpy(dest, command); ---- a/src/utils.c -+++ b/src/utils.c -@@ -193,7 +193,7 @@ - return value; - } - --inline void -+void - initlocale() - { - #ifdef ___DEBUG___ diff --git a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch b/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch deleted file mode 100644 index 6679e51acb20..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/po/cs.po -+++ b/po/cs.po -@@ -9,6 +9,7 @@ - "PO-Revision-Date: 2005-10-11 16:59+0200\n" - "Last-Translator: Katarina Machalkova \n" - "Language-Team: Czech \n" -+"Language: cs\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/de.po -+++ b/po/de.po -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 1999-04-21 01:50+0200\n" - "Last-Translator: René van Bevern \n" - "Language-Team: German \n" -+"Language: de\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/eu.po -+++ b/po/eu.po -@@ -12,6 +12,7 @@ - "PO-Revision-Date: 2005-09-28 23:14+0200\n" - "Last-Translator: Piarres Beobide \n" - "Language-Team: librezale.org \n" -+"Language: eu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/ja.po -+++ b/po/ja.po -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2001-11-21 17:42+0900\n" - "Last-Translator: Masayuki Hatta \n" - "Language-Team: Japanese \n" -+"Language: ja\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=euc-jp\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/nl.po -+++ b/po/nl.po -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2005-09-01 21:21+0200\n" - "Last-Translator: Bas Zoetekouw \n" - "Language-Team: Dutch \n" -+"Language: nl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-15\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/pl.po -+++ b/po/pl.po -@@ -10,6 +10,7 @@ - "PO-Revision-Date: 2005-09-29 21:59+0200\n" - "Last-Translator: Krzysztof Krzy¿aniak (eloy) \n" - "Language-Team:\n" -+"Language: pl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -13,6 +13,7 @@ - "Last-Translator: Felipe Augusto van de Wiel (faw) \n" - "Language-Team: l10n portuguese \n" -+"Language: pt_BR\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/ro.po -+++ b/po/ro.po -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2005-09-30 03:42+0300\n" - "Last-Translator: Eddy Petrisor \n" - "Language-Team: Romanian \n" -+"Language: ro\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/ru.po -+++ b/po/ru.po -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2005-10-01 10:47+0400\n" - "Last-Translator: Yuri Kozlov \n" - "Language-Team: Russian \n" -+"Language: ru\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/sv.po -+++ b/po/sv.po -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2005-10-06 12:00+0200\n" - "Last-Translator: Daniel Nylander \n" - "Language-Team: Swedish \n" -+"Language: sv\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso-8859-1\n" - "Content-Transfer-Encoding: 8bit\n" ---- a/po/vi.po -+++ b/po/vi.po -@@ -11,6 +11,7 @@ - "PO-Revision-Date: 2005-12-21 15:11+1030\n" - "Last-Translator: Clytie Siddall \n" - "Language-Team: Vietnamese \n" -+"Language: vi\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" diff --git a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch deleted file mode 100644 index 45be53cd1bf6..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/filehandling_functions.c -+++ b/src/filehandling_functions.c -@@ -96,11 +96,14 @@ matchfile(char **buf, char *name) - { - /* use strcat rather than strdup, because xmalloc handles all - * malloc errors */ -- char *thisfile = xmalloc(strlen(dp->d_name)+1); -+ int len = strlen(dp->d_name)+1; -+ char *thisfile = xmalloc(len * 2); -+ char *thisfile_info = thisfile + len; - strcat(thisfile, dp->d_name); - - /* strip suffixes (so "gcc.info.gz" -> "gcc") */ - strip_compression_suffix(thisfile); -+ strcat(thisfile_info, thisfile); - strip_info_suffix(thisfile); - - /* compare this file with the file we're looking for */ -@@ -109,8 +112,7 @@ matchfile(char **buf, char *name) - /* we found a match! */ - matched++; - /* put it in the buffer */ -- strncat(Buf, thisfile, 1023-strlen(Buf)); -- strncat(Buf, ".info", 1023-strlen(Buf)); -+ strncat(Buf, thisfile_info, 1023-strlen(Buf)); - - /* clean up, and exit the loop */ - xfree(thisfile); diff --git a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch b/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch deleted file mode 100644 index 6e9d4954792a..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch +++ /dev/null @@ -1,33 +0,0 @@ -do not redefine the basename that the C library provides - ---- a/src/filehandling_functions.c -+++ b/src/filehandling_functions.c -@@ -31,7 +31,6 @@ typedef struct - } - Suffixes; - --char * basename(char *filename); - - - /****************************************************************************** -@@ -713,20 +712,6 @@ opendirfile(int number) - return NULL; - } - --char * --basename(char *filename) --{ -- int len = strlen(filename); -- char *a = filename + len; -- while (a > filename) -- { -- a--; -- if (*a == '/') -- return a + 1; -- } -- return filename; /* when it was a basename */ --} -- - /* - * Note: openinfo is a function for reading info files, and putting - * uncompressed content into a temporary filename. For a flexibility, there diff --git a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch b/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch deleted file mode 100644 index a5f14c593f44..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch +++ /dev/null @@ -1,14 +0,0 @@ -curses_wchar is set to true/false, so trying to assign it to the compiler -flags variable makes no sense. it's already been set up the right value -at this point, so delete the assignment. - ---- a/macros/curses.m4 -+++ b/macros/curses.m4 -@@ -130,7 +130,6 @@ AC_DEFUN([AC_CHECK_CURSES],[ - else - AC_DEFINE(CURSES_WCHAR) - CURSES_WCHAR=true -- CURSES_FLAGS=$curses_wchar - AC_SUBST(CURSES_FLAGS) - fi - diff --git a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch deleted file mode 100644 index bbb6ecfe421d..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -118,7 +118,24 @@ - - - # curses -+PKG_CHECK_MODULES(ncursesw,ncursesw,[ -+ curses_includes="$ncursesw_CFLAGS" -+ curses_libs="$ncursesw_LIBS" -+ curses_h=ncurses.h -+ stop_searching=true -+ found_curses_h=true -+ USE_CURSES=true],[ -+ PKG_CHECK_MODULES(ncurses,ncurses,[ -+ curses_includes="$ncurses_CFLAGS" -+ curses_libs="$ncurses_LIBS" -+ curses_h=ncurses.h -+ stop_searching=true -+ found_curses_h=true -+ USE_CURSES=true], -+ [])]) -+ - AC_CHECK_CURSES -+ - if ! test "x$USE_CURSES" = "xtrue"; then - AC_MSG_ERROR([Curses not found. You need curses to compile pinfo]) - fi ---- a/macros/curses.m4 -+++ b/macros/curses.m4 -@@ -175,8 +175,8 @@ - AC_DEFUN([AC_SEARCH_CURSES_H], [ - AC_MSG_CHECKING([location of curses.h file]) - -- stop_searching=false -- found_curses_h=false -+# stop_searching=false -+# found_curses_h=false - - dnl if a particular location was specified - if test "x$curses_location" != "xfalse" diff --git a/app-text/pinfo/files/pinfo-0.6.10-version.patch b/app-text/pinfo/files/pinfo-0.6.10-version.patch deleted file mode 100644 index 8038fe0879e8..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.10-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/doc/pinfo.texi 2006-03-16 16:40:41.000000000 +0100 -+++ b/doc/pinfo.texi 2010-06-18 16:20:24.000000000 +0200 -@@ -5,7 +5,7 @@ - @c %**end of header - - @set EDITION 0.2.1 --@set VERSION 0.6.4 -+@set VERSION 0.6.10 - @set DATE 1 Dec 2001 - @set DATEMAN 21 Mar 1999 - diff --git a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch deleted file mode 100644 index 85a80e6f2602..000000000000 --- a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/macros/curses.m4 -+++ b/macros/curses.m4 -@@ -257,8 +257,8 @@ - dnl save CFLAGS and LDFLAGS and set new ones - CFLAGS_OLD=$CFLAGS - CFLAGS="$CFLAGS $curses_includes" -- LDFLAGS_OLD=$LDFLAGS -- LDFLAGS="$LDFLAGS $curses_libs" -+ LIBS_OLD=$LIBS -+ LIBS="$LIBS $curses_libs" - - dnl do the compile test - AC_MSG_CHECKING([if curses is usable]) -@@ -288,7 +288,7 @@ - - dnl restore variables - CFLAGS=$CFLAGS_OLD -- LDFLAGS=$LDFLAGS_OLD -+ LIBS=$LIBS_OLD - - ]) - -- cgit v1.2.3