diff --git a/ncdu-gcc-10.patch b/ncdu-gcc-10.patch new file mode 100644 index 0000000..a9e8248 --- /dev/null +++ b/ncdu-gcc-10.patch @@ -0,0 +1,49 @@ +diff --git a/src/browser.h b/src/browser.h +index 41a44e6..e748cd2 100644 +--- a/src/browser.h ++++ b/src/browser.h +@@ -28,7 +28,6 @@ + + #include "global.h" + +-int confirm_quit; + int browse_key(int); + void browse_draw(void); + void browse_init(struct dir *); +diff --git a/src/dir.h b/src/dir.h +index 0b7bf36..3221c45 100644 +--- a/src/dir.h ++++ b/src/dir.h +@@ -103,7 +103,7 @@ int dir_export_init(const char *fn); + + + /* Function set by input code. Returns dir_output.final(). */ +-int (*dir_process)(); ++extern int (*dir_process)(); + + /* Scanning a live directory */ + extern int dir_scan_smfs; +diff --git a/src/dir_common.c b/src/dir_common.c +index f17fa2c..284a981 100644 +--- a/src/dir_common.c ++++ b/src/dir_common.c +@@ -31,6 +31,7 @@ + #include + + ++int (*dir_process)(); + char *dir_curpath; /* Full path of the last seen item. */ + struct dir_output dir_output; + char *dir_fatalerr; /* Error message on a fatal error. (NULL if there was no fatal error) */ +diff --git a/src/main.c b/src/main.c +index 6ce951d..982e337 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -42,6 +42,7 @@ long update_delay = 100; + int cachedir_tags = 0; + int extended_info = 0; + int follow_symlinks = 0; ++int confirm_quit = 0; + + static int min_rows = 17, min_cols = 60; + static int ncurses_init = 0; diff --git a/ncdu.spec b/ncdu.spec index 5fb7911..7c2fc38 100644 --- a/ncdu.spec +++ b/ncdu.spec @@ -1,12 +1,17 @@ Name: ncdu Version: 1.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Text-based disk usage viewer License: MIT URL: http://dev.yorhel.nl/ncdu/ Source0: http://dev.yorhel.nl/download/ncdu-%{version}.tar.gz +# Enable compilation with gcc 10. Taken from upstream repo: +# https://g.blicky.net/ncdu.git/commit/?id=ecb71f25501bc78efdaaa2535e95a58d11e09e5a +# https://code.blicky.net/yorhel/ncdu/issues/140 +Patch0: ncdu-gcc-10.patch + BuildRequires: gcc BuildRequires: ncurses-devel @@ -16,6 +21,7 @@ and provides a fast way to see what directories are using your disk space. %prep %setup -q +%patch0 -p1 %build %configure @@ -30,6 +36,9 @@ make install DESTDIR=%{buildroot} %{_bindir}/ncdu %changelog +* Sat Jan 25 2020 Richard Fearn - 1.14.1-2 +- Enable compilation with gcc 10 + * Sun Aug 11 2019 Richard Fearn - 1.14.1-1 - Update to new upstream version 1.14.1