7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
96 lines
2.5 KiB
Diff
96 lines
2.5 KiB
Diff
diff --git configure.ac configure.ac
|
|
index 8742d93..cb0c62c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -44,20 +44,20 @@ AC_TYPE_SIGNAL
|
|
AC_FUNC_STRTOD
|
|
AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul])
|
|
|
|
-# check for libncursesw
|
|
+# check for libncurses
|
|
|
|
-AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1)
|
|
-AC_CHECK_LIB(ncursesw, add_wch, HAVE_LIBNCURSESW=1)
|
|
+AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1)
|
|
+AC_CHECK_LIB(ncurses, add_wch, HAVE_LIBNCURSESW=1)
|
|
if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then
|
|
- LIBS="-lncursesw $LIBS"
|
|
+ LIBS="-lncurses $LIBS"
|
|
else
|
|
- echo -e "Error: both library and header files for the ncursesw library\n"\
|
|
+ echo -e "Error: both library and header files for the ncurses library\n"\
|
|
"are required to build this package. See INSTALL file for"\
|
|
"further information. On Debian/Ubuntu you need to install libncursesw5-dev."
|
|
exit 1;
|
|
fi
|
|
AC_SEARCH_LIBS(cbreak, tinfo, [],
|
|
- [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfo])])
|
|
+ [AC_MSG_ERROR([Can't find cbreak() in -lncurses or -ltinfo])])
|
|
|
|
|
|
# iconv
|
|
diff --git src/cursmenu.c src/cursmenu.c
|
|
index 1c3990e..f0fc21a 100644
|
|
--- a/src/cursmenu.c
|
|
+++ b/src/cursmenu.c
|
|
@@ -24,7 +24,7 @@
|
|
#ifdef HAVE_PDCURSES
|
|
#include <curses.h>
|
|
#else
|
|
-#include <ncursesw/ncurses.h>
|
|
+#include <ncurses.h>
|
|
#endif
|
|
|
|
#include "error.h"
|
|
diff --git src/error.c src/error.c
|
|
index 2022f2b..4ab6741 100644
|
|
--- a/src/error.c
|
|
+++ b/src/error.c
|
|
@@ -25,7 +25,7 @@
|
|
#ifdef HAVE_PDCURSES
|
|
#include <curses.h>
|
|
#else
|
|
-#include <ncursesw/ncurses.h>
|
|
+#include <ncurses.h>
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
diff --git src/gtypist.c src/gtypist.c
|
|
index 7328ac6..cb9dd61 100644
|
|
--- a/src/gtypist.c
|
|
+++ b/src/gtypist.c
|
|
@@ -32,7 +32,7 @@
|
|
#ifdef HAVE_PDCURSES
|
|
#include <curses.h>
|
|
#else
|
|
-#include <ncursesw/ncurses.h>
|
|
+#include <ncurses.h>
|
|
#endif
|
|
|
|
#include <time.h>
|
|
diff --git src/script.c src/script.c
|
|
index ce04d68..f4032e2 100644
|
|
--- a/src/script.c
|
|
+++ b/src/script.c
|
|
@@ -24,7 +24,7 @@
|
|
#ifdef HAVE_PDCURSES
|
|
#include <curses.h>
|
|
#else
|
|
-#include <ncursesw/ncurses.h>
|
|
+#include <ncurses.h>
|
|
#endif
|
|
|
|
#include "error.h"
|
|
diff --git src/utf8.c src/utf8.c
|
|
index 8eab3d3..e3194df 100644
|
|
--- a/src/utf8.c
|
|
+++ b/src/utf8.c
|
|
@@ -23,7 +23,7 @@
|
|
#ifdef HAVE_PDCURSES
|
|
#include <curses.h>
|
|
#else
|
|
-#include <ncursesw/ncurses.h>
|
|
+#include <ncurses.h>
|
|
#endif
|
|
|
|
#include <stdlib.h>
|