rpms/libfm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use revised upstream patch

Browse Source
This commit is contained in:
Mamoru Tasaka 2010-05-29 06:18:53 +00:00
parent c46c3bc541
commit 7f70afa370
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libfm-0.1.11-path-removal-sanity-check.patch
View File

@ -1,22 +1,29 @@
commit ad0cbac423bd916a5dd3549de068c5d6bd5a56b8
Author: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
Date: Sat May 29 13:02:34 2010 +0800
Fix #3008676: gnome-terminal wrapper crashes with certain PATH.
diff --git a/src/gnome-terminal-wrapper.c b/src/gnome-terminal-wrapper.c diff --git a/src/gnome-terminal-wrapper.c b/src/gnome-terminal-wrapper.c
index 44134bb..45629ee 100644 index 44134bb..14d3d82 100644
--- a/src/gnome-terminal-wrapper.c --- a/src/gnome-terminal-wrapper.c
+++ b/src/gnome-terminal-wrapper.c +++ b/src/gnome-terminal-wrapper.c
@@ -78,9 +78,14 @@ int main(int argc, char** argv) @@ -78,9 +78,15 @@ int main(int argc, char** argv)
} }
/* Remove /usr/lib/libfm from PATH */ /* Remove /usr/lib/libfm from PATH */
path = g_getenv("PATH"); path = g_getenv("PATH");
- sep = strchr(path, ':'); - sep = strchr(path, ':');
- path = sep + 1; - path = sep + 1;
- g_setenv("PATH", path, TRUE); - g_setenv("PATH", path, TRUE);
+ /* Sanity check here... */ + if(path && g_str_has_prefix(path, PACKAGE_LIB_DIR))
+ sep = NULL; + {
+ if (path) sep = strchr(path, ':'); + sep = strchr(path, ':');
+ if (sep) path = sep + 1; + if(sep)
+ if (sep && path && *path) + {
+ g_setenv("PATH", path, TRUE); + path = sep + 1;
+ else + g_setenv("PATH", path, TRUE);
+ g_unsetenv("PATH"); + }
+ }
if((argc < 2) && terminal) /* only execute the temrinal emulator */ if((argc < 2) && terminal) /* only execute the temrinal emulator */
{ {

7
libfm.spec
View File

@ -5,7 +5,7 @@
Name: libfm Name: libfm
Version: 0.1.11 Version: 0.1.11
Release: 6%{?dist} Release: 7%{?dist}
Summary: GIO-based library for file manager-like programs Summary: GIO-based library for file manager-like programs
Group: System Environment/Libraries Group: System Environment/Libraries
@ -22,9 +22,10 @@ Patch0: libfm-0.1.9-pref-apps.patch
Patch2: libfm-0.1.11-gterm-argc.patch Patch2: libfm-0.1.11-gterm-argc.patch
# Issue in sorting by name in ja_JP.UTF-8, upstream bug 3002788 # Issue in sorting by name in ja_JP.UTF-8, upstream bug 3002788
Patch3: libfm-0.1.11-sort-by-name-in-japanese.patch Patch3: libfm-0.1.11-sort-by-name-in-japanese.patch
# Patches need discussing with the upstream
# gnome-terminal wrapper crashes with certain path setting # gnome-terminal wrapper crashes with certain path setting
# upstream bug 3008676
Patch4: libfm-0.1.11-path-removal-sanity-check.patch Patch4: libfm-0.1.11-path-removal-sanity-check.patch
# Patches need discussing with the upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.16.0 BuildRequires: gtk2-devel >= 2.16.0
@ -200,7 +201,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Sat May 29 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.1.11-6 * Sat May 29 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.1.11-7
- Fix crash of gnome-terminal wrapper with certain path settings - Fix crash of gnome-terminal wrapper with certain path settings
(bug 596598, 597270) (bug 596598, 597270)