diff --git a/gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch b/gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch new file mode 100644 index 0000000..d9931f7 --- /dev/null +++ b/gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch @@ -0,0 +1,27 @@ +From 2e648e4b7d0740a0583568c017d12a9d9a359799 Mon Sep 17 00:00:00 2001 +From: Mamoru Tasaka +Date: Sun, 15 Mar 2015 00:09:05 +0100 +Subject: Removed unnecessary g_assert call, fixes #746003 + +Removing the g_assert call leads to a return of NULL when no ID could be +found. + +Signed-off-by: Uwe Scholz + + +diff --git a/src/owner.h b/src/owner.h +index a5e8e5d..85305ca 100644 +--- a/src/owner.h ++++ b/src/owner.h +@@ -162,8 +162,6 @@ inline const gchar *GnomeCmdOwner::HashTable::operator [] (ID id) + { + Entry *entry = lookup(id); + +- g_assert (entry != NULL); +- + return entry ? entry->name : NULL; + } + +-- +cgit v0.10.2 + diff --git a/gnome-commander.spec b/gnome-commander.spec index 67dc90c..a5adb61 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -26,7 +26,7 @@ %global use_autotool 0 %global update_po 0 %global if_pre 0 -%global main_release 2 +%global main_release 3 %global extratag git_%{git_pull_JST} %undefine extratag %global mimeedit_rev 1958 @@ -63,6 +63,9 @@ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{versi Source1: gnome-commander.sh Source10: mimeedit-svn%{mimeedit_rev}.sh Patch10: mimeedit-svn1958.diff +# Fix abort on opening property dialog on directory on ftp server with "odd" uid +# (bug 1200349, GNOME bug 746003) +Patch100: gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -132,6 +135,8 @@ ansluta till FTP-servrar och SMB-nätverk. %prep %setup -q -n %{name}-%{version}%{?extratag:-%extratag} +%patch100 -p1 + %if 0%{use_autotool} > 0 ( export NOCONFIGURE=1 ; sh autogen.sh ) %endif @@ -250,6 +255,11 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}/ %changelog +* Sun Mar 15 2015 Mamoru TASAKA - 4:1.4.5-3 +- Fix abort on opening property dialog on directory on ftp server with "odd" uid + (bug 1200349, GNOME bug 746003) + + * Wed Mar 11 2015 Mamoru TASAKA - 4:1.4.5-2 - Require gnome-icon-theme-legacy