From 54e1aa00db965e5644d8cbd686d078f244582753 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 00:57:41 +0000 Subject: [PATCH 01/75] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- gnome-commander.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-commander.spec b/gnome-commander.spec index d57c314..1e018a2 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -97,6 +97,7 @@ BuildRequires: intltool BuildRequires: libtool BuildRequires: gnome-common %endif +BuildRequires: make Requires: gnome-vfs2-smb Requires: meld From d299fcb3691ec8fbccf658d385bb0e533467cc91 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Feb 2021 20:11:56 +0900 Subject: [PATCH 02/75] Backport upstream patch for opening properties popup by keypress issue (upstream bug 96) --- ...r-1.10.3-open-property-keypress-bz96.patch | 96 +++++++++++++++++++ gnome-commander.spec | 10 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 gnome-commander-1.10.3-open-property-keypress-bz96.patch diff --git a/gnome-commander-1.10.3-open-property-keypress-bz96.patch b/gnome-commander-1.10.3-open-property-keypress-bz96.patch new file mode 100644 index 0000000..3251151 --- /dev/null +++ b/gnome-commander-1.10.3-open-property-keypress-bz96.patch @@ -0,0 +1,96 @@ +From aa40e0ee762dce8f33af945a002bab52257486ad Mon Sep 17 00:00:00 2001 +From: Uwe Scholz +Date: Mon, 22 Feb 2021 22:48:38 +0100 +Subject: [PATCH] Open properties popup by keypress at the position of the + file/directory in the file list, fixing #96 + +--- + NEWS | 1 + + doc/C/releases.xml | 3 +++ + src/gnome-cmd-file-list.cc | 47 ++++++++++++++++++++++++++------------ + 3 files changed, 36 insertions(+), 15 deletions(-) + +diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc +index d4f1d417..d21578e2 100644 +--- a/src/gnome-cmd-file-list.cc ++++ b/src/gnome-cmd-file-list.cc +@@ -808,28 +808,45 @@ static char *build_selected_file_list (GnomeCmdFileList *fl, int *file_list_len) + } + + +-static void show_file_popup (GnomeCmdFileList *fl, GdkEventButton *event) ++static void get_popup_pos (GtkMenu *menu, gint *x, gint *y, gboolean push_in, GnomeCmdFileList *gnomeCmdFileList) + { +- // create the popup menu +- GtkWidget *menu = gnome_cmd_file_popmenu_new (fl); +- if (!menu) return; ++ g_return_if_fail (GNOME_CMD_IS_FILE_LIST (gnomeCmdFileList)); + +- g_object_ref (menu); +- g_object_set_data_full (*fl, "file_popup_menu", menu, g_object_unref); ++ gint w, h; + +- gtk_menu_popup (GTK_MENU (menu), nullptr, nullptr, nullptr, fl, event->button, event->time); ++ get_focus_row_coordinates (gnomeCmdFileList, *x, *y, w, h); + } + + +-inline void show_file_popup_with_warp (GnomeCmdFileList *fl) ++static void show_file_popup (GnomeCmdFileList *fl, GdkEventButton *event) + { +- gint x, y, w, h; +- +- get_focus_row_coordinates (fl, x, y, w, h); ++ // create the popup menu ++ GtkWidget *menu = gnome_cmd_file_popmenu_new (fl); ++ if (!menu) return; + +- //FIXME: Warp the pointer to x, y here ++ g_object_ref (menu); ++ g_object_set_data_full (*fl, "file_popup_menu", menu, g_object_unref); + +- show_file_popup (fl, nullptr); ++ if (event) ++ { ++ gtk_menu_popup (GTK_MENU (menu), ++ nullptr, ++ nullptr, ++ nullptr, ++ fl, ++ event->button, ++ event->time); ++ } ++ else ++ { ++ gtk_menu_popup (GTK_MENU (menu), ++ nullptr, ++ nullptr, ++ (GtkMenuPositionFunc) get_popup_pos, ++ fl, ++ 0, ++ gtk_get_current_event_time ()); ++ } + } + + +@@ -2480,7 +2497,7 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event) + return TRUE; + + case GDK_F10: +- show_file_popup_with_warp (this); ++ show_file_popup (this, nullptr); + return TRUE; + + case GDK_Left: +@@ -2662,7 +2679,7 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event) + return TRUE; + + case GDK_Menu: +- show_file_popup_with_warp (this); ++ show_file_popup (this, nullptr); + return TRUE; + + default: +-- +GitLab + diff --git a/gnome-commander.spec b/gnome-commander.spec index 1e018a2..1220ab1 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -31,7 +31,7 @@ %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 1 +%global main_release 2 #%%global extratag %{git_pull_JST}git%{shorthash} %undefine extratag %global mimeedit_rev 1958 @@ -68,6 +68,9 @@ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.10/%{name}-%{vers Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +# https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/96 +# https://gitlab.gnome.org/GNOME/gnome-commander/-/commit/aa40e0ee762dce8f33af945a002bab52257486ad +Patch101: gnome-commander-1.10.3-open-property-keypress-bz96.patch BuildRequires: gcc-c++ @@ -136,6 +139,7 @@ ansluta till FTP-servrar och SMB-nätverk. #%%setup -q -n %{name}-%{githash} %patch1 -p1 -b .path +%patch101 -p1 -b .upst101 %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -260,6 +264,10 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Tue Feb 23 2021 Mamoru TASAKA - 4:1.10.3-2 +- Backport upstream patch for opening properties popup by keypress issue + (upstream bug 96) + * Tue Jun 30 2020 Mamoru TASAKA - 4:1.10.3-1 - 1.10.3 From 92accba22904a852320b414745e68386856ef207 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Feb 2021 00:49:51 +0900 Subject: [PATCH 03/75] Fix FTBFS wrt std::byte <=> Exiv2::byte confusion, perhaps exposed by glibc 2.33.9000 --- ...e-commander-1.10.3-tags-exiv2-byte-confusion.patch | 11 +++++++++++ gnome-commander.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch diff --git a/gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch b/gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch new file mode 100644 index 0000000..ad710dd --- /dev/null +++ b/gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch @@ -0,0 +1,11 @@ +--- gnome-commander-1.10.3/src/tags/gnome-cmd-tags-exiv2.cc.debug 2020-04-15 22:16:27.000000000 +0900 ++++ gnome-commander-1.10.3/src/tags/gnome-cmd-tags-exiv2.cc 2021-02-23 22:09:11.236969469 +0900 +@@ -74,7 +74,7 @@ + case TAG_EXIF_FLASHPIXVERSION: + case TAG_EXIF_INTEROPERABILITYVERSION: + { +- vector buff(i->value().size()+1); ++ vector buff(i->value().size()+1); + + i->value().copy(&buff[0],invalidByteOrder); + metadata->add(tag,(char *) &buff[0]); diff --git a/gnome-commander.spec b/gnome-commander.spec index 1220ab1..3b25dea 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -31,7 +31,7 @@ %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 2 +%global main_release 3 #%%global extratag %{git_pull_JST}git%{shorthash} %undefine extratag %global mimeedit_rev 1958 @@ -71,6 +71,8 @@ Patch1: gnome-commander-1.6.0-path-fedora-specific.patch # https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/96 # https://gitlab.gnome.org/GNOME/gnome-commander/-/commit/aa40e0ee762dce8f33af945a002bab52257486ad Patch101: gnome-commander-1.10.3-open-property-keypress-bz96.patch +# Need report to the upstream +Patch102: gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch BuildRequires: gcc-c++ @@ -140,6 +142,7 @@ ansluta till FTP-servrar och SMB-nätverk. %patch1 -p1 -b .path %patch101 -p1 -b .upst101 +%patch102 -p1 -b .byte_confusion %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -264,6 +267,9 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Tue Feb 23 2021 Mamoru TASAKA - 4:1.10.3-3 +- Fix FTBFS wrt std::byte <=> Exiv2::byte confusion, perhaps exposed by glibc 2.33.9000 + * Tue Feb 23 2021 Mamoru TASAKA - 4:1.10.3-2 - Backport upstream patch for opening properties popup by keypress issue (upstream bug 96) From b96a5d3f3034347ce64aaac5bae058e12decfea3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 25 Feb 2021 23:21:47 +0900 Subject: [PATCH 04/75] add reference --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 3b25dea..422f02b 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -71,7 +71,7 @@ Patch1: gnome-commander-1.6.0-path-fedora-specific.patch # https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/96 # https://gitlab.gnome.org/GNOME/gnome-commander/-/commit/aa40e0ee762dce8f33af945a002bab52257486ad Patch101: gnome-commander-1.10.3-open-property-keypress-bz96.patch -# Need report to the upstream +# https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/5 Patch102: gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch BuildRequires: gcc-c++ From 998f0197104bd19d9e7718c876a563f60464be0f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 19 Mar 2021 11:05:17 +0900 Subject: [PATCH 05/75] create gcmd-1-12 branch --- .gitignore | 1 + create-gcmd-git-bare-tarball.sh | 28 ++++ ...r-1.10.3-open-property-keypress-bz96.patch | 96 ----------- ...der-1.10.3-tags-exiv2-byte-confusion.patch | 11 -- gnome-commander.spec | 158 +++++++++++++----- sources | 2 +- 6 files changed, 142 insertions(+), 154 deletions(-) create mode 100644 create-gcmd-git-bare-tarball.sh delete mode 100644 gnome-commander-1.10.3-open-property-keypress-bz96.patch delete mode 100644 gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch diff --git a/.gitignore b/.gitignore index 29d989c..facffa3 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.10.1.tar.xz /gnome-commander-1.10.2.tar.xz /gnome-commander-1.10.3.tar.xz +/gnome-commander-20210319T1025.tar.gz diff --git a/create-gcmd-git-bare-tarball.sh b/create-gcmd-git-bare-tarball.sh new file mode 100644 index 0000000..6ec6fa7 --- /dev/null +++ b/create-gcmd-git-bare-tarball.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +set -x +set -e + +REPONAME=gnome-commander +GITURL=https://gitlab.gnome.org/GNOME/${REPONAME}.git +BRANCH=gcmd-1-12 + +DATE=$(date '+%Y%m%d') +TIME=$(date '+%H%M') + +TARNAME=${REPONAME}-${DATE}T${TIME}.tar.gz + +PWDDIR=$(pwd) +TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) +pushd $TMPDIR + +git clone --mirror $GITURL +tar czf ${TARNAME} ${REPONAME}.git/ + +pushd ${REPONAME}.git/ +git log --first-parent --format=fuller ${BRANCH} | head -n 12 +popd + +cp -p ${TARNAME} $PWDDIR +popd +rm -rf $TMPDIR diff --git a/gnome-commander-1.10.3-open-property-keypress-bz96.patch b/gnome-commander-1.10.3-open-property-keypress-bz96.patch deleted file mode 100644 index 3251151..0000000 --- a/gnome-commander-1.10.3-open-property-keypress-bz96.patch +++ /dev/null @@ -1,96 +0,0 @@ -From aa40e0ee762dce8f33af945a002bab52257486ad Mon Sep 17 00:00:00 2001 -From: Uwe Scholz -Date: Mon, 22 Feb 2021 22:48:38 +0100 -Subject: [PATCH] Open properties popup by keypress at the position of the - file/directory in the file list, fixing #96 - ---- - NEWS | 1 + - doc/C/releases.xml | 3 +++ - src/gnome-cmd-file-list.cc | 47 ++++++++++++++++++++++++++------------ - 3 files changed, 36 insertions(+), 15 deletions(-) - -diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc -index d4f1d417..d21578e2 100644 ---- a/src/gnome-cmd-file-list.cc -+++ b/src/gnome-cmd-file-list.cc -@@ -808,28 +808,45 @@ static char *build_selected_file_list (GnomeCmdFileList *fl, int *file_list_len) - } - - --static void show_file_popup (GnomeCmdFileList *fl, GdkEventButton *event) -+static void get_popup_pos (GtkMenu *menu, gint *x, gint *y, gboolean push_in, GnomeCmdFileList *gnomeCmdFileList) - { -- // create the popup menu -- GtkWidget *menu = gnome_cmd_file_popmenu_new (fl); -- if (!menu) return; -+ g_return_if_fail (GNOME_CMD_IS_FILE_LIST (gnomeCmdFileList)); - -- g_object_ref (menu); -- g_object_set_data_full (*fl, "file_popup_menu", menu, g_object_unref); -+ gint w, h; - -- gtk_menu_popup (GTK_MENU (menu), nullptr, nullptr, nullptr, fl, event->button, event->time); -+ get_focus_row_coordinates (gnomeCmdFileList, *x, *y, w, h); - } - - --inline void show_file_popup_with_warp (GnomeCmdFileList *fl) -+static void show_file_popup (GnomeCmdFileList *fl, GdkEventButton *event) - { -- gint x, y, w, h; -- -- get_focus_row_coordinates (fl, x, y, w, h); -+ // create the popup menu -+ GtkWidget *menu = gnome_cmd_file_popmenu_new (fl); -+ if (!menu) return; - -- //FIXME: Warp the pointer to x, y here -+ g_object_ref (menu); -+ g_object_set_data_full (*fl, "file_popup_menu", menu, g_object_unref); - -- show_file_popup (fl, nullptr); -+ if (event) -+ { -+ gtk_menu_popup (GTK_MENU (menu), -+ nullptr, -+ nullptr, -+ nullptr, -+ fl, -+ event->button, -+ event->time); -+ } -+ else -+ { -+ gtk_menu_popup (GTK_MENU (menu), -+ nullptr, -+ nullptr, -+ (GtkMenuPositionFunc) get_popup_pos, -+ fl, -+ 0, -+ gtk_get_current_event_time ()); -+ } - } - - -@@ -2480,7 +2497,7 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event) - return TRUE; - - case GDK_F10: -- show_file_popup_with_warp (this); -+ show_file_popup (this, nullptr); - return TRUE; - - case GDK_Left: -@@ -2662,7 +2679,7 @@ gboolean GnomeCmdFileList::key_pressed(GdkEventKey *event) - return TRUE; - - case GDK_Menu: -- show_file_popup_with_warp (this); -+ show_file_popup (this, nullptr); - return TRUE; - - default: --- -GitLab - diff --git a/gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch b/gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch deleted file mode 100644 index ad710dd..0000000 --- a/gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-commander-1.10.3/src/tags/gnome-cmd-tags-exiv2.cc.debug 2020-04-15 22:16:27.000000000 +0900 -+++ gnome-commander-1.10.3/src/tags/gnome-cmd-tags-exiv2.cc 2021-02-23 22:09:11.236969469 +0900 -@@ -74,7 +74,7 @@ - case TAG_EXIF_FLASHPIXVERSION: - case TAG_EXIF_INTEROPERABILITYVERSION: - { -- vector buff(i->value().size()+1); -+ vector buff(i->value().size()+1); - - i->value().copy(&buff[0],invalidByteOrder); - metadata->add(tag,(char *) &buff[0]); diff --git a/gnome-commander.spec b/gnome-commander.spec index 422f02b..ddd046b 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -1,40 +1,46 @@ -# To use git, follow: -# -# git clone git://git.gnome.org/gnome-commander -# cd gnome-commander/ -# git checkout -b gcmd-1-3 origin/gcmd-1-3 -# git pull -# ... -# cd .. -# ln -sf gcmd-commander gnome-commander-%%{version}-git_%%{git_pull_JST} -# tar cjf gnome-commander-%%{version}-git_%%{git_pull_JST}.tar.xz \ -# gnome-commander-%%{version}-git_%%{git_pull_JST}/./ - -# Source10 is created by: -# svn co http://svn.gnome.org/svn/gnome-commander/branches/gcmd-1-3/tools/mimeedit/ -# cp -p mimeedit/mimeedit.sh mimeedit-rev%%{mimeedit_rev}.sh -# -# ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html - # gcmd plugins uses symbols defined in gcmd binary %undefine _strict_symbol_defs_build %global EXIV2_REQ 0.14 -%global TAGLIB_REQ 1.4 +%global GLIB_REQ 2.44.0 %global LIBGSF_REQ 1.12.0 %global POPPLER_REQ 0.8 +%global TAGLIB_REQ 1.4 -%global git_pull_JST D20150504 -%global githash 5a4806f7e5789a7d29d62550e9128436ffdef00a -%global shorthash %(c=%{githash}; echo ${c:0:7}) +%global mimeedit_rev 1958 %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 3 -#%%global extratag %{git_pull_JST}git%{shorthash} -%undefine extratag -%global mimeedit_rev 1958 + + +%global use_release 0 +%global use_gitbare 1 + +%if 0%{?use_gitbare} < 1 +# force +%global use_release 1 +%endif + +%if 0%{?use_gitbare} +%global gittardate 20210319 +%global gittartime 1025 +%global gitbaredate 20210318 +%global git_rev 3ebb680e6a181d1dc6f7c3a188f3d5d90ff26d32 +%global git_short %(echo %{git_rev} | cut -c-8) +%global git_version D%{gitbaredate}git%{git_short} + +%global if_pre 1 +%endif + +%global mainrel 0.1 + +%if 0%{?use_release} >= 1 +%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%endif +%if 0%{?use_gitbare} >= 1 +%global fedorarel %{mainrel}.%{git_version} +%endif %if 0%{?if_pre} > 0 %global use_autotool 1 @@ -50,29 +56,28 @@ # under doc/ diretory, need investigating %global use_autotool 1 -%global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag} - Name: gnome-commander -Version: 1.10.3 +Version: 1.12 # Downgrade 3 times, sorry... Epoch: 4 -Release: %{fedora_rel}%{?dist} +Release: %{fedorarel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME License: GPLv2+ URL: http://gcmd.github.io/ +%if 0%{?use_release} Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.10/%{name}-%{version}%{?extratag:-%extratag}.tar.xz -#Source0: https://git.gnome.org/browse/gnome-commander/snapshot/%{name}-%{githash}.tar.xz +%endif +%if 0%{?use_gitbare} +Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz +%endif Source1: gnome-commander.sh +# Source0 is created from Source2 +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/-/issues/96 -# https://gitlab.gnome.org/GNOME/gnome-commander/-/commit/aa40e0ee762dce8f33af945a002bab52257486ad -Patch101: gnome-commander-1.10.3-open-property-keypress-bz96.patch -# https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/5 -Patch102: gnome-commander-1.10.3-tags-exiv2-byte-confusion.patch BuildRequires: gcc-c++ @@ -83,6 +88,9 @@ BuildRequires: scrollkeeper BuildRequires: chmlib-devel BuildRequires: pkgconfig(exiv2) >= %{EXIV2_REQ} +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(libgsf-1) >= %{LIBGSF_REQ} BuildRequires: pkgconfig(poppler-glib) >= %{POPPLER_REQ} @@ -103,6 +111,8 @@ BuildRequires: libtool BuildRequires: gnome-common %endif BuildRequires: make +BuildRequires: %{_bindir}/git +BuildRequires: %{_bindir}/appstream-util Requires: gnome-vfs2-smb Requires: meld @@ -137,12 +147,42 @@ Utöver att kunna hantera filer på din egen dator så kan programmet även ansluta till FTP-servrar och SMB-nätverk. %prep -%setup -q -n %{name}-%{version}%{?extratag:-%extratag} -#%%setup -q -n %{name}-%{githash} +%if 0%{?use_release} +%setup -q + +git init +%endif + +%if 0%{?use_gitbare} +%setup -q -c -T -a 0 +git clone ./%{name}.git/ +cd %{name} + +git checkout -b %{version}-fedora %{git_rev} +cp -a [A-Z]* .. +cp -a doc .. + +cat > GITHASH < 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -152,6 +192,10 @@ ansluta till FTP-servrar och SMB-nätverk. -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ configure +%if 0%{?use_gitbare} +pushd .. +%endif + # gzip gzip -9 ChangeLog-* @@ -159,8 +203,17 @@ mkdir TMPBINDIR cd TMPBINDIR ln -sf /bin/true ./update-mime-database +%if 0%{?use_gitbare} +popd +%endif + %build export PATH=$(pwd)/TMPBINDIR:$PATH +export BUILD_TOP_DIR=$(pwd) + +%if 0%{?use_gitbare} +pushd %{name} +%endif # Install wrapper script, and move binaries to # %%{_libexecdir}/%%{name} @@ -184,10 +237,11 @@ ln -sf ../configure %configure \ --srcdir=$(pwd)/.. \ --bindir=%{_libexecdir}/%{name} \ + --disable-werror \ --disable-scrollkeeper \ - --enable-python + %{nil} -%{__cp} -p README .. +%{__cp} -p README ${BUILD_TOP_DIR} %if %{update_po} %{__make} -C po gnome-commander.pot update-po @@ -202,11 +256,19 @@ ln -sf ../configure popd # from _builddir +%if 0%{?use_gitbare} +popd +%endif + %install %{__rm} -rf %{buildroot} export PATH=$(pwd)/TMPBINDIR:$PATH +%if 0%{?use_gitbare} +pushd %{name} +%endif + pushd _builddir %{__make} \ INSTALL="%{__install} -c -p" \ @@ -235,8 +297,15 @@ desktop-file-install \ %{__rm} -f %{buildroot}%{_libdir}/%{name}/*.{a,la} %{__rm} -f %{buildroot}%{_libdir}/%{name}/*/*.{a,la} +%if 0%{?use_gitbare} +popd +%endif + %find_lang %{name} +%check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS @@ -254,13 +323,10 @@ desktop-file-install \ %{_mandir}/man1/%{name}.1* %{_datadir}/applications/%{name}.desktop -%{_datadir}/metainfo/%{name}.appdata.xml +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/help/*/%{name}/ -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/mime - %{_datadir}/glib-2.0/schemas/org.gnome.*xml %{_datadir}/pixmaps/%{name}.svg diff --git a/sources b/sources index 87f6afe..f5ee1fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.10.3.tar.xz) = 87c4df1534747f21b15e48141180601aef02152b1eef097986b0f8675a6d24e75a81ccb7d0b41b2df38cd40eadae2b0bd09f8e0274a5e5cd8bbd8d23df6ffd7f +SHA512 (gnome-commander-20210319T1025.tar.gz) = df76d983f9a94c88cf415113df967c688c7faa8ee4377aab32ac702c27531ba54893ded19055ccdce13f5c3aab067bda9b771e3dcc2911d9981a2427095d0b36 From 96bf4d9e96bd8c6c0d0be98d22e4ac570d790e73 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Mar 2021 11:30:11 +0900 Subject: [PATCH 06/75] support sanitizer --- gnome-commander.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index ddd046b..05c1a64 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,6 +13,7 @@ %global update_po 0 %global if_pre 0 +%global use_gcc_strict_sanitize 1 %global use_release 0 %global use_gitbare 1 @@ -22,6 +23,11 @@ %global use_release 1 %endif +%global flagrel %{nil} +%if 0%{?use_gcc_strict_sanitize} >= 1 +%global flagrel %{flagrel}.san +%endif + %if 0%{?use_gitbare} %global gittardate 20210319 %global gittartime 1025 @@ -33,7 +39,7 @@ %global if_pre 1 %endif -%global mainrel 0.1 +%global mainrel 0.1.100 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -60,7 +66,7 @@ Name: gnome-commander Version: 1.12 # Downgrade 3 times, sorry... Epoch: 4 -Release: %{fedorarel}%{?dist} +Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -80,6 +86,10 @@ Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch BuildRequires: gcc-c++ +%if 0%{?use_gcc_strict_sanitize} +BuildRequires: libasan +BuildRequires: libubsan +%endif BuildRequires: desktop-file-utils BuildRequires: gettext @@ -211,6 +221,12 @@ popd export PATH=$(pwd)/TMPBINDIR:$PATH export BUILD_TOP_DIR=$(pwd) +%set_build_flags +%if 0%{?use_gcc_strict_sanitize} +export CC="${CC} -fsanitize=address -fsanitize=undefined" +export CXX="${CXX} -fsanitize=address -fsanitize=undefined" +%endif + %if 0%{?use_gitbare} pushd %{name} %endif From 8653a0ab888035802db63b503bb575673345bc57 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Mar 2021 11:48:45 +0900 Subject: [PATCH 07/75] 1.12.0 final --- gnome-commander.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 05c1a64..4ab02c0 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -15,8 +15,8 @@ %global use_gcc_strict_sanitize 1 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force @@ -39,7 +39,9 @@ %global if_pre 1 %endif -%global mainrel 0.1.100 +%global shortver 1.12 +%global fullver %{shortver}.0 +%global mainrel 0.100 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -63,9 +65,9 @@ %global use_autotool 1 Name: gnome-commander -Version: 1.12 # Downgrade 3 times, sorry... Epoch: 4 +Version: %{fullver} Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) @@ -74,7 +76,7 @@ Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME License: GPLv2+ URL: http://gcmd.github.io/ %if 0%{?use_release} -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.10/%{name}-%{version}%{?extratag:-%extratag}.tar.xz +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{shortver}/%{name}-%{version}%{?extratag:-%extratag}.tar.xz %endif %if 0%{?use_gitbare} Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz From 4a7a6d4af7d071efad2c0d874cfb0c077928a06f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 26 Mar 2021 11:50:41 +0900 Subject: [PATCH 08/75] 1.12.0 --- .gitignore | 1 + gnome-commander.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index facffa3..c36c5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.10.2.tar.xz /gnome-commander-1.10.3.tar.xz /gnome-commander-20210319T1025.tar.gz +/gnome-commander-1.12.0.tar.xz diff --git a/gnome-commander.spec b/gnome-commander.spec index 4ab02c0..3026446 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,7 +13,7 @@ %global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.0 -%global mainrel 0.100 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -351,6 +351,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/pixmaps/%{name}/ %changelog +* Fri Mar 26 2021 Mamoru TASAKA - 4:1.12.0-1 +- 1.12.0 + * Tue Feb 23 2021 Mamoru TASAKA - 4:1.10.3-3 - Fix FTBFS wrt std::byte <=> Exiv2::byte confusion, perhaps exposed by glibc 2.33.9000 diff --git a/sources b/sources index f5ee1fa..287dcbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20210319T1025.tar.gz) = df76d983f9a94c88cf415113df967c688c7faa8ee4377aab32ac702c27531ba54893ded19055ccdce13f5c3aab067bda9b771e3dcc2911d9981a2427095d0b36 +SHA512 (gnome-commander-1.12.0.tar.xz) = aab5c03c2a4e8d75e7cd0014153a4d107286f413c87bc31d6cdc4e2fdaaeac95ad20a41bd8125565f903176cc7a5c4788f227631095d634943bdf378790c43aa From f095ddf618f0a339cdf9c502daae766ddf399665 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 19 Apr 2021 15:59:35 +0900 Subject: [PATCH 09/75] 1.12.1 --- .gitignore | 1 + gnome-commander.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c36c5ff..cdd22bc 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.10.3.tar.xz /gnome-commander-20210319T1025.tar.gz /gnome-commander-1.12.0.tar.xz +/gnome-commander-1.12.1.tar.xz diff --git a/gnome-commander.spec b/gnome-commander.spec index 3026446..4111b3b 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %endif %global shortver 1.12 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -255,7 +255,7 @@ ln -sf ../configure %configure \ --srcdir=$(pwd)/.. \ --bindir=%{_libexecdir}/%{name} \ - --disable-werror \ + --disable-Werror \ --disable-scrollkeeper \ %{nil} @@ -351,6 +351,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Apr 19 2021 Mamoru TASAKA - 4:1.12.1-1 +- 1.12.1 + * Fri Mar 26 2021 Mamoru TASAKA - 4:1.12.0-1 - 1.12.0 diff --git a/sources b/sources index 287dcbe..2427080 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.12.0.tar.xz) = aab5c03c2a4e8d75e7cd0014153a4d107286f413c87bc31d6cdc4e2fdaaeac95ad20a41bd8125565f903176cc7a5c4788f227631095d634943bdf378790c43aa +SHA512 (gnome-commander-1.12.1.tar.xz) = 74756af9a720ab81904e3f7834ae008af67d635cc1d1b961420d02c029616465dfe06a18bc5b443d0a9725cfefe6e9f7cdba68faa62515f8ccb85a2246867010 From 9e94ddd5efaab73dce4ac8d0c511220cbcad3e2d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 19 Jun 2021 09:20:59 +0900 Subject: [PATCH 10/75] 1.12.2 --- .gitignore | 1 + gnome-commander.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cdd22bc..2e34d75 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-20210319T1025.tar.gz /gnome-commander-1.12.0.tar.xz /gnome-commander-1.12.1.tar.xz +/gnome-commander-1.12.2.tar.xz diff --git a/gnome-commander.spec b/gnome-commander.spec index 4111b3b..13af81c 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %endif %global shortver 1.12 -%global fullver %{shortver}.1 +%global fullver %{shortver}.2 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -351,6 +351,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/pixmaps/%{name}/ %changelog +* Sat Jun 19 2021 Mamoru TASAKA - 4:1.12.2-1 +- 1.12.2 + * Mon Apr 19 2021 Mamoru TASAKA - 4:1.12.1-1 - 1.12.1 diff --git a/sources b/sources index 2427080..add081b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.12.1.tar.xz) = 74756af9a720ab81904e3f7834ae008af67d635cc1d1b961420d02c029616465dfe06a18bc5b443d0a9725cfefe6e9f7cdba68faa62515f8ccb85a2246867010 +SHA512 (gnome-commander-1.12.2.tar.xz) = 0f56450a09fcf8a73cc31e91564b133fd5fd199ea75c9376a2c329e070554c2c3ae4916f899940f92ddea5fff29656c9485a207dd22a28f1cda12a46f4cab32c From b3d06d59cf6f5fffcabf37606c9756bcca669023 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 25 Jul 2021 10:21:29 +0900 Subject: [PATCH 11/75] Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 13af81c..9207a33 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -68,7 +68,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Release: %{fedorarel}%{flagrel}%{?dist}.1 Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -351,6 +351,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Jul 25 2021 Mamoru TASAKA - 4:1.12.2-1.1 +- Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jun 19 2021 Mamoru TASAKA - 4:1.12.2-1 - 1.12.2 From 3741723a033ebfbc2d7df2034c52b1835212954b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 13 Aug 2021 16:36:09 +0900 Subject: [PATCH 12/75] Drop old scrollkeeper stuff --- gnome-commander.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 9207a33..ca265ac 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.2 -%global mainrel 1 +%global mainrel 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -68,7 +68,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist}.1 +Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -96,7 +96,6 @@ BuildRequires: libubsan BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool -BuildRequires: scrollkeeper BuildRequires: chmlib-devel BuildRequires: pkgconfig(exiv2) >= %{EXIV2_REQ} @@ -351,6 +350,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/pixmaps/%{name}/ %changelog +* Fri Aug 13 2021 Mamoru TASAKA - 4:1.12.2-2 +- Drop old scrollkeeper stuff + * Sun Jul 25 2021 Mamoru TASAKA - 4:1.12.2-1.1 - Rebuild for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From b9eefba22d204f1aadf0240f88e7dcd3a998cdce Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Nov 2021 14:05:24 +0900 Subject: [PATCH 13/75] try the latest git --- .gitignore | 1 + create-gcmd-git-bare-tarball.sh | 2 +- gnome-commander.spec | 14 +++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2e34d75..a05de35 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.12.0.tar.xz /gnome-commander-1.12.1.tar.xz /gnome-commander-1.12.2.tar.xz +/gnome-commander-20211118T1354.tar.gz diff --git a/create-gcmd-git-bare-tarball.sh b/create-gcmd-git-bare-tarball.sh index 6ec6fa7..8326c21 100644 --- a/create-gcmd-git-bare-tarball.sh +++ b/create-gcmd-git-bare-tarball.sh @@ -5,7 +5,7 @@ set -e REPONAME=gnome-commander GITURL=https://gitlab.gnome.org/GNOME/${REPONAME}.git -BRANCH=gcmd-1-12 +BRANCH=master DATE=$(date '+%Y%m%d') TIME=$(date '+%H%M') diff --git a/gnome-commander.spec b/gnome-commander.spec index ca265ac..b87febf 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -15,8 +15,8 @@ %global use_gcc_strict_sanitize 0 -%global use_release 1 -%global use_gitbare 0 +%global use_release 0 +%global use_gitbare 1 %if 0%{?use_gitbare} < 1 # force @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20210319 -%global gittartime 1025 -%global gitbaredate 20210318 -%global git_rev 3ebb680e6a181d1dc6f7c3a188f3d5d90ff26d32 +%global gittardate 20211118 +%global gittartime 1354 +%global gitbaredate 20211117 +%global git_rev aa5b6b51f42b63a2dbba243878688490ecfd7a6d %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.2 -%global mainrel 2 +%global mainrel 2.1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} diff --git a/sources b/sources index add081b..0d0aa89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.12.2.tar.xz) = 0f56450a09fcf8a73cc31e91564b133fd5fd199ea75c9376a2c329e070554c2c3ae4916f899940f92ddea5fff29656c9485a207dd22a28f1cda12a46f4cab32c +SHA512 (gnome-commander-20211118T1354.tar.gz) = 96d56b23cc4bdde941679696039a2fa01b6669f47cbf8322f1dceed80aeadc95d307ab183521adec8d9c81e70a97a8b0f3f959359bd61e8268ac297671648c5c From 62328f2e1b44b95268d938f25144e5546e4738b9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Nov 2021 15:02:35 +0900 Subject: [PATCH 14/75] fix compilation --- ...omeCmdFile-get_adate-fix-compilation.patch | 29 +++++++++++++++++++ gnome-commander.spec | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch 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 new file mode 100644 index 0000000..c8e09d2 --- /dev/null +++ b/gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch @@ -0,0 +1,29 @@ +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 b87febf..2b07db6 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -86,6 +86,7 @@ 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 +Patch101: gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -194,6 +195,7 @@ 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 ) From aafe7a5cc998e13c386739a40e5a5e7b7ebbaa08 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Nov 2021 16:02:06 +0900 Subject: [PATCH 15/75] add reference --- gnome-commander.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gnome-commander.spec b/gnome-commander.spec index 2b07db6..c83072d 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -86,6 +86,7 @@ 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++ From c8970c7aafe318021818450f1a032cc28580356d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Nov 2021 22:24:54 +0900 Subject: [PATCH 16/75] update to the latest git --- .gitignore | 1 + ...omeCmdFile-get_adate-fix-compilation.patch | 29 ------------------- gnome-commander.spec | 9 ++---- sources | 2 +- 4 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 gnome-commander-1.12.x-git-0001-GnomeCmdFile-get_adate-fix-compilation.patch 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 From 210f134125db22e75327e76c9edd3a766e55004c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Nov 2021 15:57:51 +0900 Subject: [PATCH 17/75] 1.12.3 enable test --- .gitignore | 1 + ...viewer-utils-fix-logic-on-big-endian.patch | 102 ++++++++++++++++++ gnome-commander.spec | 25 ++++- sources | 2 +- 4 files changed, 127 insertions(+), 3 deletions(-) create mode 100644 0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch diff --git a/.gitignore b/.gitignore index 2e34d75..dff499e 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.12.0.tar.xz /gnome-commander-1.12.1.tar.xz /gnome-commander-1.12.2.tar.xz +/gnome-commander-1.12.3.tar.xz diff --git a/0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch b/0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch new file mode 100644 index 0000000..f9e52d8 --- /dev/null +++ b/0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch @@ -0,0 +1,102 @@ +From dcaaf89d44ddb463e8be22583080f454fc61d2d9 Mon Sep 17 00:00:00 2001 +From: gnome-commander Fedora maintainer + +Date: Sun, 21 Nov 2021 11:21:29 +0900 +Subject: [PATCH] unicode2utf8(viewer-utils): fix logic on big endian + +--- + src/intviewer/inputmodes.cc | 2 +- + src/intviewer/viewer-utils.cc | 24 ++++++++++++------------ + src/intviewer/viewer-utils.h | 2 +- + 3 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/intviewer/inputmodes.cc b/src/intviewer/inputmodes.cc +index 269777e7..7a4d1b5f 100644 +--- a/src/intviewer/inputmodes.cc ++++ b/src/intviewer/inputmodes.cc +@@ -223,7 +223,7 @@ static void inputmode_ascii_activate(GVInputModesData *imd, const gchar *encodin + { + // these are defined in 'cp437.c' + unsigned int unicode = ascii_cp437_to_unicode[i]; +- unicode2utf8(unicode, (unsigned char*)&imd->ascii_charset_translation[i]); ++ unicode2utf8(unicode, &imd->ascii_charset_translation[i]); + } + g_free (imd->input_mode_name); + imd->input_mode_name = g_strdup ("CP437"); +diff --git a/src/intviewer/viewer-utils.cc b/src/intviewer/viewer-utils.cc +index 40f8819c..6d9c6e59 100644 +--- a/src/intviewer/viewer-utils.cc ++++ b/src/intviewer/viewer-utils.cc +@@ -29,36 +29,36 @@ + + using namespace std; + +-int unicode2utf8 (unsigned int unicode, unsigned char *out) ++int unicode2utf8 (unsigned int unicode, char_type *out) + { + int bytes_needed = 0; + if (unicode<0x80) + { + bytes_needed = 1; +- out[0] = (unsigned char)(unicode&0xFF); ++ *out = (unsigned char)(unicode&0xFF); + } + else + if (unicode<0x0800) + { + bytes_needed = 2; +- out[0] = (unsigned char)(unicode>>6 | 0xC0); +- out[1] = (unsigned char)((unicode&0x3F)| 0x80); ++ *out = (unsigned char)(unicode>>6 | 0xC0); ++ *out |= ((unsigned char)((unicode&0x3F)| 0x80) << 8); + } + else + if (unicode<0x10000) + { + bytes_needed = 3; +- out[0] = (unsigned char)((unicode>>12) | 0xE0); +- out[1] = (unsigned char)(((unicode>>6) & 0x3F) | 0x80); +- out[2] = (unsigned char)((unicode & 0x3F) | 0x80); ++ *out = (unsigned char)((unicode>>12) | 0xE0); ++ *out |= ((unsigned char)(((unicode>>6) & 0x3F) | 0x80) << 8); ++ *out |= ((unsigned char)((unicode & 0x3F) | 0x80) << 16); + } + else + { + bytes_needed = 4; +- out[0] = (unsigned char)((unicode>>18) | 0xE0); +- out[1] = (unsigned char)(((unicode>>12) & 0x3F) | 0x80); +- out[2] = (unsigned char)(((unicode>>6) & 0x3F) | 0x80); +- out[3] = (unsigned char)((unicode & 0x3F) | 0x80); ++ *out = (unsigned char)((unicode>>18) | 0xE0); ++ *out |= ((unsigned char)(((unicode>>12) & 0x3F) | 0x80) << 8); ++ *out |= ((unsigned char)(((unicode>>6) & 0x3F) | 0x80) << 16); ++ *out |= ((unsigned char)((unicode & 0x3F) | 0x80) << 24); + } + + return bytes_needed; +@@ -84,7 +84,7 @@ char_type *convert_utf8_to_chartype_array (const gchar *utf8text, /*out*/ int &a + { + unicode_char = g_utf8_get_char(pos); + +- unicode2utf8(unicode_char, (unsigned char*)&result[index]); ++ unicode2utf8(unicode_char, &result[index]); + + pos = g_utf8_next_char(pos); + if (!pos) +diff --git a/src/intviewer/viewer-utils.h b/src/intviewer/viewer-utils.h +index eb06fedc..c561e698 100644 +--- a/src/intviewer/viewer-utils.h ++++ b/src/intviewer/viewer-utils.h +@@ -26,7 +26,7 @@ + + #define GVIEWER_DEFAULT_PATH_PREFIX "/gnome-commander/internal_viewer/" + +-int unicode2utf8(unsigned int unicode, unsigned char *out); ++int unicode2utf8(unsigned int unicode, char_type *out); + char_type *convert_utf8_to_chartype_array(const gchar *utf8text, /*out*/ int &array_length); + + guint8 *mem_reverse(const guint8 *buffer, guint buflen); +-- +2.33.1 + diff --git a/gnome-commander.spec b/gnome-commander.spec index ca265ac..dc9a24f 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,8 +40,8 @@ %endif %global shortver 1.12 -%global fullver %{shortver}.2 -%global mainrel 2 +%global fullver %{shortver}.3 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -86,6 +86,8 @@ 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 +# Must send to be upstream +Patch101: 0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -125,6 +127,9 @@ BuildRequires: make BuildRequires: %{_bindir}/git BuildRequires: %{_bindir}/appstream-util +# %%check +BuildRequires: gtest-devel + Requires: gnome-vfs2-smb Requires: meld Requires: gnome-icon-theme-legacy @@ -194,6 +199,7 @@ 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 ) @@ -323,6 +329,17 @@ popd %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml +%if 0%{?use_gitbare} +pushd %{name} +%endif + +pushd _builddir +make check + +%if 0%{?use_gitbare} +popd +%endif + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS @@ -350,6 +367,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Nov 21 2021 Mamoru TASAKA - 4:1.12.3-1 +- 1.12.3 +- enable test + * Fri Aug 13 2021 Mamoru TASAKA - 4:1.12.2-2 - Drop old scrollkeeper stuff diff --git a/sources b/sources index add081b..1efd9b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.12.2.tar.xz) = 0f56450a09fcf8a73cc31e91564b133fd5fd199ea75c9376a2c329e070554c2c3ae4916f899940f92ddea5fff29656c9485a207dd22a28f1cda12a46f4cab32c +SHA512 (gnome-commander-1.12.3.tar.xz) = 7bdf29e9668b3eb40604db665d55d9300317f756a785ed5b6d5b6f5d684dc9a6c0fdcfeabd06cf522a9dbc9bbe904e575947d9eef771eab3dd813bd8e50dc5a9 From 3e2f9cdfde5864e31b5abe3c2a6df979f27a0d76 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Nov 2021 15:59:21 +0900 Subject: [PATCH 18/75] once reset release to 1 --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 3db141c..c2c3d3a 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.2 -%global mainrel 2.1 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} From 13f7afd84ead8520b0c88af40924a2dc6556aa77 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Nov 2021 16:34:30 +0900 Subject: [PATCH 19/75] update to the latest git --- .gitignore | 1 + gnome-commander.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fa3c6a2..24b3a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.12.3.tar.xz /gnome-commander-20211118T1354.tar.gz /gnome-commander-20211118T2218.tar.gz +/gnome-commander-20211121T1604.tar.gz diff --git a/gnome-commander.spec b/gnome-commander.spec index 9b51555..29be664 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20211118 -%global gittartime 2218 -%global gitbaredate 20211118 -%global git_rev b87e5bb78504279bc88f3aa7bfe322bef3521012 +%global gittardate 20211121 +%global gittartime 1604 +%global gitbaredate 20211119 +%global git_rev d8f8996aaa4848780354655b8259b4c7a3c5b054 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} diff --git a/sources b/sources index 8bb9463..b4b0cc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211118T2218.tar.gz) = baad3d119fefbf0669d2f45d66bfdf31bb53ad08684cc24081abf639775d80a8a8cbd29c4e8f61b46fa3b26a4be68e03c34f486c4c2030932dd16304b8945b34 +SHA512 (gnome-commander-20211121T1604.tar.gz) = bf416baa94580e14156767cfe95034ecbb9653f56830cceed3f6916d387437a8fa6462bbbc10a43aca0e2a46992fd0b59afa265b1c99fa8d31d330df7821a825 From 10361fb485b6304c2b13c38e2f5d845b349a8074 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Nov 2021 10:28:03 +0900 Subject: [PATCH 20/75] 1.12.3.1 --- .gitignore | 1 + ...viewer-utils-fix-logic-on-big-endian.patch | 102 ------------------ gnome-commander.spec | 7 +- sources | 2 +- 4 files changed, 6 insertions(+), 106 deletions(-) delete mode 100644 0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch diff --git a/.gitignore b/.gitignore index dff499e..6f72d53 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-1.12.3.tar.xz +/gnome-commander-1.12.3.1.tar.xz diff --git a/0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch b/0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch deleted file mode 100644 index f9e52d8..0000000 --- a/0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch +++ /dev/null @@ -1,102 +0,0 @@ -From dcaaf89d44ddb463e8be22583080f454fc61d2d9 Mon Sep 17 00:00:00 2001 -From: gnome-commander Fedora maintainer - -Date: Sun, 21 Nov 2021 11:21:29 +0900 -Subject: [PATCH] unicode2utf8(viewer-utils): fix logic on big endian - ---- - src/intviewer/inputmodes.cc | 2 +- - src/intviewer/viewer-utils.cc | 24 ++++++++++++------------ - src/intviewer/viewer-utils.h | 2 +- - 3 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/src/intviewer/inputmodes.cc b/src/intviewer/inputmodes.cc -index 269777e7..7a4d1b5f 100644 ---- a/src/intviewer/inputmodes.cc -+++ b/src/intviewer/inputmodes.cc -@@ -223,7 +223,7 @@ static void inputmode_ascii_activate(GVInputModesData *imd, const gchar *encodin - { - // these are defined in 'cp437.c' - unsigned int unicode = ascii_cp437_to_unicode[i]; -- unicode2utf8(unicode, (unsigned char*)&imd->ascii_charset_translation[i]); -+ unicode2utf8(unicode, &imd->ascii_charset_translation[i]); - } - g_free (imd->input_mode_name); - imd->input_mode_name = g_strdup ("CP437"); -diff --git a/src/intviewer/viewer-utils.cc b/src/intviewer/viewer-utils.cc -index 40f8819c..6d9c6e59 100644 ---- a/src/intviewer/viewer-utils.cc -+++ b/src/intviewer/viewer-utils.cc -@@ -29,36 +29,36 @@ - - using namespace std; - --int unicode2utf8 (unsigned int unicode, unsigned char *out) -+int unicode2utf8 (unsigned int unicode, char_type *out) - { - int bytes_needed = 0; - if (unicode<0x80) - { - bytes_needed = 1; -- out[0] = (unsigned char)(unicode&0xFF); -+ *out = (unsigned char)(unicode&0xFF); - } - else - if (unicode<0x0800) - { - bytes_needed = 2; -- out[0] = (unsigned char)(unicode>>6 | 0xC0); -- out[1] = (unsigned char)((unicode&0x3F)| 0x80); -+ *out = (unsigned char)(unicode>>6 | 0xC0); -+ *out |= ((unsigned char)((unicode&0x3F)| 0x80) << 8); - } - else - if (unicode<0x10000) - { - bytes_needed = 3; -- out[0] = (unsigned char)((unicode>>12) | 0xE0); -- out[1] = (unsigned char)(((unicode>>6) & 0x3F) | 0x80); -- out[2] = (unsigned char)((unicode & 0x3F) | 0x80); -+ *out = (unsigned char)((unicode>>12) | 0xE0); -+ *out |= ((unsigned char)(((unicode>>6) & 0x3F) | 0x80) << 8); -+ *out |= ((unsigned char)((unicode & 0x3F) | 0x80) << 16); - } - else - { - bytes_needed = 4; -- out[0] = (unsigned char)((unicode>>18) | 0xE0); -- out[1] = (unsigned char)(((unicode>>12) & 0x3F) | 0x80); -- out[2] = (unsigned char)(((unicode>>6) & 0x3F) | 0x80); -- out[3] = (unsigned char)((unicode & 0x3F) | 0x80); -+ *out = (unsigned char)((unicode>>18) | 0xE0); -+ *out |= ((unsigned char)(((unicode>>12) & 0x3F) | 0x80) << 8); -+ *out |= ((unsigned char)(((unicode>>6) & 0x3F) | 0x80) << 16); -+ *out |= ((unsigned char)((unicode & 0x3F) | 0x80) << 24); - } - - return bytes_needed; -@@ -84,7 +84,7 @@ char_type *convert_utf8_to_chartype_array (const gchar *utf8text, /*out*/ int &a - { - unicode_char = g_utf8_get_char(pos); - -- unicode2utf8(unicode_char, (unsigned char*)&result[index]); -+ unicode2utf8(unicode_char, &result[index]); - - pos = g_utf8_next_char(pos); - if (!pos) -diff --git a/src/intviewer/viewer-utils.h b/src/intviewer/viewer-utils.h -index eb06fedc..c561e698 100644 ---- a/src/intviewer/viewer-utils.h -+++ b/src/intviewer/viewer-utils.h -@@ -26,7 +26,7 @@ - - #define GVIEWER_DEFAULT_PATH_PREFIX "/gnome-commander/internal_viewer/" - --int unicode2utf8(unsigned int unicode, unsigned char *out); -+int unicode2utf8(unsigned int unicode, char_type *out); - char_type *convert_utf8_to_chartype_array(const gchar *utf8text, /*out*/ int &array_length); - - guint8 *mem_reverse(const guint8 *buffer, guint buflen); --- -2.33.1 - diff --git a/gnome-commander.spec b/gnome-commander.spec index dc9a24f..713c76e 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %endif %global shortver 1.12 -%global fullver %{shortver}.3 +%global fullver %{shortver}.3.1 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -87,7 +87,6 @@ Source2: create-gcmd-git-bare-tarball.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch # Must send to be upstream -Patch101: 0001-unicode2utf8-viewer-utils-fix-logic-on-big-endian.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -199,7 +198,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 ) @@ -367,6 +365,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Nov 22 2021 Mamoru TASAKA - 4:1.12.3.1-1 +- 1.12.3.1 + * Sun Nov 21 2021 Mamoru TASAKA - 4:1.12.3-1 - 1.12.3 - enable test diff --git a/sources b/sources index 1efd9b0..212c6fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.12.3.tar.xz) = 7bdf29e9668b3eb40604db665d55d9300317f756a785ed5b6d5b6f5d684dc9a6c0fdcfeabd06cf522a9dbc9bbe904e575947d9eef771eab3dd813bd8e50dc5a9 +SHA512 (gnome-commander-1.12.3.1.tar.xz) = 1206d545493deeb2237af6b9026baf6faab2a8f6ae86eb1abb5c2e5ceb6212ad66382d3abd07c89f14271ac8709d14548f0bfe68fb0e11b1779e0c061e0272e5 From ecd0a7b79506f709dfc437dec4b4da2f45878d26 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Nov 2021 22:59:00 +0900 Subject: [PATCH 21/75] Fix crash when saving device information on preference --- ...e_devices-place-GVariantBuilder-stru.patch | 64 +++++++++++++++++++ gnome-commander.spec | 30 ++++++++- 2 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch diff --git a/0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch b/0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch new file mode 100644 index 0000000..7aafb7e --- /dev/null +++ b/0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch @@ -0,0 +1,64 @@ +From 9723c65d0295baedeb6ee4cb85b35ab51ef22376 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Mon, 22 Nov 2021 17:04:36 +0900 +Subject: [PATCH] GnomeCmdData::save_devices: place GVariantBuilder structure + on stack initially + +As written on: +https://www.freedesktop.org/software/gstreamer-sdk/data/docs/latest/glib/glib-GVariant.html#g-variant-builder-new +when calling g_variant_builder_init(), GVariantBuilder structure must be placed on stack first +and the reference to the memory must be passed to the function, instead of +passing nullptr. +--- + src/gnome-cmd-data.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc +index 51407cc..b38f96a 100644 +--- a/src/gnome-cmd-data.cc ++++ b/src/gnome-cmd-data.cc +@@ -1722,23 +1722,24 @@ void GnomeCmdData::save_devices() + devices = gnome_cmd_con_list_get_all_dev (gnome_cmd_data.priv->con_list); + if (devices && g_list_length(devices) > 0) + { +- GVariantBuilder *gVariantBuilder = nullptr; ++ GVariantBuilder gVariantBuilder; ++ gboolean device_added_p = false; + + for (; devices; devices = devices->next) + { + auto *device = GNOME_CMD_CON_DEVICE (devices->data); + if (device && !gnome_cmd_con_device_get_autovol (device)) + { +- if (!gVariantBuilder) ++ if (!device_added_p) + { +- g_variant_builder_init (gVariantBuilder, G_VARIANT_TYPE_ARRAY); ++ g_variant_builder_init (&gVariantBuilder, G_VARIANT_TYPE_ARRAY); + } +- ++ device_added_p = true; + gchar *icon_path = g_strdup (gnome_cmd_con_device_get_icon_path (device)); + if (!icon_path || icon_path[0] == '\0') + icon_path = g_strdup (""); + +- g_variant_builder_add (gVariantBuilder, GCMD_SETTINGS_DEVICES_FORMAT_STRING, ++ g_variant_builder_add (&gVariantBuilder, GCMD_SETTINGS_DEVICES_FORMAT_STRING, + gnome_cmd_con_device_get_alias (device), + gnome_cmd_con_device_get_device_fn (device), + gnome_cmd_con_device_get_mountp (device), +@@ -1747,9 +1748,9 @@ void GnomeCmdData::save_devices() + } + } + +- if (gVariantBuilder) ++ if (device_added_p) + { +- devicesToStore = g_variant_builder_end (gVariantBuilder); ++ devicesToStore = g_variant_builder_end (&gVariantBuilder); + g_settings_set_value(options.gcmd_settings->general, GCMD_SETTINGS_DEVICES, devicesToStore); + return; + } +-- +2.33.1 + diff --git a/gnome-commander.spec b/gnome-commander.spec index 713c76e..c69add0 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,7 +13,7 @@ %global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global use_release 1 %global use_gitbare 0 @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.3.1 -%global mainrel 1 +%global mainrel 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -87,6 +87,7 @@ Source2: create-gcmd-git-bare-tarball.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch # Must send to be upstream +Patch101: 0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -192,12 +193,34 @@ git config user.name "%{name} Fedora maintainer" git config user.email "%{name}-owner@fedoraproject.org" %if 0%{?use_release} +cat > .gitignore < 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) @@ -365,6 +388,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Nov 22 2021 Mamoru TASAKA - 4:1.12.3.1-2 +- Fix crash when saving device information on preference + * Mon Nov 22 2021 Mamoru TASAKA - 4:1.12.3.1-1 - 1.12.3.1 From c6a3cf3ce65710806761a26c104b306daa6b1342 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Nov 2021 23:04:26 +0900 Subject: [PATCH 22/75] drop sanitizer for formal build, oops... --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index c69add0..068a248 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,7 +13,7 @@ %global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 From d258ce83af90b7b3a27da78da28804c9284be6b3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Nov 2021 22:24:28 +0900 Subject: [PATCH 23/75] wrap patch --- gnome-commander.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnome-commander.spec b/gnome-commander.spec index 068a248..f166d9d 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -220,7 +220,10 @@ git commit -m "base" -q %patch1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a +%if 0%{?use_release} +# Already fixed in git master cat %PATCH101 | git am +%endif %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) From b265cf38cf4e7f9495484187d5c8475092230f34 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 Nov 2021 22:27:56 +0900 Subject: [PATCH 24/75] bump --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index ce86fe5..9aacba4 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.3.1 -%global mainrel 2 +%global mainrel 3 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} From 1da79321245c6ffe0703b30f9fc026dcaaabb245 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 25 Nov 2021 23:55:24 +0900 Subject: [PATCH 25/75] update to the latest git --- .gitignore | 1 + gnome-commander.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index af96a00..128fb88 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-20211118T1354.tar.gz /gnome-commander-20211118T2218.tar.gz /gnome-commander-20211121T1604.tar.gz +/gnome-commander-20211124T2228.tar.gz diff --git a/gnome-commander.spec b/gnome-commander.spec index 9aacba4..29806bc 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20211121 -%global gittartime 1604 -%global gitbaredate 20211119 -%global git_rev d8f8996aaa4848780354655b8259b4c7a3c5b054 +%global gittardate 20211124 +%global gittartime 2228 +%global gitbaredate 20211123 +%global git_rev 6805c3325e6f5e9c49fafc5c982f337584d2f7d1 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} diff --git a/sources b/sources index b4b0cc0..741f2d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211121T1604.tar.gz) = bf416baa94580e14156767cfe95034ecbb9653f56830cceed3f6916d387437a8fa6462bbbc10a43aca0e2a46992fd0b59afa265b1c99fa8d31d330df7821a825 +SHA512 (gnome-commander-20211124T2228.tar.gz) = 4d758f52880d6a66b117f510ec4903f8aec339ef95b009e44dffece561c586e3826b65e9172f14db9866dbfc6b39ef5c16ee32da6c7d28bddc07897b21f5289b From 418bb301c40a14352766e3fe8d0e0cbfc42d46cf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 29 Nov 2021 16:25:48 +0900 Subject: [PATCH 26/75] update to the latest git --- .gitignore | 1 + gnome-commander.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 128fb88..d63aac6 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-20211118T2218.tar.gz /gnome-commander-20211121T1604.tar.gz /gnome-commander-20211124T2228.tar.gz +/gnome-commander-20211129T1620.tar.gz diff --git a/gnome-commander.spec b/gnome-commander.spec index 29806bc..30163c9 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20211124 -%global gittartime 2228 -%global gitbaredate 20211123 -%global git_rev 6805c3325e6f5e9c49fafc5c982f337584d2f7d1 +%global gittardate 20211129 +%global gittartime 1620 +%global gitbaredate 20211129 +%global git_rev 753a92e9a763814a8f8f6d6470de4c0aa85b1106 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} diff --git a/sources b/sources index 741f2d9..972550d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211124T2228.tar.gz) = 4d758f52880d6a66b117f510ec4903f8aec339ef95b009e44dffece561c586e3826b65e9172f14db9866dbfc6b39ef5c16ee32da6c7d28bddc07897b21f5289b +SHA512 (gnome-commander-20211129T1620.tar.gz) = e0b2a8649b4ef6e368253577db85b485050a48ddac0d4455f7f0780194a8b0530fe4877718462e526b07a3527a885363b2a37815856f5ce77be2581b73a31502 From 41d87785df803f388bda7d46542a277c975fd252 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 7 Dec 2021 15:07:30 +0900 Subject: [PATCH 27/75] update to the latest git --- .gitignore | 1 + gnome-commander.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d63aac6..ac5dc63 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-20211121T1604.tar.gz /gnome-commander-20211124T2228.tar.gz /gnome-commander-20211129T1620.tar.gz +/gnome-commander-20211207T1450.tar.gz diff --git a/gnome-commander.spec b/gnome-commander.spec index 30163c9..875e1bd 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20211129 -%global gittartime 1620 -%global gitbaredate 20211129 -%global git_rev 753a92e9a763814a8f8f6d6470de4c0aa85b1106 +%global gittardate 20211207 +%global gittartime 1450 +%global gitbaredate 20211206 +%global git_rev 55a4782bc981af0af7434a7afcb529c41d08dac3 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} diff --git a/sources b/sources index 972550d..33634a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211129T1620.tar.gz) = e0b2a8649b4ef6e368253577db85b485050a48ddac0d4455f7f0780194a8b0530fe4877718462e526b07a3527a885363b2a37815856f5ce77be2581b73a31502 +SHA512 (gnome-commander-20211207T1450.tar.gz) = f9f66cddb87c91a568647fd42f8586990bd3205eca5df5eabebcec7d3eb9163e191ac045c0b65abd545d8cba2859d1fadc4cf219105c0d18df5bf4763b601c9d From 95b50213020a0e584a57c62f8ec40518e71d638a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 27 Dec 2021 15:49:57 +0900 Subject: [PATCH 28/75] update to the latest git --- .gitignore | 1 + gnome-commander.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ac5dc63..dd644c8 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-20211124T2228.tar.gz /gnome-commander-20211129T1620.tar.gz /gnome-commander-20211207T1450.tar.gz +/gnome-commander-20211227T1536.tar.gz diff --git a/gnome-commander.spec b/gnome-commander.spec index 875e1bd..f42e9ce 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20211207 -%global gittartime 1450 -%global gitbaredate 20211206 -%global git_rev 55a4782bc981af0af7434a7afcb529c41d08dac3 +%global gittardate 20211227 +%global gittartime 1536 +%global gitbaredate 20211221 +%global git_rev 6e82b3f9d5805931fdbd1cb051f107692af50e09 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} diff --git a/sources b/sources index 33634a1..1711b8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211207T1450.tar.gz) = f9f66cddb87c91a568647fd42f8586990bd3205eca5df5eabebcec7d3eb9163e191ac045c0b65abd545d8cba2859d1fadc4cf219105c0d18df5bf4763b601c9d +SHA512 (gnome-commander-20211227T1536.tar.gz) = 5cede91caa8547885e15d573f19a3bd0dd402aa9900ae3c1ab2a1bf40c4d1334fe1ccfc509e556009b96ddcad009d3f45e2013ee304a41d4b6d276560a9f58c8 From 421871400256e37b9083f26f8da7836c684e7a27 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Jan 2022 15:35:17 +0900 Subject: [PATCH 29/75] update to the latest git --- .gitignore | 1 + gnome-commander.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dd644c8..456d133 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-20211129T1620.tar.gz /gnome-commander-20211207T1450.tar.gz /gnome-commander-20211227T1536.tar.gz +/gnome-commander-20220113T1526.tar.gz diff --git a/gnome-commander.spec b/gnome-commander.spec index f42e9ce..a8a29e7 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20211227 -%global gittartime 1536 -%global gitbaredate 20211221 -%global git_rev 6e82b3f9d5805931fdbd1cb051f107692af50e09 +%global gittardate 20220113 +%global gittartime 1526 +%global gitbaredate 20220109 +%global git_rev fed9ef1a44cd01b6c1dfb231795e07f5f067de57 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} diff --git a/sources b/sources index 1711b8b..b7422f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20211227T1536.tar.gz) = 5cede91caa8547885e15d573f19a3bd0dd402aa9900ae3c1ab2a1bf40c4d1334fe1ccfc509e556009b96ddcad009d3f45e2013ee304a41d4b6d276560a9f58c8 +SHA512 (gnome-commander-20220113T1526.tar.gz) = c97101f1905bd24ff206882d12eff40d771b0ee53a5007555ae462d48a3520a0598ed61f95a71d22133c5666f00ed110aa7c6e4d4d28691f80ba473453b453c1 From 4af64b5f3f7bd7b0fe13df9ac5ce59b51bd4e2d9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Jan 2022 15:40:07 +0900 Subject: [PATCH 30/75] enable asan --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a8a29e7..a45a633 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,7 +13,7 @@ %global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global use_release 0 %global use_gitbare 1 From f948953a477537ddc351c96c223839c1c208043f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 6 Feb 2022 15:31:01 +0900 Subject: [PATCH 31/75] 1.14.0 --- .gitignore | 50 ++------------------------------------------ gnome-commander.spec | 27 ++++++++++++------------ sources | 2 +- 3 files changed, 16 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 456d133..852717d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,2 @@ -gnome-commander-1.2.8.6.tar.bz2 -gnome-commander-1.2.8.7.tar.bz2 -/gnome-commander-1.2.8.8.tar.bz2 -/gnome-commander-1.2.8.9.tar.bz2 -/gnome-commander-1.2.8.10.tar.bz2 -/gnome-commander-1.2.8.11.tar.bz2 -/gnome-commander-1.2.8.12.tar.bz2 -/gnome-commander-1.2.8.13.tar.bz2 -/gnome-commander-1.2.8.14.tar.bz2 -/gnome-commander-1.2.8.15.tar.xz -/gnome-commander-1.2.8.16.tar.xz -/gnome-commander-1.2.8.17.tar.xz -/gnome-commander-1.4.0.tar.xz -/gnome-commander-1.4.1.tar.xz -/gnome-commander-1.4.2.tar.xz -/gnome-commander-1.4.3.tar.xz -/gnome-commander-1.4.4.tar.xz -/gnome-commander-1.4.5.tar.xz -/gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz -/gnome-commander-1.4.6.tar.xz -/gnome-commander-1.4.7.tar.xz -/gnome-commander-1.4.8.tar.xz -/gnome-commander-1.4.9.tar.xz -/gnome-commander-1.6.0.tar.xz -/gnome-commander-1.6.1.tar.xz -/gnome-commander-1.6.2.tar.xz -/gnome-commander-1.6.3.tar.xz -/gnome-commander-1.6.4.tar.xz -/gnome-commander-1.8.0.tar.xz -/gnome-commander-1.8.1.tar.xz -/gnome-commander-1.10.0.tar.xz -/gnome-commander-1.10.1.tar.xz -/gnome-commander-1.10.2.tar.xz -/gnome-commander-1.10.3.tar.xz -/gnome-commander-20210319T1025.tar.gz -/gnome-commander-1.12.0.tar.xz -/gnome-commander-1.12.1.tar.xz -/gnome-commander-1.12.2.tar.xz -/gnome-commander-1.12.3.tar.xz -/gnome-commander-1.12.3.1.tar.xz -/gnome-commander-20211118T1354.tar.gz -/gnome-commander-20211118T2218.tar.gz -/gnome-commander-20211121T1604.tar.gz -/gnome-commander-20211124T2228.tar.gz -/gnome-commander-20211129T1620.tar.gz -/gnome-commander-20211207T1450.tar.gz -/gnome-commander-20211227T1536.tar.gz -/gnome-commander-20220113T1526.tar.gz +/gnome-commander-*.tar.gz +/gnome-commander-*.tar.xz diff --git a/gnome-commander.spec b/gnome-commander.spec index a45a633..4c66e4c 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -13,10 +13,10 @@ %global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force @@ -39,9 +39,9 @@ %global if_pre 1 %endif -%global shortver 1.12 -%global fullver %{shortver}.3.1 -%global mainrel 3 +%global shortver 1.14 +%global fullver %{shortver}.0 +%global mainrel 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} @@ -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 -# Must send to be upstream -Patch101: 0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -221,8 +219,6 @@ git commit -m "base" -q %patch1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} -# Already fixed in git master -cat %PATCH101 | git am %endif %if 0%{use_autotool} > 0 @@ -329,7 +325,7 @@ desktop-file-install \ --vendor '' \ --remove-category Application \ --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}.desktop + %{buildroot}%{_datadir}/applications/org.gnome.%{name}.desktop # Install wrapper %{__mkdir_p} %{buildroot}%{_bindir} @@ -351,7 +347,7 @@ popd %find_lang %{name} %check -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.%{name}.appdata.xml %if 0%{?use_gitbare} pushd %{name} @@ -380,8 +376,8 @@ popd %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* -%{_datadir}/applications/%{name}.desktop -%{_metainfodir}/%{name}.appdata.xml +%{_datadir}/applications/org.gnome.%{name}.desktop +%{_metainfodir}/org.gnome.%{name}.appdata.xml %{_datadir}/help/*/%{name}/ @@ -391,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Feb 6 2022 Mamoru TASAKA - 4:1.14.0-1 +- 1.14.0 + * Mon Nov 22 2021 Mamoru TASAKA - 4:1.12.3.1-2 - Fix crash when saving device information on preference diff --git a/sources b/sources index b7422f8..cae01b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20220113T1526.tar.gz) = c97101f1905bd24ff206882d12eff40d771b0ee53a5007555ae462d48a3520a0598ed61f95a71d22133c5666f00ed110aa7c6e4d4d28691f80ba473453b453c1 +SHA512 (gnome-commander-1.14.0.tar.xz) = 769f1272331ed71f558b87a73a920b9bfd5a2ea2af66972bdcac44d7a7623a6cb32460b0b650bd26d07c27bdc8b71c7d8bc2038076778aa356b638c4765ce4a5 From 7aaf5d7eec97cf4361965c3eb49843fec5e5aaf9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 3 Mar 2022 16:10:25 +0900 Subject: [PATCH 32/75] 1.14.1 --- gnome-commander.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 4c66e4c..d14ce9d 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %endif %global shortver 1.14 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -97,7 +97,6 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool -BuildRequires: chmlib-devel BuildRequires: pkgconfig(exiv2) >= %{EXIV2_REQ} BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -234,7 +233,7 @@ pushd .. %endif # gzip -gzip -9 ChangeLog-* +#gzip -9 ChangeLog-* mkdir TMPBINDIR cd TMPBINDIR @@ -354,6 +353,7 @@ pushd %{name} %endif pushd _builddir +export ASAN_OPTIONS=detect_leaks=0 make check %if 0%{?use_gitbare} @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Mar 3 2022 Mamoru TASAKA - 4:1.14.1-1 +- 1.14.1 + * Sun Feb 6 2022 Mamoru TASAKA - 4:1.14.0-1 - 1.14.0 diff --git a/sources b/sources index cae01b5..44dbc03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.14.0.tar.xz) = 769f1272331ed71f558b87a73a920b9bfd5a2ea2af66972bdcac44d7a7623a6cb32460b0b650bd26d07c27bdc8b71c7d8bc2038076778aa356b638c4765ce4a5 +SHA512 (gnome-commander-1.14.1.tar.xz) = e601486c01201e9798f32b3938a470d41931225d69cafd7b497e83c05b549f4c643f56e3754d8e492939fc3f167cfc7cfb0645628e3e0fd1578cc6eadce485ce From 74b12ae536926bdcabc581cb3f539dd6342d6234 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 31 Mar 2022 15:49:40 +0900 Subject: [PATCH 33/75] 1.14.2 --- gnome-commander.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index d14ce9d..2557bc8 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %endif %global shortver 1.14 -%global fullver %{shortver}.1 +%global fullver %{shortver}.2 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Mar 31 2022 Mamoru TASAKA - 4:1.14.2-1 +- 1.14.2 + * Thu Mar 3 2022 Mamoru TASAKA - 4:1.14.1-1 - 1.14.1 diff --git a/sources b/sources index 44dbc03..8136886 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.14.1.tar.xz) = e601486c01201e9798f32b3938a470d41931225d69cafd7b497e83c05b549f4c643f56e3754d8e492939fc3f167cfc7cfb0645628e3e0fd1578cc6eadce485ce +SHA512 (gnome-commander-1.14.2.tar.xz) = bfbc201ecaf6f9c0a71c7eba73f5d6ef9ba88f0ce8dba5d586058d87125bc51fc4b7f5e9752b7003343d686ea83db916ef78adf8c9d0df1e8715a3c88f9d1ce2 From 1194bfeba7c5666f46f41dc8cefeb927eb9ca55c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 3 Jun 2022 11:31:30 +0900 Subject: [PATCH 34/75] remove upstreamed patch --- ...e_devices-place-GVariantBuilder-stru.patch | 64 ------------------- 1 file changed, 64 deletions(-) delete mode 100644 0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch diff --git a/0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch b/0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch deleted file mode 100644 index 7aafb7e..0000000 --- a/0001-GnomeCmdData-save_devices-place-GVariantBuilder-stru.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9723c65d0295baedeb6ee4cb85b35ab51ef22376 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Mon, 22 Nov 2021 17:04:36 +0900 -Subject: [PATCH] GnomeCmdData::save_devices: place GVariantBuilder structure - on stack initially - -As written on: -https://www.freedesktop.org/software/gstreamer-sdk/data/docs/latest/glib/glib-GVariant.html#g-variant-builder-new -when calling g_variant_builder_init(), GVariantBuilder structure must be placed on stack first -and the reference to the memory must be passed to the function, instead of -passing nullptr. ---- - src/gnome-cmd-data.cc | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc -index 51407cc..b38f96a 100644 ---- a/src/gnome-cmd-data.cc -+++ b/src/gnome-cmd-data.cc -@@ -1722,23 +1722,24 @@ void GnomeCmdData::save_devices() - devices = gnome_cmd_con_list_get_all_dev (gnome_cmd_data.priv->con_list); - if (devices && g_list_length(devices) > 0) - { -- GVariantBuilder *gVariantBuilder = nullptr; -+ GVariantBuilder gVariantBuilder; -+ gboolean device_added_p = false; - - for (; devices; devices = devices->next) - { - auto *device = GNOME_CMD_CON_DEVICE (devices->data); - if (device && !gnome_cmd_con_device_get_autovol (device)) - { -- if (!gVariantBuilder) -+ if (!device_added_p) - { -- g_variant_builder_init (gVariantBuilder, G_VARIANT_TYPE_ARRAY); -+ g_variant_builder_init (&gVariantBuilder, G_VARIANT_TYPE_ARRAY); - } -- -+ device_added_p = true; - gchar *icon_path = g_strdup (gnome_cmd_con_device_get_icon_path (device)); - if (!icon_path || icon_path[0] == '\0') - icon_path = g_strdup (""); - -- g_variant_builder_add (gVariantBuilder, GCMD_SETTINGS_DEVICES_FORMAT_STRING, -+ g_variant_builder_add (&gVariantBuilder, GCMD_SETTINGS_DEVICES_FORMAT_STRING, - gnome_cmd_con_device_get_alias (device), - gnome_cmd_con_device_get_device_fn (device), - gnome_cmd_con_device_get_mountp (device), -@@ -1747,9 +1748,9 @@ void GnomeCmdData::save_devices() - } - } - -- if (gVariantBuilder) -+ if (device_added_p) - { -- devicesToStore = g_variant_builder_end (gVariantBuilder); -+ devicesToStore = g_variant_builder_end (&gVariantBuilder); - g_settings_set_value(options.gcmd_settings->general, GCMD_SETTINGS_DEVICES, devicesToStore); - return; - } --- -2.33.1 - From 005832c18fa02a65ad517688574598a029dc00ca Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 19 Jun 2022 15:27:10 +0900 Subject: [PATCH 35/75] 1.14.3 --- gnome-commander.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 2557bc8..4dbf06e 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %endif %global shortver 1.14 -%global fullver %{shortver}.2 +%global fullver %{shortver}.3 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Jun 19 2022 Mamoru TASAKA - 4:1.14.3-1 +- 1.14.3 + * Thu Mar 31 2022 Mamoru TASAKA - 4:1.14.2-1 - 1.14.2 diff --git a/sources b/sources index 8136886..b57f028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.14.2.tar.xz) = bfbc201ecaf6f9c0a71c7eba73f5d6ef9ba88f0ce8dba5d586058d87125bc51fc4b7f5e9752b7003343d686ea83db916ef78adf8c9d0df1e8715a3c88f9d1ce2 +SHA512 (gnome-commander-1.14.3.tar.xz) = a3a89b922c23b49587d1b459760a263c886636735549c8dcd592b1ccb838838a3748ec83eb65ca8bbb62d82d4b588479a7673314d6924075b733b31318e52756 From 86d37e7b4aa6275d319e23387e6a46790c0497e8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 27 Jul 2022 22:38:03 +0900 Subject: [PATCH 36/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild --- gnome-commander.spec | 5 ++++- noautobuild | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 noautobuild diff --git a/gnome-commander.spec b/gnome-commander.spec index 4dbf06e..2f33ed0 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -68,7 +68,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Release: %{fedorarel}%{flagrel}%{?dist}.1 Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 27 2022 Mamoru TASAKA - 4:1.14.3-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 19 2022 Mamoru TASAKA - 4:1.14.3-1 - 1.14.3 diff --git a/noautobuild b/noautobuild deleted file mode 100644 index 02c8cc6..0000000 --- a/noautobuild +++ /dev/null @@ -1 +0,0 @@ -Check git later From a1478e06e7c11c165595a8558a1fd2d51a3ea3d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 05:24:37 +0000 Subject: [PATCH 37/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 2f33ed0..f346aec 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -68,7 +68,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist}.1 +Release: %{fedorarel}%{flagrel}%{?dist}.2 Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -387,6 +387,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4:1.14.3-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 27 2022 Mamoru TASAKA - 4:1.14.3-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From f13801c56c25b302801bd3d803ea3150710e9c0a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Jan 2023 15:15:15 +0900 Subject: [PATCH 38/75] 1.16.0 --- gnome-commander.spec | 176 ++++++++++--------------------------------- sources | 2 +- 2 files changed, 42 insertions(+), 136 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index f346aec..5ac54cf 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -2,18 +2,17 @@ %undefine _strict_symbol_defs_build %global EXIV2_REQ 0.14 -%global GLIB_REQ 2.44.0 -%global LIBGSF_REQ 1.12.0 -%global POPPLER_REQ 0.8 +%global GLIB_REQ 2.70.0 +%global LIBGSF_REQ 1.14.26 +%global POPPLER_REQ 0.18 %global TAGLIB_REQ 1.4 +%global UNIQUE_REQ 0.9.3 %global mimeedit_rev 1958 -%global use_autotool 0 -%global update_po 0 %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global use_release 1 %global use_gitbare 0 @@ -39,8 +38,8 @@ %global if_pre 1 %endif -%global shortver 1.14 -%global fullver %{shortver}.3 +%global shortver 1.16 +%global fullver %{shortver}.0 %global mainrel 1 %if 0%{?use_release} >= 1 @@ -50,25 +49,11 @@ %global fedorarel %{mainrel}.%{git_version} %endif -%if 0%{?if_pre} > 0 -%global use_autotool 1 -%endif -%if 0%{?use_autotool} < 1 -%global update_po 0 -%endif - -# Patch1 updates configure.in -%global use_autotool 1 - -# Autotool seems still needed to avoid build failure -# under doc/ diretory, need investigating -%global use_autotool 1 - Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist}.2 +Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -105,29 +90,22 @@ BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(libgsf-1) >= %{LIBGSF_REQ} BuildRequires: pkgconfig(poppler-glib) >= %{POPPLER_REQ} BuildRequires: pkgconfig(taglib) >= %{TAGLIB_REQ} -BuildRequires: pkgconfig(unique-1.0) +BuildRequires: pkgconfig(unique-1.0) >= %{UNIQUE_REQ} BuildRequires: libICE-devel BuildRequires: libSM-devel -BuildRequires: gnome-doc-utils -BuildRequires: perl(XML::Parser) - -%if %{use_autotool} -BuildRequires: automake +BuildRequires: meson BuildRequires: flex BuildRequires: intltool -BuildRequires: libtool -BuildRequires: gnome-common -%endif -BuildRequires: make +BuildRequires: yelp-tools + BuildRequires: %{_bindir}/git BuildRequires: %{_bindir}/appstream-util # %%check -BuildRequires: gtest-devel +BuildRequires: pkgconfig(gtest) -Requires: gnome-vfs2-smb Requires: meld Requires: gnome-icon-theme-legacy @@ -190,27 +168,6 @@ git config user.name "%{name} Fedora maintainer" git config user.email "%{name}-owner@fedoraproject.org" %if 0%{?use_release} -cat > .gitignore < 0 -( export NOCONFIGURE=1 ; sh autogen.sh ) -%endif +# Tweak samba detection +sed -i meson.build \ + -e 's|^\(samba = dependency\)|# \1|' \ + -e 's|^\(have_samba = .*\)$|have_samba = true|' \ + %{nil} +git commit -m "Tweak samba detection" -a -%{__sed} -i.pylib \ - -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ - configure +# Don't install unneeded files +find . -name meson.build | xargs sed -i \ + -e '\@install_headers@,\@^)$@s|^\(.*\)$|# \1|' \ + %{nil} +sed -i libgcmd/meson.build \ + -e '\@libgcmd = static_library@,$s@install: true@install : false@' \ + %{nil} +sed -i doc/meson.build \ + -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ + %{nil} +git commit -m "Don't install header files, static archives, documentation" -a %if 0%{?use_gitbare} pushd .. @@ -235,16 +203,11 @@ pushd .. # gzip #gzip -9 ChangeLog-* -mkdir TMPBINDIR -cd TMPBINDIR -ln -sf /bin/true ./update-mime-database - %if 0%{?use_gitbare} popd %endif %build -export PATH=$(pwd)/TMPBINDIR:$PATH export BUILD_TOP_DIR=$(pwd) %set_build_flags @@ -259,86 +222,27 @@ pushd %{name} # Install wrapper script, and move binaries to # %%{_libexecdir}/%%{name} -mkdir _builddir || : - -# For debuginfo issue -find . -name \*.cc | while read f -do - dirn=$(dirname $f) - %{__cat} $f | %{__sed} -n -e 's|^#line.*[ \t][ \t]*\"\(.*\)"$|\1|p' | \ - sort | uniq | while read g - do - %{__mkdir_p} _builddir/$dirn - %{__cp} -p $dirn/$g _builddir/$dirn - done -done - -pushd _builddir - -ln -sf ../configure -%configure \ - --srcdir=$(pwd)/.. \ +%meson \ --bindir=%{_libexecdir}/%{name} \ - --disable-Werror \ - --disable-scrollkeeper \ %{nil} -%{__cp} -p README ${BUILD_TOP_DIR} - -%if %{update_po} -%{__make} -C po gnome-commander.pot update-po -%endif - -# First make po without _smp_mflags, so that messages -# won't be mixed up -# Second doc/, parallel make seems to fail -%{__make} -C po GMSGFMT="msgfmt --statistics" -%{__make} -C doc -%{__make} %{?_smp_mflags} -k - -popd # from _builddir +%meson_build --ninja-args "-k 0" %if 0%{?use_gitbare} popd %endif %install -%{__rm} -rf %{buildroot} - -export PATH=$(pwd)/TMPBINDIR:$PATH - %if 0%{?use_gitbare} pushd %{name} %endif -pushd _builddir -%{__make} \ - INSTALL="%{__install} -c -p" \ - DESTDIR=%{buildroot} \ - install -popd # from _builddir - -# Desktop file -desktop-file-install \ - --delete-original \ - --vendor '' \ - --remove-category Application \ - --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/org.gnome.%{name}.desktop +%meson_install # Install wrapper %{__mkdir_p} %{buildroot}%{_bindir} %{__install} -cpm 0755 %SOURCE1 %{buildroot}%{_bindir}/%{name} -# install gnome-file-types-properties (bug 458667) -%if 0 -%{__install} -cpm 0755 mimeedit.sh \ - %{buildroot}%{_libexecdir}/%{name}/gnome-file-types-properties -%endif - -%{__rm} -f %{buildroot}%{_libdir}/%{name}/*.{a,la} -%{__rm} -f %{buildroot}%{_libdir}/%{name}/*/*.{a,la} - %if 0%{?use_gitbare} popd %endif @@ -346,15 +250,15 @@ popd %find_lang %{name} %check +desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.%{name}.desktop appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.gnome.%{name}.appdata.xml %if 0%{?use_gitbare} pushd %{name} %endif -pushd _builddir export ASAN_OPTIONS=detect_leaks=0 -make check +%meson_test -v %if 0%{?use_gitbare} popd @@ -364,10 +268,9 @@ popd %defattr(-,root,root,-) %doc AUTHORS %doc BUGS -%doc ChangeLog* -%doc COPYING +%license COPYING %doc NEWS -%doc README +%doc README.md %doc TODO %doc doc/*.txt @@ -383,10 +286,13 @@ popd %{_datadir}/glib-2.0/schemas/org.gnome.*xml -%{_datadir}/pixmaps/%{name}.svg +%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jan 25 2023 Mamoru TASAKA - 4:1.16.0-1 +- 1.16.0 + * Thu Jan 19 2023 Fedora Release Engineering - 4:1.14.3-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b57f028..9126aaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.14.3.tar.xz) = a3a89b922c23b49587d1b459760a263c886636735549c8dcd592b1ccb838838a3748ec83eb65ca8bbb62d82d4b588479a7673314d6924075b733b31318e52756 +SHA512 (gnome-commander-1.16.0.tar.xz) = 9e23afb9b58e1f24e8a67f81fcf9c9bbae02c07d184cf9ffd4bc56d1e4b705ea355b95ce16209d50b743898cdb7bf0b6b8730eaa44f09001d9fa9a834fcbccae From 60611d0b617dfe9079c33769bae1ca7ed762131a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 25 Jan 2023 15:17:50 +0900 Subject: [PATCH 39/75] kill sanitizer --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5ac54cf..a4163c9 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -12,7 +12,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 From 3a1d0b44cf01adbeaa9c7ea66f21a9e2495039e1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:08:42 +0900 Subject: [PATCH 40/75] rename release macro to make rpmdev-bumprelease work --- gnome-commander.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a4163c9..87dbb36 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -43,17 +43,17 @@ %global mainrel 1 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{mainrel}.%{git_version} +%global baserelease %{mainrel}.%{git_version} %endif Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Release: %{baserelease}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME From 889c064da88eac384f3f5a87a63ea646652bfce6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Mar 2023 16:12:13 +0900 Subject: [PATCH 41/75] fix baserelease usage --- gnome-commander.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 87dbb36..cb52a15 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,20 +40,20 @@ %global shortver 1.16 %global fullver %{shortver}.0 -%global mainrel 1 +%global baserelease 1 %if 0%{?use_release} >= 1 -%global baserelease %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} +%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} %endif %if 0%{?use_gitbare} >= 1 -%global baserelease %{mainrel}.%{git_version} +%global fedorarel %{baserelease}.%{git_version} %endif Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fullver} -Release: %{baserelease}%{flagrel}%{?dist} +Release: %{fedorarel}%{flagrel}%{?dist} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME From a406918ec1e6b8a6b36a9e741ba3195eba190141 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Jul 2023 18:11:05 +0900 Subject: [PATCH 42/75] 1.16.1 --- gnome-commander.spec | 17 +++++++---------- sources | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index cb52a15..ec101e8 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -39,7 +39,7 @@ %endif %global shortver 1.16 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %global baserelease 1 %if 0%{?use_release} >= 1 @@ -100,8 +100,8 @@ BuildRequires: flex BuildRequires: intltool BuildRequires: yelp-tools -BuildRequires: %{_bindir}/git -BuildRequires: %{_bindir}/appstream-util +BuildRequires: /usr/bin/git +BuildRequires: /usr/bin/appstream-util # %%check BuildRequires: pkgconfig(gtest) @@ -172,7 +172,7 @@ git add . git commit -m "base" -q %endif -%patch1 -p1 -b .path +%patch -P1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif @@ -185,12 +185,6 @@ sed -i meson.build \ git commit -m "Tweak samba detection" -a # Don't install unneeded files -find . -name meson.build | xargs sed -i \ - -e '\@install_headers@,\@^)$@s|^\(.*\)$|# \1|' \ - %{nil} -sed -i libgcmd/meson.build \ - -e '\@libgcmd = static_library@,$s@install: true@install : false@' \ - %{nil} sed -i doc/meson.build \ -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ %{nil} @@ -290,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Jul 10 2023 Mamoru TASAKA - 4:1.16.1-1 +- 1.16.1 + * Wed Jan 25 2023 Mamoru TASAKA - 4:1.16.0-1 - 1.16.0 diff --git a/sources b/sources index 9126aaf..bec4d0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.16.0.tar.xz) = 9e23afb9b58e1f24e8a67f81fcf9c9bbae02c07d184cf9ffd4bc56d1e4b705ea355b95ce16209d50b743898cdb7bf0b6b8730eaa44f09001d9fa9a834fcbccae +SHA512 (gnome-commander-1.16.1.tar.xz) = 3a42671350e071552f82e44cf09e7598c9851a8d0b47cedc059a23347e8da71e1cc140f16191b31b1e66b74d803240db63a0eb8ba6a189dfc64315783fb954e0 From 4b55e96bc8af871823a0fe5fc539771f4252c6d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 23:32:24 +0000 Subject: [PATCH 43/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index ec101e8..dda7a62 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 1 +%global baserelease 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -284,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 4:1.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 10 2023 Mamoru TASAKA - 4:1.16.1-1 - 1.16.1 From 1b26f0ba548aa12132a9251e51d93c1361fd293c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 22:52:09 +0000 Subject: [PATCH 44/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index dda7a62..b659394 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 2 +%global baserelease 3 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -284,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 4:1.16.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 4:1.16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 184d9c271652c287896da4400a646599793e46ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 15:26:34 +0000 Subject: [PATCH 45/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b659394..56b1b08 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 3 +%global baserelease 4 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -284,6 +284,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 4:1.16.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 4:1.16.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 63b505fb1b50197d682996ef473d49688f4a17ff Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 28 Jan 2024 17:11:49 +0900 Subject: [PATCH 46/75] SPDX migration --- gnome-commander.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 56b1b08..dea6a1f 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 4 +%global baserelease 5 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -58,7 +58,11 @@ Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME -License: GPLv2+ +# Overall GPL-2.0-or-later +# data/org.gnome.gnome-commander.appdata.xml.in CC0-1.0 +# doc/C/legal.xml GFDL-1.1-or-later +# SPDX confirmed +License: GPL-2.0-or-later AND GFDL-1.1-or-later AND CC0-1.0 URL: http://gcmd.github.io/ %if 0%{?use_release} Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{shortver}/%{name}-%{version}%{?extratag:-%extratag}.tar.xz @@ -284,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Jan 28 2024 Mamoru TASAKA - 4:1.16.1-5 +- SPDX migration + * Wed Jan 24 2024 Fedora Release Engineering - 4:1.16.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1cb843a399302dde810e7ddd70b57ae0bd16633f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 18 Apr 2024 20:13:16 +0900 Subject: [PATCH 47/75] Fix double g_error_free call in remote_close_callback (bug 2271363) --- ...mmander-MR55-fix-double-g_free_error.patch | 27 +++++++++++++++++++ gnome-commander.spec | 9 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnome-commander-MR55-fix-double-g_free_error.patch diff --git a/gnome-commander-MR55-fix-double-g_free_error.patch b/gnome-commander-MR55-fix-double-g_free_error.patch new file mode 100644 index 0000000..783d7a8 --- /dev/null +++ b/gnome-commander-MR55-fix-double-g_free_error.patch @@ -0,0 +1,27 @@ +From ed704b30992b7f576060c424e431d6909504b9b4 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Thu, 18 Apr 2024 19:56:24 +0900 +Subject: [PATCH] Fix double g_error_free call in remote_close_callback + +gnome_cmd_error_message() calls g_error_free() internally, +so no need to call g_error_free() again in +remote_close_callback(). +--- + src/gnome-cmd-con-remote.cc | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/gnome-cmd-con-remote.cc b/src/gnome-cmd-con-remote.cc +index 85f87e3d..39a131e5 100644 +--- a/src/gnome-cmd-con-remote.cc ++++ b/src/gnome-cmd-con-remote.cc +@@ -125,7 +125,6 @@ static void remote_close_callback(GObject *gobj, GAsyncResult *result, gpointer + if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED)) + { + gnome_cmd_error_message(_("Disconnect error"), error); +- g_error_free(error); + return; + } + if (error) +-- +GitLab + diff --git a/gnome-commander.spec b/gnome-commander.spec index dea6a1f..27f108b 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.1 -%global baserelease 5 +%global baserelease 6 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -75,6 +75,9 @@ 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/55 +# https://bugzilla.redhat.com/show_bug.cgi?id=2271363 +Patch2: gnome-commander-MR55-fix-double-g_free_error.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -178,6 +181,7 @@ git commit -m "base" -q %patch -P1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a +cat %PATCH2 | git am %if 0%{?use_release} %endif @@ -288,6 +292,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Apr 18 2024 Mamoru TASAKA - 4:1.16.1-6 +- Fix double g_error_free call in remote_close_callback (bug 2271363) + * Sun Jan 28 2024 Mamoru TASAKA - 4:1.16.1-5 - SPDX migration From 45b4154df3e3ff7c2ba6f3e4345b27a27455743f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 20 May 2024 12:18:44 +0900 Subject: [PATCH 48/75] 1.16.2 --- ...mmander-MR55-fix-double-g_free_error.patch | 27 ------------------- gnome-commander.spec | 11 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 gnome-commander-MR55-fix-double-g_free_error.patch diff --git a/gnome-commander-MR55-fix-double-g_free_error.patch b/gnome-commander-MR55-fix-double-g_free_error.patch deleted file mode 100644 index 783d7a8..0000000 --- a/gnome-commander-MR55-fix-double-g_free_error.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ed704b30992b7f576060c424e431d6909504b9b4 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Thu, 18 Apr 2024 19:56:24 +0900 -Subject: [PATCH] Fix double g_error_free call in remote_close_callback - -gnome_cmd_error_message() calls g_error_free() internally, -so no need to call g_error_free() again in -remote_close_callback(). ---- - src/gnome-cmd-con-remote.cc | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/gnome-cmd-con-remote.cc b/src/gnome-cmd-con-remote.cc -index 85f87e3d..39a131e5 100644 ---- a/src/gnome-cmd-con-remote.cc -+++ b/src/gnome-cmd-con-remote.cc -@@ -125,7 +125,6 @@ static void remote_close_callback(GObject *gobj, GAsyncResult *result, gpointer - if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED)) - { - gnome_cmd_error_message(_("Disconnect error"), error); -- g_error_free(error); - return; - } - if (error) --- -GitLab - diff --git a/gnome-commander.spec b/gnome-commander.spec index 27f108b..5838e11 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -39,8 +39,8 @@ %endif %global shortver 1.16 -%global fullver %{shortver}.1 -%global baserelease 6 +%global fullver %{shortver}.2 +%global baserelease 1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -75,9 +75,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/55 -# https://bugzilla.redhat.com/show_bug.cgi?id=2271363 -Patch2: gnome-commander-MR55-fix-double-g_free_error.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -181,7 +178,6 @@ git commit -m "base" -q %patch -P1 -p1 -b .path git commit -m "Apply Fedora specific path configuration" -a -cat %PATCH2 | git am %if 0%{?use_release} %endif @@ -292,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon May 20 2024 Mamoru TASAKA - 4:1.16.2-1 +- 1.16.2 + * Thu Apr 18 2024 Mamoru TASAKA - 4:1.16.1-6 - Fix double g_error_free call in remote_close_callback (bug 2271363) diff --git a/sources b/sources index bec4d0d..cad2396 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.16.1.tar.xz) = 3a42671350e071552f82e44cf09e7598c9851a8d0b47cedc059a23347e8da71e1cc140f16191b31b1e66b74d803240db63a0eb8ba6a189dfc64315783fb954e0 +SHA512 (gnome-commander-1.16.2.tar.xz) = da2675a6625a67ab873d49f1caf939c30a317ecc0cb9b15c794b27c4a46dfba4cdea10266b380ef1e6809329ee770db4d7559a9cf94b575340b7fe4bb997d6c2 From e25fbc4cadb2ad899fbd7905a7bb8dad8a907c92 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Jun 2024 17:42:20 +0900 Subject: [PATCH 49/75] update to the latest git --- gnome-commander.spec | 68 +++++++++++++++++++++++++------------------- sources | 2 +- 2 files changed, 39 insertions(+), 31 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5838e11..e5b2253 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -8,14 +8,12 @@ %global TAGLIB_REQ 1.4 %global UNIQUE_REQ 0.9.3 -%global mimeedit_rev 1958 - %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 -%global use_release 1 -%global use_gitbare 0 +%global use_release 0 +%global use_gitbare 1 %if 0%{?use_gitbare} < 1 # force @@ -28,32 +26,32 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20220113 -%global gittartime 1526 -%global gitbaredate 20220109 -%global git_rev fed9ef1a44cd01b6c1dfb231795e07f5f067de57 +%global gittardate 20240610 +%global gittartime 1620 +%global gitbaredate 20240605 +%global git_rev aaac617691ba6be14cd563a5ee341993bbe20c77 %global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{gitbaredate}git%{git_short} +%global git_version %{gitbaredate}git%{git_short} %global if_pre 1 +%global clamp_mtime_to_source_date_epoch 0 %endif -%global shortver 1.16 -%global fullver %{shortver}.2 -%global baserelease 1 +%global shortver 1.17 +%global fullver %{shortver}.0 %if 0%{?use_release} >= 1 -%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} +%global fedoraver %{fullver} %endif %if 0%{?use_gitbare} >= 1 -%global fedorarel %{baserelease}.%{git_version} +%global fedoraver %{fullver}%{?if_pre:~}%{!?if_pre:^}%{git_version} %endif Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 -Version: %{fullver} -Release: %{fedorarel}%{flagrel}%{?dist} +Version: %{fedoraver} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -73,7 +71,6 @@ Source0: %{name}-%{gittardate}T%{gittartime}.tar.gz Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh -Source10: mimeedit-svn%{mimeedit_rev}.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch BuildRequires: gcc-c++ @@ -89,7 +86,7 @@ BuildRequires: intltool BuildRequires: pkgconfig(exiv2) >= %{EXIV2_REQ} BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gnome-vfs-2.0) BuildRequires: pkgconfig(libgsf-1) >= %{LIBGSF_REQ} BuildRequires: pkgconfig(poppler-glib) >= %{POPPLER_REQ} @@ -108,6 +105,7 @@ BuildRequires: /usr/bin/git BuildRequires: /usr/bin/appstream-util # %%check +BuildRequires: xorg-x11-server-Xvfb BuildRequires: pkgconfig(gtest) Requires: meld @@ -149,11 +147,22 @@ git init %endif %if 0%{?use_gitbare} -%setup -q -c -T -a 0 +%setup -q -c -n %{name}-%{fullver}-%{git_version} -T -a 0 git clone ./%{name}.git/ cd %{name} -git checkout -b %{version}-fedora %{git_rev} +git checkout -b %{fullver}-fedora %{git_rev} + +# Restore timestamps +set +x +echo "Restore timestamps" +git ls-tree -r --name-only HEAD | while read f +do + unixtime=$(git log -n 1 --pretty='%ct' -- $f) + touch -d "@${unixtime}" $f +done +set -x + cp -a [A-Z]* .. cp -a doc .. @@ -169,7 +178,7 @@ done %endif git config user.name "%{name} Fedora maintainer" -git config user.email "%{name}-owner@fedoraproject.org" +git config user.email "%{name}-maintainer@fedoraproject.org" %if 0%{?use_release} git add . @@ -188,12 +197,6 @@ sed -i meson.build \ %{nil} git commit -m "Tweak samba detection" -a -# Don't install unneeded files -sed -i doc/meson.build \ - -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ - %{nil} -git commit -m "Don't install header files, static archives, documentation" -a - %if 0%{?use_gitbare} pushd .. %endif @@ -256,7 +259,8 @@ pushd %{name} %endif export ASAN_OPTIONS=detect_leaks=0 -%meson_test -v +xvfb-run sh -c \ + "%meson_test -v" %if 0%{?use_gitbare} popd @@ -277,12 +281,16 @@ popd %{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* +%{_datadir}/glib-2.0/schemas/org.gnome.*xml +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.txt +%{_datadir}/%{name}/icons/ + %{_datadir}/applications/org.gnome.%{name}.desktop %{_metainfodir}/org.gnome.%{name}.appdata.xml %{_datadir}/help/*/%{name}/ -%{_datadir}/glib-2.0/schemas/org.gnome.*xml %{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg %{_datadir}/pixmaps/%{name}/ diff --git a/sources b/sources index cad2396..9be0640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.16.2.tar.xz) = da2675a6625a67ab873d49f1caf939c30a317ecc0cb9b15c794b27c4a46dfba4cdea10266b380ef1e6809329ee770db4d7559a9cf94b575340b7fe4bb997d6c2 +SHA512 (gnome-commander-20240610T1620.tar.gz) = 0b118ded36e604db272e653f4e157f4ac285f7569ba0b1ce03f4d5490bfe40c87cce7b56a4831c46c56239bb2ceeaa47bda9d01f15bec174cf46c4bbee1f4e0d From 5d3441f7205361864cba70d9e01d8ef6f96e4965 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 11 Jun 2024 14:54:04 +0900 Subject: [PATCH 50/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index e5b2253..eb477d7 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240610 -%global gittartime 1620 -%global gitbaredate 20240605 -%global git_rev aaac617691ba6be14cd563a5ee341993bbe20c77 +%global gittardate 20240611 +%global gittartime 1445 +%global gitbaredate 20240610 +%global git_rev 2e447c53a664856c1e7778ddbff8de7611ab1ed1 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 9be0640..e3b5d12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240610T1620.tar.gz) = 0b118ded36e604db272e653f4e157f4ac285f7569ba0b1ce03f4d5490bfe40c87cce7b56a4831c46c56239bb2ceeaa47bda9d01f15bec174cf46c4bbee1f4e0d +SHA512 (gnome-commander-20240611T1445.tar.gz) = 1c423c940a5630a8875496e3dc0c278fc018b1660c6f8e69edf55f65ed8fe38fb3d85ee706d312edc4cac1b0fd6e0d50bb9f522d6274c1a50aff9382e70ee594 From 00050dfd6fd61652d6de9feb8e9986c85b063d6a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Jun 2024 12:25:28 +0900 Subject: [PATCH 51/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index eb477d7..b29f3ab 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240611 -%global gittartime 1445 -%global gitbaredate 20240610 -%global git_rev 2e447c53a664856c1e7778ddbff8de7611ab1ed1 +%global gittardate 20240613 +%global gittartime 1214 +%global gitbaredate 20240612 +%global git_rev 8b53d781339347496074d7dc28c2ca9b5bc4533b %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index e3b5d12..16e73bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240611T1445.tar.gz) = 1c423c940a5630a8875496e3dc0c278fc018b1660c6f8e69edf55f65ed8fe38fb3d85ee706d312edc4cac1b0fd6e0d50bb9f522d6274c1a50aff9382e70ee594 +SHA512 (gnome-commander-20240613T1214.tar.gz) = 25e48d41de5bbad43a30040a7d80dd64428a8ecaf31886bfa9940be76f5016f545b2d30666949efaad0f37ab4a8e8e93cf08aebc8f1fedf647204e5a2ec42fb3 From d80e29256823c2e4a3a97f6d144b095906d6c845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 14 Jun 2024 06:31:01 +0200 Subject: [PATCH 52/75] Rebuilt for exiv2 0.28.2 --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5838e11..4de5bed 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.2 -%global baserelease 1 +%global baserelease 2 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -288,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Fri Jun 14 2024 Robert-André Mauchin - 4:1.16.2-2 +- Rebuilt for exiv2 0.28.2 + * Mon May 20 2024 Mamoru TASAKA - 4:1.16.2-1 - 1.16.2 From 536463ceb2b6fc6701c1bfd5555c187f7916a25b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 21 Jun 2024 11:11:08 +0900 Subject: [PATCH 53/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b29f3ab..23a62e2 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240613 -%global gittartime 1214 -%global gitbaredate 20240612 -%global git_rev 8b53d781339347496074d7dc28c2ca9b5bc4533b +%global gittardate 20240621 +%global gittartime 1048 +%global gitbaredate 20240615 +%global git_rev 126aff47c14f6b29be195f7270afe6b16484bb12 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 16e73bb..6de3444 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240613T1214.tar.gz) = 25e48d41de5bbad43a30040a7d80dd64428a8ecaf31886bfa9940be76f5016f545b2d30666949efaad0f37ab4a8e8e93cf08aebc8f1fedf647204e5a2ec42fb3 +SHA512 (gnome-commander-20240621T1048.tar.gz) = 14333a1fc9b208e6bc00d5bd51808dd9c46c5a3ae8c8b4689f194344b217085f60c3707adc42b4137bf79b58ccd86cc126443db162a0ea79a3fb028106ae13e4 From f08cae6f7739d4d8dd748189aff0af4dd962a78f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jun 2024 21:48:32 +0900 Subject: [PATCH 54/75] apply upstream 2 MR --- 118.patch | 55 ++++++++++++++++++++++++++ 119.patch | 93 ++++++++++++++++++++++++++++++++++++++++++++ gnome-commander.spec | 8 +++- 3 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 118.patch create mode 100644 119.patch diff --git a/118.patch b/118.patch new file mode 100644 index 0000000..5906ae1 --- /dev/null +++ b/118.patch @@ -0,0 +1,55 @@ +From 488dc8587c43343bb655ae64dba5b0087962c955 Mon Sep 17 00:00:00 2001 +From: Andrey Kutejko +Date: Mon, 24 Jun 2024 23:47:07 +0200 +Subject: [PATCH] Use gtk_tree_iter_copy for allocating iterators + +--- + src/gnome-cmd-file-list.cc | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc +index f3da0dca..1c94fcfe 100644 +--- a/src/gnome-cmd-file-list.cc ++++ b/src/gnome-cmd-file-list.cc +@@ -2313,14 +2313,15 @@ GtkTreeIterPtr GnomeCmdFileList::get_focused_file_iter() + { + GtkTreePath *path = nullptr; + gtk_tree_view_get_cursor (*this, &path, NULL); +- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); ++ GtkTreeIter iter; + bool found = false; + if (path != nullptr) +- found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path); ++ found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); + gtk_tree_path_free (path); +- if (!found) +- iter.reset(); +- return iter; ++ if (found) ++ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); ++ else ++ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); + } + + +@@ -3514,11 +3515,12 @@ GtkTreeIterPtr GnomeCmdFileList::get_dest_row_at_coords (gdouble x, gdouble y) + if (!gtk_tree_view_get_dest_row_at_pos (*this, x, y, &path, nullptr)) + return GtkTreeIterPtr(nullptr, >k_tree_iter_free); + +- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); +- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path)) +- iter.reset(); ++ GtkTreeIter iter; ++ bool found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); + gtk_tree_path_free (path); +- +- return iter; ++ if (found) ++ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); ++ else ++ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); + } + +-- +GitLab + diff --git a/119.patch b/119.patch new file mode 100644 index 0000000..f326f85 --- /dev/null +++ b/119.patch @@ -0,0 +1,93 @@ +From dcc85a638fde158955f3ff54818a3d4a2fd79d54 Mon Sep 17 00:00:00 2001 +From: Andrey Kutejko +Date: Tue, 25 Jun 2024 00:13:31 +0200 +Subject: [PATCH] Sanitize stored tabs + +--- + src/gnome-cmd-data.cc | 2 ++ + src/gnome-cmd-main-win.cc | 28 +++++++++++++++------------- + 2 files changed, 17 insertions(+), 13 deletions(-) + +diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc +index 4146ce1c..a2eceb60 100644 +--- a/src/gnome-cmd-data.cc ++++ b/src/gnome-cmd-data.cc +@@ -1815,6 +1815,8 @@ static void save_tabs(GSettings *gSettings, const char *gSettingsKey) + + if (gnome_cmd_data.options.save_tabs_on_exit || (gnome_cmd_data.options.save_dirs_on_exit && fl == gnomeCmdFileSelector.file_list()) || fl->locked) + { ++ if (!fl->cwd) ++ continue; + gchar* uriString = GNOME_CMD_FILE (fl->cwd)->get_uri_str(); + if (!uriString) + continue; +diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc +index 238de96e..ddb49482 100644 +--- a/src/gnome-cmd-main-win.cc ++++ b/src/gnome-cmd-main-win.cc +@@ -907,6 +907,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + auto uriString = tab->first; + auto uriScheme = g_uri_peek_scheme (uriString.c_str()); + auto uriIsRelative = false; ++ gchar *path = nullptr; ++ GnomeCmdCon *con; + + if (!uriScheme) + { +@@ -917,8 +919,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + + if (strcmp(uriScheme, "file") == 0 || uriIsRelative) + { +- GnomeCmdCon *home = get_home_con (); +- gchar *path = nullptr; ++ con = get_home_con (); + if (uriIsRelative) + { + path = g_strdup(tab->first.c_str()); +@@ -928,16 +929,10 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, nullptr); + path = g_strdup(g_uri_get_path(gUri)); + } +- auto *gnomeCmdDir = gnome_cmd_dir_new (home, gnome_cmd_con_create_path (home, path), true); +- const auto& tabTuple = tab->second; +- +- fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); +- g_free(path); + } + else + { + GError *error = nullptr; +- gchar *path = nullptr; + auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, &error); + if (error) + { +@@ -948,14 +943,21 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + } + path = path ? path : g_strdup(g_uri_get_path(gUri)); + +- GnomeCmdConRemote *con = gnome_cmd_con_remote_new(nullptr, uriString); +- auto gnomeCmdPath = gnome_cmd_con_create_path((GnomeCmdCon*) con, path); +- auto gnomeCmdDir = gnome_cmd_dir_new((GnomeCmdCon*) con, gnomeCmdPath, true); +- const auto& tabTuple = tab->second; ++ con = (GnomeCmdCon*) gnome_cmd_con_remote_new(nullptr, uriString); ++ } + ++ GnomeCmdDir *gnomeCmdDir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, path), true); ++ if (gnomeCmdDir != nullptr) ++ { ++ const auto& tabTuple = tab->second; + fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); +- g_free(path); + } ++ else ++ { ++ g_warning("Stored path %s is invalid. Skipping", path); ++ } ++ ++ g_free(path); + } + } + +-- +GitLab + diff --git a/gnome-commander.spec b/gnome-commander.spec index 689bcb0..87b328a 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,6 +72,8 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +Patch118: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/118.patch +Patch119: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/119.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -190,6 +192,9 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +cat %PATCH118 | git am +cat %PATCH119 | git am + # Tweak samba detection sed -i meson.build \ -e 's|^\(samba = dependency\)|# \1|' \ @@ -197,6 +202,7 @@ sed -i meson.build \ %{nil} git commit -m "Tweak samba detection" -a + %if 0%{?use_gitbare} pushd .. %endif From d05ec99a874700011c533fbd331667c8f70d1c9b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 30 Jun 2024 16:32:24 +0900 Subject: [PATCH 55/75] update to the latest git --- 118.patch | 55 -------------------------- 119.patch | 93 -------------------------------------------- gnome-commander.spec | 13 ++----- sources | 2 +- 4 files changed, 5 insertions(+), 158 deletions(-) delete mode 100644 118.patch delete mode 100644 119.patch diff --git a/118.patch b/118.patch deleted file mode 100644 index 5906ae1..0000000 --- a/118.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 488dc8587c43343bb655ae64dba5b0087962c955 Mon Sep 17 00:00:00 2001 -From: Andrey Kutejko -Date: Mon, 24 Jun 2024 23:47:07 +0200 -Subject: [PATCH] Use gtk_tree_iter_copy for allocating iterators - ---- - src/gnome-cmd-file-list.cc | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc -index f3da0dca..1c94fcfe 100644 ---- a/src/gnome-cmd-file-list.cc -+++ b/src/gnome-cmd-file-list.cc -@@ -2313,14 +2313,15 @@ GtkTreeIterPtr GnomeCmdFileList::get_focused_file_iter() - { - GtkTreePath *path = nullptr; - gtk_tree_view_get_cursor (*this, &path, NULL); -- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); -+ GtkTreeIter iter; - bool found = false; - if (path != nullptr) -- found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path); -+ found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); - gtk_tree_path_free (path); -- if (!found) -- iter.reset(); -- return iter; -+ if (found) -+ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); -+ else -+ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); - } - - -@@ -3514,11 +3515,12 @@ GtkTreeIterPtr GnomeCmdFileList::get_dest_row_at_coords (gdouble x, gdouble y) - if (!gtk_tree_view_get_dest_row_at_pos (*this, x, y, &path, nullptr)) - return GtkTreeIterPtr(nullptr, >k_tree_iter_free); - -- GtkTreeIterPtr iter(new GtkTreeIter {}, >k_tree_iter_free); -- if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), iter.get(), path)) -- iter.reset(); -+ GtkTreeIter iter; -+ bool found = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path); - gtk_tree_path_free (path); -- -- return iter; -+ if (found) -+ return GtkTreeIterPtr(gtk_tree_iter_copy(&iter), >k_tree_iter_free); -+ else -+ return GtkTreeIterPtr(nullptr, >k_tree_iter_free); - } - --- -GitLab - diff --git a/119.patch b/119.patch deleted file mode 100644 index f326f85..0000000 --- a/119.patch +++ /dev/null @@ -1,93 +0,0 @@ -From dcc85a638fde158955f3ff54818a3d4a2fd79d54 Mon Sep 17 00:00:00 2001 -From: Andrey Kutejko -Date: Tue, 25 Jun 2024 00:13:31 +0200 -Subject: [PATCH] Sanitize stored tabs - ---- - src/gnome-cmd-data.cc | 2 ++ - src/gnome-cmd-main-win.cc | 28 +++++++++++++++------------- - 2 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc -index 4146ce1c..a2eceb60 100644 ---- a/src/gnome-cmd-data.cc -+++ b/src/gnome-cmd-data.cc -@@ -1815,6 +1815,8 @@ static void save_tabs(GSettings *gSettings, const char *gSettingsKey) - - if (gnome_cmd_data.options.save_tabs_on_exit || (gnome_cmd_data.options.save_dirs_on_exit && fl == gnomeCmdFileSelector.file_list()) || fl->locked) - { -+ if (!fl->cwd) -+ continue; - gchar* uriString = GNOME_CMD_FILE (fl->cwd)->get_uri_str(); - if (!uriString) - continue; -diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc -index 238de96e..ddb49482 100644 ---- a/src/gnome-cmd-main-win.cc -+++ b/src/gnome-cmd-main-win.cc -@@ -907,6 +907,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - auto uriString = tab->first; - auto uriScheme = g_uri_peek_scheme (uriString.c_str()); - auto uriIsRelative = false; -+ gchar *path = nullptr; -+ GnomeCmdCon *con; - - if (!uriScheme) - { -@@ -917,8 +919,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - - if (strcmp(uriScheme, "file") == 0 || uriIsRelative) - { -- GnomeCmdCon *home = get_home_con (); -- gchar *path = nullptr; -+ con = get_home_con (); - if (uriIsRelative) - { - path = g_strdup(tab->first.c_str()); -@@ -928,16 +929,10 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, nullptr); - path = g_strdup(g_uri_get_path(gUri)); - } -- auto *gnomeCmdDir = gnome_cmd_dir_new (home, gnome_cmd_con_create_path (home, path), true); -- const auto& tabTuple = tab->second; -- -- fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -- g_free(path); - } - else - { - GError *error = nullptr; -- gchar *path = nullptr; - auto gUri = g_uri_parse(tab->first.c_str(), G_URI_FLAGS_NONE, &error); - if (error) - { -@@ -948,14 +943,21 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - } - path = path ? path : g_strdup(g_uri_get_path(gUri)); - -- GnomeCmdConRemote *con = gnome_cmd_con_remote_new(nullptr, uriString); -- auto gnomeCmdPath = gnome_cmd_con_create_path((GnomeCmdCon*) con, path); -- auto gnomeCmdDir = gnome_cmd_dir_new((GnomeCmdCon*) con, gnomeCmdPath, true); -- const auto& tabTuple = tab->second; -+ con = (GnomeCmdCon*) gnome_cmd_con_remote_new(nullptr, uriString); -+ } - -+ GnomeCmdDir *gnomeCmdDir = gnome_cmd_dir_new (con, gnome_cmd_con_create_path (con, path), true); -+ if (gnomeCmdDir != nullptr) -+ { -+ const auto& tabTuple = tab->second; - fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -- g_free(path); - } -+ else -+ { -+ g_warning("Stored path %s is invalid. Skipping", path); -+ } -+ -+ g_free(path); - } - } - --- -GitLab - diff --git a/gnome-commander.spec b/gnome-commander.spec index 87b328a..1b35b33 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240621 -%global gittartime 1048 -%global gitbaredate 20240615 -%global git_rev 126aff47c14f6b29be195f7270afe6b16484bb12 +%global gittardate 20240630 +%global gittartime 1624 +%global gitbaredate 20240628 +%global git_rev 6e48c6bd762540b408e1380714a098352f27bdea %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -72,8 +72,6 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -Patch118: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/118.patch -Patch119: https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/119.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -192,9 +190,6 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -cat %PATCH118 | git am -cat %PATCH119 | git am - # Tweak samba detection sed -i meson.build \ -e 's|^\(samba = dependency\)|# \1|' \ diff --git a/sources b/sources index 6de3444..a35cfed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240621T1048.tar.gz) = 14333a1fc9b208e6bc00d5bd51808dd9c46c5a3ae8c8b4689f194344b217085f60c3707adc42b4137bf79b58ccd86cc126443db162a0ea79a3fb028106ae13e4 +SHA512 (gnome-commander-20240630T1624.tar.gz) = d23bf9ba70941ec7a54931ba5a8738cc5a7047bb84ad04bf64e81f537e7720f3c893459b5c612553523fdd1315f09a6b55e2bc8dd99fc43476325c4559e686a5 From e14fe4bc5e748a84905258d3d733edfb2967d4fb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 5 Jul 2024 10:56:59 +0900 Subject: [PATCH 56/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 1b35b33..b8c380f 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240630 -%global gittartime 1624 -%global gitbaredate 20240628 -%global git_rev 6e48c6bd762540b408e1380714a098352f27bdea +%global gittardate 20240705 +%global gittartime 1047 +%global gitbaredate 20240703 +%global git_rev fd91d7e1e5b9f3bd94cbed43175c20cf54d41f1d %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index a35cfed..8916f90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240630T1624.tar.gz) = d23bf9ba70941ec7a54931ba5a8738cc5a7047bb84ad04bf64e81f537e7720f3c893459b5c612553523fdd1315f09a6b55e2bc8dd99fc43476325c4559e686a5 +SHA512 (gnome-commander-20240705T1047.tar.gz) = 05502447f9cec18d2dc99a16adfb300ff5d73ed225cab76be3c096c197b1dff7b7dbf4c2dcd4c173e68be5f3fec2521140e3db7703e38129ae2057a13251df26 From 64e3118311276241cb4254647e03820d1dd528a9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 8 Jul 2024 16:07:13 +0900 Subject: [PATCH 57/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b8c380f..cef1bc2 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240705 -%global gittartime 1047 -%global gitbaredate 20240703 -%global git_rev fd91d7e1e5b9f3bd94cbed43175c20cf54d41f1d +%global gittardate 20240708 +%global gittartime 1557 +%global gitbaredate 20240706 +%global git_rev 283ad970a1d6af9e1f6953c70651606510fef4be %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 8916f90..9fa6565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240705T1047.tar.gz) = 05502447f9cec18d2dc99a16adfb300ff5d73ed225cab76be3c096c197b1dff7b7dbf4c2dcd4c173e68be5f3fec2521140e3db7703e38129ae2057a13251df26 +SHA512 (gnome-commander-20240708T1557.tar.gz) = 9d77df7fc06ac435308bdd89be06b0def6c510da1caa6a51ca5d764ce6f4c0673da6a64f0a00952d06608ed6b68a809f2fcf43586eadb60e0c5357f959a701ce From 3f403af08a863f98cf1d13f5902ed15b29c05dcb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 9 Jul 2024 14:21:23 +0900 Subject: [PATCH 58/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index cef1bc2..3b997e4 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240708 -%global gittartime 1557 -%global gitbaredate 20240706 -%global git_rev 283ad970a1d6af9e1f6953c70651606510fef4be +%global gittardate 20240709 +%global gittartime 1416 +%global gitbaredate 20240708 +%global git_rev defc7b93d7a8d232fe2fbfa53e6b164567409f3f %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 9fa6565..287eb8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240708T1557.tar.gz) = 9d77df7fc06ac435308bdd89be06b0def6c510da1caa6a51ca5d764ce6f4c0673da6a64f0a00952d06608ed6b68a809f2fcf43586eadb60e0c5357f959a701ce +SHA512 (gnome-commander-20240709T1416.tar.gz) = 905a6081006011e161970032c353906b9a5c6e00a24c7101274b68fc6c0523aad0c2c86085ae42cd9bc3f9382ba50c4e174436b6b03bac6aa9170344406a5aaa From 877334a3410d24ee95d012ecef7e85acec042ee4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 10 Jul 2024 16:38:11 +0900 Subject: [PATCH 59/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 3b997e4..c8b14db 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240709 -%global gittartime 1416 -%global gitbaredate 20240708 -%global git_rev defc7b93d7a8d232fe2fbfa53e6b164567409f3f +%global gittardate 20240710 +%global gittartime 1629 +%global gitbaredate 20240709 +%global git_rev 6ff28fd978712f549ec23eecc80d51a2643291d6 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 287eb8f..9a7fb3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240709T1416.tar.gz) = 905a6081006011e161970032c353906b9a5c6e00a24c7101274b68fc6c0523aad0c2c86085ae42cd9bc3f9382ba50c4e174436b6b03bac6aa9170344406a5aaa +SHA512 (gnome-commander-20240710T1629.tar.gz) = 2b59d9f82bece898b6f331f0812066b14b603a9d74869620346cd61acce7e0f9cefaf65b91f356ef37a16d5d86f7527fafd59b21f47518993a11abe679571246 From e81cfc513184dee592167307c2be72149727b46c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 14 Jul 2024 17:21:30 +0900 Subject: [PATCH 60/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index c8b14db..5abb593 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240710 -%global gittartime 1629 -%global gitbaredate 20240709 -%global git_rev 6ff28fd978712f549ec23eecc80d51a2643291d6 +%global gittardate 20240714 +%global gittartime 1714 +%global gitbaredate 20240713 +%global git_rev d1b8d3ffc8eef346dd3b3ba4117c2ebacf7f26b9 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index 9a7fb3d..c015939 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240710T1629.tar.gz) = 2b59d9f82bece898b6f331f0812066b14b603a9d74869620346cd61acce7e0f9cefaf65b91f356ef37a16d5d86f7527fafd59b21f47518993a11abe679571246 +SHA512 (gnome-commander-20240714T1714.tar.gz) = 54a6290c1aecfe6636b6a405ba9829b674e4c8be98361cd88b8310bb15c220e785737e72b3a010e481fa1a72e62b74afad04ba477097978473c1d5f3f90b9c04 From a46c64833a478aac83e5bb1a9d23de34603c25f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 15 Jul 2024 16:52:30 +0900 Subject: [PATCH 61/75] update to the latest git --- gnome-commander.spec | 8 ++++---- sources | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 5abb593..ef5258a 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240714 -%global gittartime 1714 -%global gitbaredate 20240713 -%global git_rev d1b8d3ffc8eef346dd3b3ba4117c2ebacf7f26b9 +%global gittardate 20240715 +%global gittartime 1641 +%global gitbaredate 20240714 +%global git_rev 160607dbf9badadcd2697b594da32f0b06f8ef50 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} diff --git a/sources b/sources index c015939..6801a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240714T1714.tar.gz) = 54a6290c1aecfe6636b6a405ba9829b674e4c8be98361cd88b8310bb15c220e785737e72b3a010e481fa1a72e62b74afad04ba477097978473c1d5f3f90b9c04 +SHA512 (gnome-commander-20240715T1641.tar.gz) = 181e262f693019c291eacd361448696f62292db26c18a8d4351157be85550c89faf10128748c0b99510a5816f95c617b37dd21f20d3d092ae87372d4f1326005 From fe54585ea4f075ad3c6ad44daff17bedd5896a6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 02:56:18 +0000 Subject: [PATCH 62/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 4de5bed..e09ea28 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -40,7 +40,7 @@ %global shortver 1.16 %global fullver %{shortver}.2 -%global baserelease 2 +%global baserelease 3 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}} @@ -288,6 +288,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4:1.16.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 14 2024 Robert-André Mauchin - 4:1.16.2-2 - Rebuilt for exiv2 0.28.2 From 6a56a5438f6a597f2952986c6bf307e31a4811c9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 21 Jul 2024 16:45:00 +0900 Subject: [PATCH 63/75] update to the latest git --- gnome-commander.spec | 15 ++++----------- sources | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index ef5258a..4243e45 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,10 +26,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20240715 -%global gittartime 1641 -%global gitbaredate 20240714 -%global git_rev 160607dbf9badadcd2697b594da32f0b06f8ef50 +%global gittardate 20240721 +%global gittartime 1636 +%global gitbaredate 20240719 +%global git_rev 95c732e0bda821f4b1eb437d2bc175acd268c9c6 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version %{gitbaredate}git%{git_short} @@ -190,13 +190,6 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -# Tweak samba detection -sed -i meson.build \ - -e 's|^\(samba = dependency\)|# \1|' \ - -e 's|^\(have_samba = .*\)$|have_samba = true|' \ - %{nil} -git commit -m "Tweak samba detection" -a - %if 0%{?use_gitbare} pushd .. diff --git a/sources b/sources index 6801a58..ffcd346 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240715T1641.tar.gz) = 181e262f693019c291eacd361448696f62292db26c18a8d4351157be85550c89faf10128748c0b99510a5816f95c617b37dd21f20d3d092ae87372d4f1326005 +SHA512 (gnome-commander-20240721T1636.tar.gz) = 06c7a6a4915f94d0272a2e60cb54017d9e0f827dd9d9119bb53c805f34d04bd9250734bc735a793e945b886524a2ee350d8fa5c75a4e3363e32c3f3bec6d10ee From d1ff84673a5d76478da81649eee7a74fd495e7f5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Jul 2024 15:36:47 +0900 Subject: [PATCH 64/75] prep: update to 0.18.0 --- gnome-commander.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 4243e45..7835c9d 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,10 +10,10 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 -%global use_release 0 -%global use_gitbare 1 +%global use_release 1 +%global use_gitbare 0 %if 0%{?use_gitbare} < 1 # force @@ -37,7 +37,7 @@ %global clamp_mtime_to_source_date_epoch 0 %endif -%global shortver 1.17 +%global shortver 1.18 %global fullver %{shortver}.0 %if 0%{?use_release} >= 1 @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 0%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -190,6 +190,18 @@ git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +# Tweak samba detection +sed -i meson.build \ + -e 's|^\(samba = dependency\)|# \1|' \ + -e 's|^\(have_samba = .*\)$|have_samba = true|' \ + %{nil} +git commit -m "Tweak samba detection" -a + +# Don't install unneeded files +sed -i doc/meson.build \ + -e '\@install_data@,\@^)$@s|^\(.*\)$|# \1|' \ + %{nil} +git commit -m "Don't install header files, static archives, documentation" -a %if 0%{?use_gitbare} pushd .. From 42c8b2390a5b4fefbb43d608448012793c1b8c51 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Jul 2024 16:01:18 +0900 Subject: [PATCH 65/75] once save --- gnome-commander.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 2c9940e..a4f0545 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,7 +10,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 0 +%global use_gcc_strict_sanitize 1 %global use_release 1 %global use_gitbare 0 @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 0%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -289,7 +289,7 @@ popd %{_datadir}/glib-2.0/schemas/org.gnome.*xml %dir %{_datadir}/%{name} -%{_datadir}/%{name}/*.txt +#%%{_datadir}/%{name}/*.txt %{_datadir}/%{name}/icons/ %{_datadir}/applications/org.gnome.%{name}.desktop @@ -302,6 +302,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Jul 22 2024 Mamoru TASAKA - 4:1.18.0-1 +- 0.18.0 + * Thu Jul 18 2024 Fedora Release Engineering - 4:1.16.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c6a6b1968c0dc3715dcdb1a63fc965846665ede4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 22 Jul 2024 16:47:53 +0900 Subject: [PATCH 66/75] once commit --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index ffcd346..7c549a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-20240721T1636.tar.gz) = 06c7a6a4915f94d0272a2e60cb54017d9e0f827dd9d9119bb53c805f34d04bd9250734bc735a793e945b886524a2ee350d8fa5c75a4e3363e32c3f3bec6d10ee +SHA512 (gnome-commander-1.18.0.tar.xz) = 327c2046da4b27360b8fd85e58e5315abc10bf2a19ccb0cb8b4d3150d8de479a94adeeafcf812a61c98c96e3eb0343a8979c1077c2a585881746d66f3884e4cb From 31ba25663a5af0a31cd21320df6c95b2441ea3fd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Jul 2024 15:40:19 +0900 Subject: [PATCH 67/75] Apply upstream PR for workaround for segfault with leaving tab pointing to invalid directory --- ...egfault-with-tab-pointing-to-invalid.patch | 52 +++++++++++++++++++ gnome-commander.spec | 8 ++- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch diff --git a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch new file mode 100644 index 0000000..583cf29 --- /dev/null +++ b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch @@ -0,0 +1,52 @@ +From edd9f86713ca15ba9e9baeefbc282ddd00c8a6ff Mon Sep 17 00:00:00 2001 +From: gnome-commander Fedora maintainer + +Date: Tue, 23 Jul 2024 15:14:27 +0900 +Subject: [PATCH] Workaround for segfault with tab pointing to invalid + directory + +Workaround for +https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/151 +--- + src/gnome-cmd-main-win.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc +index 9eec172c..c1cc2dd2 100644 +--- a/src/gnome-cmd-main-win.cc ++++ b/src/gnome-cmd-main-win.cc +@@ -907,10 +907,13 @@ gboolean GnomeCmdMainWin::key_pressed(GnomeCmdKeyPress *event) + + void GnomeCmdMainWin::open_tabs(FileSelectorID id) + { +- if (gnome_cmd_data.tabs[id].empty()) ++ if (1 || gnome_cmd_data.tabs[id].empty()) + gnome_cmd_data.tabs[id].push_back(make_pair(string(g_get_home_dir ()), make_tuple(GnomeCmdFileList::COLUMN_NAME, GTK_SORT_ASCENDING, FALSE))); + + auto last_tab = unique(gnome_cmd_data.tabs[id].begin(), gnome_cmd_data.tabs[id].end()); ++ auto back_tab = gnome_cmd_data.tabs[id].end(); ++ --back_tab; ++ auto found_valid = false; + + for (auto tab=gnome_cmd_data.tabs[id].begin(); tab!=last_tab; ++tab) + { +@@ -920,6 +923,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + gchar *path = nullptr; + GnomeCmdCon *con; + ++ if ((tab == back_tab) && found_valid) continue; ++ + if (!uriScheme) + { + g_warning("Stored URI is either not absolute or invalid: %s", uriString.c_str()); +@@ -961,6 +966,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) + { + const auto& tabTuple = tab->second; + fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); ++ found_valid = true; + } + else + { +-- +2.45.2 + diff --git a/gnome-commander.spec b/gnome-commander.spec index a4f0545..60abbfe 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,6 +72,7 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch +Patch153: UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -189,6 +190,7 @@ git commit -m "base" -q git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif +cat %PATCH153 | git am # Tweak samba detection sed -i meson.build \ @@ -302,6 +304,10 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2.san +- Apply upstream PR for workaround for segfault with leaving tab pointing to + invalid directory + * Mon Jul 22 2024 Mamoru TASAKA - 4:1.18.0-1 - 0.18.0 From 048e8fbb964f3dbddf4ddea4f3d67662f5f563e1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Jul 2024 15:40:30 +0900 Subject: [PATCH 68/75] kill asan --- gnome-commander.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 60abbfe..d09f179 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -10,7 +10,7 @@ %global if_pre 0 -%global use_gcc_strict_sanitize 1 +%global use_gcc_strict_sanitize 0 %global use_release 1 %global use_gitbare 0 From 2af602367bf25d75a8698d87c9fe4815955531e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 1 Aug 2024 13:53:44 +0900 Subject: [PATCH 69/75] 1.18.1 --- ...egfault-with-tab-pointing-to-invalid.patch | 52 ------------------- gnome-commander.spec | 11 ++-- sources | 2 +- 3 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch diff --git a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch b/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch deleted file mode 100644 index 583cf29..0000000 --- a/UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch +++ /dev/null @@ -1,52 +0,0 @@ -From edd9f86713ca15ba9e9baeefbc282ddd00c8a6ff Mon Sep 17 00:00:00 2001 -From: gnome-commander Fedora maintainer - -Date: Tue, 23 Jul 2024 15:14:27 +0900 -Subject: [PATCH] Workaround for segfault with tab pointing to invalid - directory - -Workaround for -https://gitlab.gnome.org/GNOME/gnome-commander/-/issues/151 ---- - src/gnome-cmd-main-win.cc | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc -index 9eec172c..c1cc2dd2 100644 ---- a/src/gnome-cmd-main-win.cc -+++ b/src/gnome-cmd-main-win.cc -@@ -907,10 +907,13 @@ gboolean GnomeCmdMainWin::key_pressed(GnomeCmdKeyPress *event) - - void GnomeCmdMainWin::open_tabs(FileSelectorID id) - { -- if (gnome_cmd_data.tabs[id].empty()) -+ if (1 || gnome_cmd_data.tabs[id].empty()) - gnome_cmd_data.tabs[id].push_back(make_pair(string(g_get_home_dir ()), make_tuple(GnomeCmdFileList::COLUMN_NAME, GTK_SORT_ASCENDING, FALSE))); - - auto last_tab = unique(gnome_cmd_data.tabs[id].begin(), gnome_cmd_data.tabs[id].end()); -+ auto back_tab = gnome_cmd_data.tabs[id].end(); -+ --back_tab; -+ auto found_valid = false; - - for (auto tab=gnome_cmd_data.tabs[id].begin(); tab!=last_tab; ++tab) - { -@@ -920,6 +923,8 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - gchar *path = nullptr; - GnomeCmdCon *con; - -+ if ((tab == back_tab) && found_valid) continue; -+ - if (!uriScheme) - { - g_warning("Stored URI is either not absolute or invalid: %s", uriString.c_str()); -@@ -961,6 +966,7 @@ void GnomeCmdMainWin::open_tabs(FileSelectorID id) - { - const auto& tabTuple = tab->second; - fs(id)->new_tab(gnomeCmdDir, std::get<0>(tabTuple), std::get<1>(tabTuple), std::get<2>(tabTuple), TRUE); -+ found_valid = true; - } - else - { --- -2.45.2 - diff --git a/gnome-commander.spec b/gnome-commander.spec index d09f179..065c043 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.0 +%global fullver %{shortver}.1 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -72,7 +72,6 @@ Source1: gnome-commander.sh # Source0 is created from Source2 Source2: create-gcmd-git-bare-tarball.sh Patch1: gnome-commander-1.6.0-path-fedora-specific.patch -Patch153: UP153-Workaround-for-segfault-with-tab-pointing-to-invalid.patch BuildRequires: gcc-c++ %if 0%{?use_gcc_strict_sanitize} @@ -190,7 +189,6 @@ git commit -m "base" -q git commit -m "Apply Fedora specific path configuration" -a %if 0%{?use_release} %endif -cat %PATCH153 | git am # Tweak samba detection sed -i meson.build \ @@ -304,7 +302,10 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog -* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2.san +* Thu Aug 01 2024 Mamoru TASAKA - 4:1.18.1-1 +- 1.18.1 + +* Tue Jul 23 2024 Mamoru TASAKA - 4:1.18.0-2 - Apply upstream PR for workaround for segfault with leaving tab pointing to invalid directory diff --git a/sources b/sources index 7c549a8..4f65282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.0.tar.xz) = 327c2046da4b27360b8fd85e58e5315abc10bf2a19ccb0cb8b4d3150d8de479a94adeeafcf812a61c98c96e3eb0343a8979c1077c2a585881746d66f3884e4cb +SHA512 (gnome-commander-1.18.1.tar.xz) = 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e From 6ecc213f4733f49c1baa2847ea6134f1e8e17f10 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Sep 2024 16:23:29 +0900 Subject: [PATCH 70/75] Require gdk-pixbuf2-modules-extra when available --- gnome-commander.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 065c043..17c6b39 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -110,6 +110,9 @@ BuildRequires: pkgconfig(gtest) Requires: meld Requires: gnome-icon-theme-legacy +%if 0%{?fedora} >= 41 +Requires: gdk-pixbuf2-modules-extra%{?_isa} +%endif %description GNOME Commander is a nice and fast file manager for the GNOME desktop. @@ -302,6 +305,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Sep 15 2024 Mamoru TASAKA - 4:1.18.1-2 +- Require gdk-pixbuf2-modules-extra when available + * Thu Aug 01 2024 Mamoru TASAKA - 4:1.18.1-1 - 1.18.1 From 33b6312d3ee8a599ca078c49dca7608033ae2625 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 22:38:05 +0000 Subject: [PATCH 71/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 17c6b39..b1d3b69 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 3%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -305,6 +305,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 4:1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Sep 15 2024 Mamoru TASAKA - 4:1.18.1-2 - Require gdk-pixbuf2-modules-extra when available From 79ceb7d10e004b73e83d047115a546afccaed41e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 10 Feb 2025 23:09:23 +0900 Subject: [PATCH 72/75] 1.18.2 --- gnome-commander.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index b1d3b69..a247921 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.1 +%global fullver %{shortver}.2 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 3%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -111,6 +111,7 @@ BuildRequires: pkgconfig(gtest) Requires: meld Requires: gnome-icon-theme-legacy %if 0%{?fedora} >= 41 +BuildRequires: gdk-pixbuf2-modules-extra Requires: gdk-pixbuf2-modules-extra%{?_isa} %endif @@ -305,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Mon Feb 10 2025 Mamoru TASAKA - 4:1.18.2-1 +- 1.18.2 + * Thu Jan 16 2025 Fedora Release Engineering - 4:1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 4f65282..7a18b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.1.tar.xz) = 6715538fd913d2167fa70feba48106b3bff8b17185df2590b490633c628995295d6e17c953d449537ddfe4a48ea3be0ce6e1cc82be0f6db7b26c91f29e4a418e +SHA512 (gnome-commander-1.18.2.tar.xz) = dce4af0f0e664b0bb835839f2f465ce5cb34bef8e73bb34b6016fad0f1e79232daa149897da2cafe32450ce5853e27eed6ceaac2284d580709a27c2926249911 From e25944d21375571f2ea886c2bf8cff285ac81f83 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 Jun 2025 11:11:39 +0900 Subject: [PATCH 73/75] 1.18.3 --- gnome-commander.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a247921..51192eb 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.2 +%global fullver %{shortver}.3 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Jun 26 2025 Mamoru TASAKA - 4:1.18.3-1 +- 1.18.3 + * Mon Feb 10 2025 Mamoru TASAKA - 4:1.18.2-1 - 1.18.2 diff --git a/sources b/sources index 7a18b69..8f12001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.2.tar.xz) = dce4af0f0e664b0bb835839f2f465ce5cb34bef8e73bb34b6016fad0f1e79232daa149897da2cafe32450ce5853e27eed6ceaac2284d580709a27c2926249911 +SHA512 (gnome-commander-1.18.3.tar.xz) = 72dad0cf73c94293c382eaacd2ea6172539cd2ee6534d48c58b2f74166caddd633a88cae6ca8bd6271522d037919a91f1291fbd1ccc3493004ed67f0d7081bed From 3e1c033a50fdd94c5948e4e3136fa9635fe69bd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 22:40:17 +0000 Subject: [PATCH 74/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gnome-commander.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index 51192eb..a75ce6e 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 1%{?dist}%{flagrel} +Release: 2%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4:1.18.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 26 2025 Mamoru TASAKA - 4:1.18.3-1 - 1.18.3 From bbe02043e18341f0bec74108c85906cf8ed26cc2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Oct 2025 23:31:15 +0900 Subject: [PATCH 75/75] 1.18.4 --- gnome-commander.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gnome-commander.spec b/gnome-commander.spec index a75ce6e..19979f7 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -38,7 +38,7 @@ %endif %global shortver 1.18 -%global fullver %{shortver}.3 +%global fullver %{shortver}.4 %if 0%{?use_release} >= 1 %global fedoraver %{fullver} @@ -51,7 +51,7 @@ Name: gnome-commander # Downgrade 3 times, sorry... Epoch: 4 Version: %{fedoraver} -Release: 2%{?dist}%{flagrel} +Release: 1%{?dist}%{flagrel} Summary: A nice and fast file manager for the GNOME desktop Summary(pl): Menadżer plików dla GNOME oparty o Norton Commander'a (TM) Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME @@ -306,6 +306,9 @@ popd %{_datadir}/pixmaps/%{name}/ %changelog +* Thu Oct 02 2025 Mamoru TASAKA - 4:1.18.4-1 +- 1.18.4 + * Wed Jul 23 2025 Fedora Release Engineering - 4:1.18.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 8f12001..d5cd8e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.18.3.tar.xz) = 72dad0cf73c94293c382eaacd2ea6172539cd2ee6534d48c58b2f74166caddd633a88cae6ca8bd6271522d037919a91f1291fbd1ccc3493004ed67f0d7081bed +SHA512 (gnome-commander-1.18.4.tar.xz) = 54966719e63a4ca6c9d24cbd1f69dbadd4ac0b7588c2cd1a34635deafcab5976d9e82fdcf6dbc0dc7f1098a25443c9eeaa2400db192b487b6d92d62f62ee23db