rpms/gnome-commander/F-11 gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch, NONE, 1.1 gnome-commander.spec, 1.64, 1.65
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Dec 3 07:49:42 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/gnome-commander/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11551
Modified Files:
gnome-commander.spec
Added Files:
gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
Log Message:
* Thu Dec 3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
- Fix crash when cancelling symlink creation with ESC
(bug 542366, GNOME bug 603301)
gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch:
gnome-cmd-dialog.c | 1 +
gnome-cmd-string-dialog.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch ---
commit b6cee8a6fa8e026dbbdbea263b7053a958e415af
Author: Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
Date: Wed Dec 2 23:24:12 2009 +0100
Fixed problem #603301 (crash when cancelling symlink creation by ESC)
diff --git a/libgcmd/gnome-cmd-dialog.c b/libgcmd/gnome-cmd-dialog.c
index ce89824..97a21a1 100644
--- a/libgcmd/gnome-cmd-dialog.c
+++ b/libgcmd/gnome-cmd-dialog.c
@@ -63,6 +63,7 @@ static void destroy (GtkObject *object)
(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
g_free (dialog->priv);
+ dialog->priv = NULL;
}
diff --git a/libgcmd/gnome-cmd-string-dialog.c b/libgcmd/gnome-cmd-string-dialog.c
index 4ab5fab..77d824e 100644
--- a/libgcmd/gnome-cmd-string-dialog.c
+++ b/libgcmd/gnome-cmd-string-dialog.c
@@ -82,8 +82,11 @@ destroy (GtkObject *object)
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
- g_free (dialog->priv->error_desc);
+ if (dialog->priv)
+ g_free (dialog->priv->error_desc);
+
g_free (dialog->priv);
+ dialog->priv = NULL;
}
Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/F-11/gnome-commander.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- gnome-commander.spec 29 Oct 2009 16:48:23 -0000 1.64
+++ gnome-commander.spec 3 Dec 2009 07:49:42 -0000 1.65
@@ -1,9 +1,14 @@
# To use git, follow:
#
-# git clone git://git.gnome.org/gnome-commander
-# ln -sf gcmd-1-3 gnome-commander-%%{version}-git_%%{git_pull_JST}
+# 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.bz2 \
-# gnome-commander-%%{version}-git_%%{git_pull_JST}
+# 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/
@@ -11,28 +16,36 @@
#
# ref: http://lists.gnu.org/archive/html/gcmd-devel/2007-11/msg00076.html
-%define EXIV2_REQ 0.14
-%define TAGLIB_REQ 1.4
-%define LIBGSF_REQ 1.12.0
-%define POPPLER_REQ 0.6
-
-%define git_pull_JST D20090629T1400
-
-%define use_autotool 0
-%define if_pre 0
-%define main_release 1
-%define extratag git_%{git_pull_JST}
+%global EXIV2_REQ 0.14
+%global TAGLIB_REQ 1.4
+%global LIBGSF_REQ 1.12.0
+%global POPPLER_REQ 0.6
+
+%global git_pull_JST D20090629T1400
+
+%global use_autotool 0
+%global update_po 0
+%global if_pre 0
+%global main_release 2
+%global extratag git_%{git_pull_JST}
%undefine extratag
-%define mimeedit_rev 1958
+%global mimeedit_rev 1958
%if 0%{?if_pre} > 0
-%define use_autotool 1
+%global use_autotool 1
+%endif
+%if 0%{?use_autotool} < 1
+%global update_po 0
%endif
-%define fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
+%global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
Name: gnome-commander
Version: 1.2.8.3
+%if 0%{?fedora} >= 12
+# Downgrade 1 time
+Epoch: 1
+%endif
Release: %{fedora_rel}%{?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)
@@ -45,6 +58,8 @@ Source0: ftp://ftp.gnome.org/pub/G
Source1: gnome-commander.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh
Patch10: mimeedit-svn1958.diff
+# From upstream
+Patch20: gnome-commander-1.2.9-crash-when-cancelling-symlink-creation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -110,45 +125,18 @@ ansluta till FTP-servrar och SMB-nätver
%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
%if 0%{use_autotool} > 0
-# Workaround to make gnome-autogen support automake 1.11
-# Note that fixed gnome-common-2.26.0-2.fc11 is now in testing
-mkdir TMPBIN ; cd TMPBIN
-sed -e 's|automake-1\.10|automake-1.11 automake-1.10|' \
- %{_bindir}/gnome-autogen.sh > ./gnome-autogen.sh
-chmod 0755 ./gnome-autogen.sh
-export PATH=$(pwd):$PATH
-cd ..
-
%{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
sh autogen.sh
%endif
-cp -p %SOURCE10 mimeedit.sh
+%{__cp} -p %SOURCE10 mimeedit.sh
%patch10 -p0
+%patch20 -p1 -b .symlink
%{__sed} -i.pylib \
-e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
configure
-%if 0%{?fedora} >= 10 && 0
-function replace_icon(){
- find . -name \*.cc | xargs grep -l $1 | \
- xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
-}
-
-
-# Replace icon name due to gnome-icon-theme 2.23.x change
-# (many icons are removed)
-replace_icon gnome-fs-directory gtk-directory
-replace_icon gnome-fs-ftp folder-remote
-replace_icon gnome-fs-home user-home
-replace_icon gnome-fs-network gtk-network
-replace_icon gnome-fs-smb network-workgroup
-replace_icon gnome-fs-ssh folder-remote
-replace_icon gnome-fs-web folder-remote
-
-%endif
-
# gzip
gzip -9 ChangeLog-*
@@ -160,9 +148,13 @@ gzip -9 ChangeLog-*
--bindir=%{_libexecdir}/%{name} \
--disable-scrollkeeper \
--enable-python
-# Sometimes parallel make fails (perhaps), however once
-# force it.
-%{__make} %{?_smp_mflags} -k || { %{__make} || exit 1; }
+
+%if %{update_po}
+%{__make} -C po gnome-commander.pot update-po
+%endif
+
+%{__make} %{?_smp_mflags} -k \
+ GMSGFMT="msgfmt --statistics"
%install
%{__rm} -rf %{buildroot}
@@ -227,6 +219,10 @@ scrollkeeper-update -q || :
%{_datadir}/pixmaps/%{name}/
%changelog
+* Thu Dec 3 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-2
+- Fix crash when cancelling symlink creation with ESC
+ (bug 542366, GNOME bug 603301)
+
* Fri Oct 30 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.8.3-1
- 1.2.8.3
More information about the fedora-extras-commits
mailing list