From 2c3e7f0f0769ac77e03e6e936786f9ae00263ac9 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 27 Jan 2019 19:37:00 -0700
Subject: [PATCH] Fix cmatrix and ncdu
---
recipes/cmatrix/cmatrix.patch | 101 ----------------------------------
recipes/cmatrix/recipe.sh | 4 +-
recipes/ncdu/recipe.sh | 10 +---
3 files changed, 4 insertions(+), 111 deletions(-)
delete mode 100644 recipes/cmatrix/cmatrix.patch
diff --git a/recipes/cmatrix/cmatrix.patch b/recipes/cmatrix/cmatrix.patch
deleted file mode 100644
index 0cb612655..000000000
--- a/recipes/cmatrix/cmatrix.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ru source/cmatrix.c source-new/cmatrix.c
---- source/cmatrix.c 2017-11-18 13:21:42.992870796 -0800
-+++ source-new/cmatrix.c 2017-11-18 13:20:45.446407288 -0800
-@@ -37,7 +37,7 @@
- #ifdef HAVE_NCURSES_H
- #include <ncurses.h>
- #else
--#include <curses.h>
-+#include <ncurses/curses.h>
- #endif
-
- #ifdef HAVE_SYS_IOCTL_H
-@@ -215,47 +215,49 @@
-
- void handle_sigwinch(int s) {
-
-- char *tty = NULL;
-- int fd = 0;
-- int result = 0;
-- struct winsize win;
--
-- tty = ttyname(0);
-- if (!tty) {
-- return;
-- }
-- fd = open(tty, O_RDWR);
-- if (fd == -1) {
-- return;
-- }
-- result = ioctl(fd, TIOCGWINSZ, &win);
-- if (result == -1) {
-- return;
-- }
--
-- COLS = win.ws_col;
-- LINES = win.ws_row;
--
-- if(LINES <10){
-- LINES = 10;
-- }
-- if(COLS <10){
-- COLS = 10;
-- }
--
--#ifdef HAVE_RESIZETERM
-- resizeterm(LINES, COLS);
--#ifdef HAVE_WRESIZE
-- if (wresize(stdscr, LINES, COLS) == ERR) {
-- c_die("Cannot resize window!");
-- }
--#endif /* HAVE_WRESIZE */
--#endif /* HAVE_RESIZETERM */
--
-- var_init();
-- /* Do these because width may have changed... */
-- clear();
-- refresh();
-+/*
-+ * char *tty = NULL;
-+ * int fd = 0;
-+ * int result = 0;
-+ * struct winsize win;
-+ *
-+ * tty = ttyname(0);
-+ * if (!tty) {
-+ * return;
-+ * }
-+ * fd = open(tty, O_RDWR);
-+ * if (fd == -1) {
-+ * return;
-+ * }
-+ * result = ioctl(fd, TIOCGWINSZ, &win);
-+ * if (result == -1) {
-+ * return;
-+ * }
-+ *
-+ * COLS = win.ws_col;
-+ * LINES = win.ws_row;
-+ *
-+ * if(LINES <10){
-+ * LINES = 10;
-+ * }
-+ * if(COLS <10){
-+ * COLS = 10;
-+ * }
-+ *
-+ *#ifdef HAVE_RESIZETERM
-+ * resizeterm(LINES, COLS);
-+ *#ifdef HAVE_WRESIZE
-+ * if (wresize(stdscr, LINES, COLS) == ERR) {
-+ * c_die("Cannot resize window!");
-+ * }
-+ *#endif [> HAVE_WRESIZE <]
-+ *#endif [> HAVE_RESIZETERM <]
-+ *
-+ * var_init();
-+ * [> Do these because width may have changed... <]
-+ * clear();
-+ * refresh();
-+ */
- }
diff --git a/recipes/cmatrix/recipe.sh b/recipes/cmatrix/recipe.sh
index 52522e692..fc1ce3683 100644
--- a/recipes/cmatrix/recipe.sh
+++ b/recipes/cmatrix/recipe.sh
@@ -15,7 +15,8 @@ function recipe_update {
function recipe_build {
sysroot="$(realpath ../sysroot)"
export LDFLAGS="-L$sysroot/lib"
- export CPPFLAGS="-I$sysroot/include"
+ export CPPFLAGS="-I$sysroot/include -I$sysroot/include/ncurses"
+ autoreconf -i
./configure --build=${BUILD} --host=${HOST} --prefix=/ --without-fonts
make -j"$(nproc)"
skip=1
@@ -34,6 +35,5 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
- rm -rf $1/share/man
skip=1
}
diff --git a/recipes/ncdu/recipe.sh b/recipes/ncdu/recipe.sh
index b59c0a69c..cb90b7014 100644
--- a/recipes/ncdu/recipe.sh
+++ b/recipes/ncdu/recipe.sh
@@ -17,7 +17,8 @@ function recipe_build {
export CPPFLAGS="-I$sysroot/include -I$sysroot/include/ncurses"
./configure \
--build=${BUILD} \
- --host "$HOST"
+ --host="$HOST" \
+ --prefix=/
make -j"$(nproc)"
skip=1
}
@@ -32,12 +33,5 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath "$1")"
make DESTDIR="$dest" install
- cd "$dest/usr/local/bin/"
- find . -type f -exec install -D "{}" "$dest/usr/bin/{}" \;
- cd -
- cd "$dest/usr/local/share/"
- find . -type f -exec install -D "{}" "$dest/share/{}" \;
- cd -
- rm -r "$dest/usr/local/"
skip=1
}
--
GitLab