138 lines
5.7 KiB
Diff
138 lines
5.7 KiB
Diff
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig 2010-07-05 21:12:51.000000000 +0200
|
|
+++ configure.ac 2010-07-07 14:39:08.919511437 +0200
|
|
@@ -71,7 +71,7 @@ AC_PROG_LN_S
|
|
AC_CHECK_TOOL(AR, ar, ar)
|
|
|
|
dnl Only list browsers here that can be run in background (i.e. with `&')
|
|
-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
|
|
+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
|
|
|
|
dnl
|
|
dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used.
|
|
Index: misc/mc.ext.in
|
|
===================================================================
|
|
--- misc/mc.ext.in.orig 2010-07-07 14:39:08.723510066 +0200
|
|
+++ misc/mc.ext.in 2010-07-07 14:55:35.231010197 +0200
|
|
@@ -226,8 +226,8 @@ regex/\.rpm$
|
|
|
|
# deb
|
|
regex/\.u?deb$
|
|
- Open=%cd %p#deb
|
|
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
|
|
+ Open=%cd %p#uar
|
|
+ View=%view{ascii} file %f && nm %f
|
|
|
|
# dpkg
|
|
shell/.debd
|
|
@@ -399,7 +399,8 @@ include/image
|
|
### Sound files ###
|
|
|
|
regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
|
|
- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
+ Include=audio
|
|
+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
|
|
regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
|
|
Open=mikmod %f
|
|
@@ -409,15 +410,22 @@ regex/\.([wW][aA][wW]22)$
|
|
Open=vplay -s 22 %f
|
|
|
|
regex/\.([mM][pP]3)$
|
|
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
|
|
- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
|
|
+ Include=audio
|
|
+# Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else if [ -z "`which realplay`" ]; then (xmms -e %f 1>/dev/null 2>&1 &); else (realplay %f >/dev/null 2>&1 &); fi; fi
|
|
+# View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
|
|
+
|
|
+regex/\.([mM][kK][aA])$
|
|
+ Include=audio
|
|
|
|
regex/\.([oO][gG][gG|aA|vV|xX])$
|
|
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
|
|
+ Include=audio
|
|
+# Open=ogg123 %f
|
|
+# Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms -e %f >/dev/null 2>&1 &); fi
|
|
View=%view{ascii} ogginfo %s
|
|
|
|
regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
|
|
- Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
+ Include=audio
|
|
+# Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
|
|
|
|
regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
|
|
Open=timidity %f
|
|
@@ -426,11 +434,15 @@ regex/\.([wW][mM][aA])$
|
|
Open=mplayer -vo null %f
|
|
View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
|
|
|
|
+include/audio
|
|
+ Open=mplayer %f
|
|
+ View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
|
|
|
|
### Play lists ###
|
|
|
|
regex/\.([mM]3[uU]|[pP][lL][sS])$
|
|
- Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
|
|
+ Open=mplayer -vo null -playlist %f
|
|
+# Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
|
|
|
|
|
|
### Video ###
|
|
@@ -478,12 +490,12 @@ include/video
|
|
|
|
# Postscript
|
|
type/^PostScript
|
|
- Open=(gv %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f >/dev/null 2>&1 &)
|
|
View=%view{ascii} ps2ascii %f
|
|
|
|
# PDF
|
|
type/^PDF
|
|
- Open=(xpdf %f >/dev/null 2>&1 &)
|
|
+ Open=(xdg-open %f >/dev/null 2>&1 &)
|
|
#Open=(acroread %f &)
|
|
#Open=(ghostview %f &)
|
|
View=%view{ascii} pdftotext %f -
|
|
@@ -511,27 +523,33 @@ shell/.abw
|
|
|
|
# Microsoft Word Document
|
|
type/^Microsoft\ Office\ Document
|
|
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
View=%view{ascii} wvText %f - || strings %f
|
|
|
|
type/^Microsoft\ Word
|
|
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
View=%view{ascii} wvText %f - || strings %f
|
|
|
|
regex/\.([Dd]ot|DOT|[Ww]ri|WRI)$
|
|
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null
|
|
View=%view{ascii} wvText %f - || strings %f
|
|
|
|
# RTF document
|
|
regex/\.([rR][tT][fF])$
|
|
- Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
|
|
# Microsoft Excel Worksheet
|
|
regex/\.([xX][lL][sSwW])$
|
|
- Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
View=%view{ascii} xls2csv %f || strings %f
|
|
type/^Microsoft\ Excel
|
|
- Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
+ Open=(xdg-open %f &)
|
|
+# Open=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
|
|
View=%view{ascii} xls2csv %f || strings %f
|
|
|
|
# Framemaker
|