From 02bd0faa010a35329de2df1431cdba9b7c484591 Mon Sep 17 00:00:00 2001 From: Richard Fearn Date: Feb 11 2020 18:05:53 +0000 Subject: Update to new upstream version 1.14.2 Drop gcc 10 patch --- diff --git a/.gitignore b/.gitignore index 8f6c262..c7c48ca 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ncdu-1.6.tar.gz /ncdu-1.13.tar.gz /ncdu-1.14.tar.gz /ncdu-1.14.1.tar.gz +/ncdu-1.14.2.tar.gz diff --git a/ncdu-gcc-10.patch b/ncdu-gcc-10.patch deleted file mode 100644 index a9e8248..0000000 --- a/ncdu-gcc-10.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 6af2a1b..2691b66 100644 --- a/ncdu.spec +++ b/ncdu.spec @@ -1,17 +1,12 @@ Name: ncdu -Version: 1.14.1 -Release: 4%{?dist} +Version: 1.14.2 +Release: 1%{?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 @@ -21,7 +16,6 @@ and provides a fast way to see what directories are using your disk space. %prep %setup -q -%patch0 -p1 %build %configure @@ -37,6 +31,10 @@ make install DESTDIR=%{buildroot} %{_bindir}/ncdu %changelog +* Tue Feb 11 2020 Richard Fearn - 1.14.2-1 +- Update to new upstream version 1.14.2 +- Drop gcc 10 patch + * Sun Feb 02 2020 Richard Fearn - 1.14.1-4 - Use %%license diff --git a/sources b/sources index bee6d95..d59a617 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ncdu-1.14.1.tar.gz) = 7db9115f7ba20d43c47bc7187347658d7a4dc36da6ffdc54308d3966a431c24b87c3266854d69685c3ea5e29805b5a631805a783d6431e30bd83c411b398515d +SHA512 (ncdu-1.14.2.tar.gz) = d7398448e0e13354a0be1606c3e3f6f29e2dbb742fd56f7cd9c598e974c359429966527ef8fce6a0e3afb0ea3cad9a95169b880600e44d62273b937309fa0e59