diff --git a/.gitignore b/.gitignore index a05de35..897bebf 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.12.1.tar.xz /gnome-commander-1.12.2.tar.xz /gnome-commander-20211118T1354.tar.gz +/gnome-commander-20211118T2218.tar.gz diff --git a/gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch b/gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch deleted file mode 100644 index c8e09d2..0000000 --- a/gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6ea18afd328fcaa9e6ea2200ef53da5dd9d1e36f Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Thu, 18 Nov 2021 14:48:27 +0900 -Subject: [PATCH] GnomeCmdFile::get_adate: fix compilation - -ref: ec93dcb7c304c8b45ecc9c18ca3ec833bf248601 -ref: 5eccc4a6c892df41ebe845eb80fbd6b4ff9b99fb - -`GnomeVFSFileInfo *info` is removed from `struct GnomeCmdFile` . ---- - src/gnome-cmd-file.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gnome-cmd-file.cc b/src/gnome-cmd-file.cc -index 57ad963c..d7237285 100644 ---- a/src/gnome-cmd-file.cc -+++ b/src/gnome-cmd-file.cc -@@ -671,7 +671,7 @@ inline const gchar *date2string (GDateTime *date, gboolean overide_disp_setting) - #ifdef GLIB_2_70 - const gchar *GnomeCmdFile::get_adate(gboolean overide_disp_setting) - { -- g_return_val_if_fail (info != nullptr, nullptr); -+ g_return_val_if_fail (gFileInfo != nullptr, nullptr); - - return date2string (g_file_info_get_access_date_time(gFileInfo), overide_disp_setting); - } --- -2.33.1 - diff --git a/gnome-commander.spec b/gnome-commander.spec index c83072d..3db141c 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -30,9 +30,9 @@ %if 0%{?use_gitbare} %global gittardate 20211118 -%global gittartime 1354 -%global gitbaredate 20211117 -%global git_rev aa5b6b51f42b63a2dbba243878688490ecfd7a6d +%global gittartime 2218 +%global gitbaredate 20211118 +%global git_rev b87e5bb78504279bc88f3aa7bfe322bef3521012 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} @@ -86,8 +86,6 @@ Source1: gnome-commander.sh Source2: create-gcmd-git-bare-tarball.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -# https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/19 -Patch101: gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -196,7 +194,6 @@ git commit -m "base" -q %patch1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a -cat %PATCH101 | git am %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) diff --git a/sources b/sources index 0d0aa89..8bb9463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211118T1354.tar.gz) = 96d56b23cc4bdde941679696039a2fa01b6669f47cbf8322f1dceed80aeadc95d307ab183521adec8d9c81e70a97a8b0f3f959359bd61e8268ac297671648c5c +SHA512 (gnome-commander-20211118T2218.tar.gz) = baad3d119fefbf0669d2f45d66bfdf31bb53ad08684cc24081abf639775d80a8a8cbd29c4e8f61b46fa3b26a4be68e03c34f486c4c2030932dd16304b8945b34