Hello community, here is the log from the commit of package spacefm for openSUSE:Factory checked in at 2020-09-15 16:27:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spacefm (Old) and /work/SRC/openSUSE:Factory/.spacefm.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spacefm" Tue Sep 15 16:27:08 2020 rev:11 rq:834097 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/spacefm/spacefm.changes 2019-03-10 09:37:44.700142193 +0100 +++ /work/SRC/openSUSE:Factory/.spacefm.new.4249/spacefm.changes 2020-09-15 16:27:28.462549926 +0200 @@ -1,0 +2,7 @@ +Sat Sep 12 18:06:30 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Add patch to fix build with GCC10: + * 0001-Fix-build-with-GCC10.patch +- Drop obsolete version checks from spec file. + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-GCC10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spacefm.spec ++++++ --- /var/tmp/diff_new_pack.M9utOl/_old 2020-09-15 16:27:29.146550581 +0200 +++ /var/tmp/diff_new_pack.M9utOl/_new 2020-09-15 16:27:29.150550585 +0200 @@ -1,7 +1,7 @@ # # spec file for package spacefm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # -%bcond_with restricted Name: spacefm Version: 1.0.6 Release: 0 @@ -27,6 +26,8 @@ Source: https://github.com/IgnorantGuru/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE spacefm-fix-implicit-decl.patch -- Fix implicit declaration of "major" and "minor" macros. Patch0: spacefm-fix-implicit-decl.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix-build-with-GCC10.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -38,9 +39,11 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 +# Not available in SLE +%if 0%{?is_opensuse} +BuildRequires: pkgconfig(libffmpegthumbnailer) +%endif BuildRequires: pkgconfig(libudev) >= 143 -Requires: desktop-file-utils -Requires: shared-mime-info Recommends: %{name}-lang # Mount without root requirement. Recommends: udisks2 @@ -48,9 +51,6 @@ Recommends: wget # Execution of SpaceFM and applications from root. Recommends: xdg-utils -%if %{?suse_version} >= 1500 || %{with restricted} -BuildRequires: pkgconfig(libffmpegthumbnailer) -%endif %description SpaceFM is a multi-panel tabbed file and desktop manager for GNU/Linux @@ -61,18 +61,19 @@ %lang_package %prep -%setup -q -%patch0 -p1 +%autosetup -p1 + echo 'tmp_dir=%{_tmppath}' > %{name}.conf %build NOCONFIGURE=1 ./autogen.sh %configure \ --with-preferable-sudo=%{_bindir}/xdg-su \ -%if %{?suse_version} < 1500 && %{without restricted} +%if 0%{?is_opensuse} < 1 --disable-video-thumbnails \ %endif --htmldir=%{_docdir}/%{name} + make %{?_smp_mflags} V=1 %install @@ -82,26 +83,8 @@ %fdupes %{buildroot}%{_datadir}/ %find_lang %{name} -%if 0%{?suse_version} < 1500 -%post -%desktop_database_post -%icon_theme_cache_post -%icon_theme_cache_post Faenza -%mime_database_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%icon_theme_cache_postun Faenza -%mime_database_postun -%endif - %files -%if 0%{?suse_version} >= 1500 %license COPYING COPYING-LGPL -%else -%doc COPYING COPYING-LGPL -%endif %doc AUTHORS ChangeLog README %{_docdir}/%{name}/ %dir %{_sysconfdir}/%{name}/ ++++++ 0001-Fix-build-with-GCC10.patch ++++++ >From 065bc0e4c7de46f7f5771ae8a535bd058dd6d1dc Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Sat, 12 Sep 2020 20:03:52 +0200 Subject: [PATCH] Fix build with GCC10 Patch from Vladimir Lomov, extracted from https://github.com/IgnorantGuru/spacefm/pull/772 --- src/settings.c | 19 +++++++++++++++++++ src/settings.h | 34 +++++++++++++++++----------------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/settings.c b/src/settings.c index b8687a2..28f9ce0 100644 --- a/src/settings.c +++ b/src/settings.c @@ -52,6 +52,25 @@ /* Dirty hack: check whether we are under LXDE or not */ #define is_under_LXDE() (g_getenv( "_LXSESSION_PID" ) != NULL) +/* GCC 10.1+ */ +char* settings_terminal_su = NULL; +char* settings_graphical_su = NULL; +GList* xset_cmd_history = NULL; +XSet* evt_win_focus = NULL; +XSet* evt_win_move = NULL; +XSet* evt_win_click = NULL; +XSet* evt_win_key = NULL; +XSet* evt_win_close = NULL; +XSet* evt_pnl_show = NULL; +XSet* evt_pnl_focus = NULL; +XSet* evt_pnl_sel = NULL; +XSet* evt_tab_new = NULL; +XSet* evt_tab_chdir = NULL; +XSet* evt_tab_focus = NULL; +XSet* evt_tab_close = NULL; +XSet* evt_device = NULL; + + AppSettings app_settings = {0}; /* const gboolean singleInstance_default = TRUE; */ const gboolean show_hidden_files_default = FALSE; diff --git a/src/settings.h b/src/settings.h index e25bdc3..e608ebf 100644 --- a/src/settings.h +++ b/src/settings.h @@ -120,7 +120,7 @@ const char* xset_get_user_tmp_dir(); /////////////////////////////////////////////////////////////////////////////// //MOD extra settings below -GList* xsets; +extern GList* xsets; enum { XSET_B_UNSET, @@ -311,22 +311,22 @@ typedef struct } XMenuItem; // cache these for speed in event handlers -XSet* evt_win_focus; -XSet* evt_win_move; -XSet* evt_win_click; -XSet* evt_win_key; -XSet* evt_win_close; -XSet* evt_pnl_show; -XSet* evt_pnl_focus; -XSet* evt_pnl_sel; -XSet* evt_tab_new; -XSet* evt_tab_chdir; -XSet* evt_tab_focus; -XSet* evt_tab_close; -XSet* evt_device; +extern XSet* evt_win_focus; +extern XSet* evt_win_move; +extern XSet* evt_win_click; +extern XSet* evt_win_key; +extern XSet* evt_win_close; +extern XSet* evt_pnl_show; +extern XSet* evt_pnl_focus; +extern XSet* evt_pnl_sel; +extern XSet* evt_tab_new; +extern XSet* evt_tab_chdir; +extern XSet* evt_tab_focus; +extern XSet* evt_tab_close; +extern XSet* evt_device; // instance-wide command history -GList* xset_cmd_history; +extern GList* xset_cmd_history; static const char* terminal_programs[] = //for pref-dialog.c { @@ -374,8 +374,8 @@ static const char* gsu_commands[] = // order and contents must match prefdlg.ui }; // These will contain the su and gsu settings from /etc/spacefm/spacefm.conf -char* settings_terminal_su; -char* settings_graphical_su; +extern char* settings_terminal_su; +extern char* settings_graphical_su; typedef struct { -- 2.28.0
