diff options
| author | haawda | 2017-04-12 21:42:35 +0200 |
|---|---|---|
| committer | haawda | 2017-04-12 21:42:35 +0200 |
| commit | a897d13ed971968974567ca9ef452ce8810373bb (patch) | |
| tree | 52e0ddc493a5bbf3dd23c6ba10040358879637bf /no_leafpad.patch | |
| parent | b188da3076d46cb27deb773248a4ee0728e47722 (diff) | |
| download | aur-a897d13ed971968974567ca9ef452ce8810373bb.tar.gz | |
update with new patch
Diffstat (limited to 'no_leafpad.patch')
| -rw-r--r-- | no_leafpad.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/no_leafpad.patch b/no_leafpad.patch new file mode 100644 index 000000000000..aedf8ae3e528 --- /dev/null +++ b/no_leafpad.patch @@ -0,0 +1,36 @@ +diff -Naur fotoxx-17.04.1.orig/fotoxx-17.04.1.cc fotoxx-17.04.1.new/fotoxx-17.04.1.cc +--- fotoxx-17.04.1.orig/fotoxx-17.04.1.cc 2017-04-12 21:04:08.630207362 +0200 ++++ fotoxx-17.04.1.new/fotoxx-17.04.1.cc 2017-04-12 21:08:28.118440955 +0200 +@@ -375,7 +375,7 @@ + + int initzfunc(void *) + { +- int Fleafpad = 0, Fexiftool = 0, Fxdgopen = 0; ++ int Ftexteditor = 0, Fexiftool = 0, Fxdgopen = 0; + int ii, err, npid, contx; + FTYPE ftype; + char *pp, *pp2; +@@ -405,8 +405,8 @@ + if (exifver >= 8.60) Fexiftool = 1; + } + +- err = shell_quiet("which leafpad 1>2 2>/dev/null"); // check for leafpad 17.04 +- if (! err) Fleafpad = 1; ++ err = shell_quiet("which $EDITOR 1>2 2>/dev/null"); // check for texteditor 17.04 ++ if (! err) Ftexteditor = 1; + err = shell_quiet("which xdg-open 1>2 2>/dev/null"); // check for xdg-open + if (! err) Fxdgopen = 1; + err = shell_quiet("which rawtherapee 1>2 2>/dev/null"); // check for Raw Therapee +@@ -421,10 +421,10 @@ + if (! err) PTtools = 2; + } + +- if (Fexiftool + Fxdgopen + Fleafpad < 3) { // check mandatory dependencies ++ if (Fexiftool + Fxdgopen + Ftexteditor < 3) { // check mandatory dependencies + strcpy(badnews,ZTX("Please install missing programs:")); + if (! Fexiftool) strcat(badnews,"\n exiftool 8.6 or later"); // refuse to start if any missing +- if (! Fleafpad) strcat(badnews,"\n leafpad"); // 17.04 ++ if (! Ftexteditor) strcat(badnews,"\n define EDITOR variable"); // 17.04 + if (! Fxdgopen) strcat(badnews,"\n xdg-utils"); + zmessageACK(Mwin,badnews); + m_quit(0,0); |