diff -Nru vifm-0.10.1/debian/changelog vifm-0.10.1/debian/changelog --- vifm-0.10.1/debian/changelog 2019-08-24 16:51:30.000000000 +0000 +++ vifm-0.10.1/debian/changelog 2020-08-20 06:44:41.000000000 +0000 @@ -1,3 +1,12 @@ +vifm (0.10.1-4) unstable; urgency=medium + + * Fix GCC-10 (Closes: #957910) + * Bump standards version to 4.5.0. + * Bump debhelper compat level to 13. + * Set Rules-Requires-Root: no. + + -- Ondřej Nový Thu, 20 Aug 2020 08:44:41 +0200 + vifm (0.10.1-3) unstable; urgency=medium * Fix FTBFS on kfreebsd. diff -Nru vifm-0.10.1/debian/control vifm-0.10.1/debian/control --- vifm-0.10.1/debian/control 2019-08-02 05:58:05.000000000 +0000 +++ vifm-0.10.1/debian/control 2020-08-20 06:44:30.000000000 +0000 @@ -2,15 +2,16 @@ Section: utils Priority: optional Maintainer: Ondřej Nový -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), libmagic-dev, libncursesw5-dev, libx11-dev, vim, -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Homepage: https://vifm.info/ Vcs-Browser: https://salsa.debian.org/debian/vifm Vcs-Git: https://salsa.debian.org/debian/vifm.git +Rules-Requires-Root: no Package: vifm Architecture: any diff -Nru vifm-0.10.1/debian/patches/gcc-10-fix.patch vifm-0.10.1/debian/patches/gcc-10-fix.patch --- vifm-0.10.1/debian/patches/gcc-10-fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ vifm-0.10.1/debian/patches/gcc-10-fix.patch 2020-08-19 13:40:11.000000000 +0000 @@ -0,0 +1,164 @@ +From 0205c8d76bd33228b33bcceb6afffa2a77925c76 Mon Sep 17 00:00:00 2001 +From: xaizek +Date: Fri, 7 Feb 2020 20:00:11 +0200 +Subject: [PATCH] Fix compilation with -fno-common +Origin: https://github.com/vifm/vifm/commit/0205c8d76bd33228b33bcceb6afffa2a77925c76 + +See https://gcc.gnu.org/gcc-10/porting_to.html#common + +Tests can't be built with it, stic uses it as an implementation detail. +--- + src/filetype.c | 5 ++++- + src/filetype.h | 14 +++++++++----- + src/trash.c | 3 +++ + src/trash.h | 4 ++-- + src/ui/ui.c | 20 ++++++++++++++++++++ + src/ui/ui.h | 30 ++++++++++++------------------ + tests/Makefile | 1 + + 7 files changed, 51 insertions(+), 26 deletions(-) + +--- a/src/filetype.c ++++ b/src/filetype.c +@@ -56,12 +56,15 @@ + static void safe_free(char **adr); + static int is_assoc_record_empty(const assoc_record_t *record); + +-/* Predefined builtin command. */ + const assoc_record_t NONE_PSEUDO_PROG = { + .command = "", + .description = "", + }; + ++assoc_list_t filetypes; ++assoc_list_t xfiletypes; ++assoc_list_t fileviewers; ++ + /* Internal list that stores only currently active associations. + * Since it holds only copies of structures from filetype and filextype lists, + * it doesn't consume much memory, and its items shouldn't be freed */ +--- a/src/filetype.h ++++ b/src/filetype.h +@@ -77,11 +77,15 @@ + * name. Should return non-zero if it exists and zero otherwise. */ + typedef int (*external_command_exists_t)(const char name[]); + +-const assoc_record_t NONE_PSEUDO_PROG; ++/* Predefined fake builtin command. */ ++extern const assoc_record_t NONE_PSEUDO_PROG; + +-assoc_list_t filetypes; +-assoc_list_t xfiletypes; +-assoc_list_t fileviewers; ++/* All registered non-X filetypes. */ ++extern assoc_list_t filetypes; ++/* All registered X filetypes. */ ++extern assoc_list_t xfiletypes; ++/* All registered viewers. */ ++extern assoc_list_t fileviewers; + + /* Unit setup. */ + +--- a/src/trash.c ++++ b/src/trash.c +@@ -120,6 +120,9 @@ + static char * get_rooted_trash_dir(const char base_path[], const char spec[]); + static char * format_root_spec(const char spec[], const char mount_point[]); + ++trash_entry_t *trash_list; ++int nentries; ++ + static char **specs; + static int nspecs; + +--- a/src/ui/ui.c ++++ b/src/ui/ui.c +@@ -101,6 +101,26 @@ + view_t lwin = { .timestamps_mutex = &lwin_timestamps_mutex }; + view_t rwin = { .timestamps_mutex = &rwin_timestamps_mutex }; + ++view_t *other_view; ++view_t *curr_view; ++ ++WINDOW *status_bar; ++WINDOW *stat_win; ++WINDOW *job_bar; ++WINDOW *ruler_win; ++WINDOW *input_win; ++WINDOW *menu_win; ++WINDOW *sort_win; ++WINDOW *change_win; ++WINDOW *error_win; ++ ++static WINDOW *top_line; ++static WINDOW *tab_line; ++ ++static WINDOW *lborder; ++static WINDOW *mborder; ++static WINDOW *rborder; ++ + static int pair_in_use(short int pair); + static void move_pair(short int from, short int to); + static void create_windows(void); +--- a/src/ui/ui.h ++++ b/src/ui/ui.h +@@ -459,24 +459,18 @@ + + extern view_t lwin; + extern view_t rwin; +-view_t *other_view; +-view_t *curr_view; ++extern view_t *other_view; ++extern view_t *curr_view; + +-WINDOW *status_bar; +-WINDOW *stat_win; +-WINDOW *job_bar; +-WINDOW *ruler_win; +-WINDOW *input_win; +-WINDOW *menu_win; +-WINDOW *sort_win; +-WINDOW *change_win; +-WINDOW *error_win; +-WINDOW *top_line; +-WINDOW *tab_line; +- +-WINDOW *lborder; +-WINDOW *mborder; +-WINDOW *rborder; ++extern WINDOW *status_bar; ++extern WINDOW *stat_win; ++extern WINDOW *job_bar; ++extern WINDOW *ruler_win; ++extern WINDOW *input_win; ++extern WINDOW *menu_win; ++extern WINDOW *sort_win; ++extern WINDOW *change_win; ++extern WINDOW *error_win; + + /* Updates the ruler with information from the view (possibly lazily). */ + void ui_ruler_update(view_t *view, int lazy_redraw); +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -160,6 +160,7 @@ + override LDFLAGS += -lcurses + endif + endif ++override CFLAGS += -fcommon + ifeq (,$(findstring -lpthread,$(LDFLAGS))) + override LDFLAGS += -pthread + endif +--- a/src/trash.h ++++ b/src/trash.h +@@ -29,10 +29,10 @@ + trash_entry_t; + + /* List of items in trashes. */ +-trash_entry_t *trash_list; ++extern trash_entry_t *trash_list; + + /* Number of items in the trash_list. */ +-int nentries; ++extern int nentries; + + /* Parses trash directory name specification. Sets value of cfg.trash_dir as a + * side effect. Returns non-zero in case of error, otherwise zero is diff -Nru vifm-0.10.1/debian/patches/series vifm-0.10.1/debian/patches/series --- vifm-0.10.1/debian/patches/series 2019-08-24 16:48:07.000000000 +0000 +++ vifm-0.10.1/debian/patches/series 2020-08-19 13:29:13.000000000 +0000 @@ -2,3 +2,4 @@ drop-vifm-media-osx.patch fix-hurd.patch fix-kfreebsd.patch +gcc-10-fix.patch