pool/mc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 183680 from Base:System

Browse Source 
Updated to latest released (4.8.9) (forwarded request 183610 from subchaser)

OBS-URL: https://build.opensuse.org/request/show/183680
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mc?expand=0&rev=48
This commit is contained in:
Stephan Kulow 2013-07-19 09:14:07 +00:00 committed by Git OBS Bridge
commit f5238f7d4d
21 changed files with 345 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mc-4.8.1.7.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea5340c35735e374eed9b92268e80a12121a8fdf21ec249fef095fe2522faf9c
size 2049316

3
mc-4.8.9.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1253fbed3d471473c4eb9709dd6b981333754e122ddbfaa99d7cfb57508477a2
size 2169836

5
mc-Syntax.cmake.patch
View File

@ -1,11 +1,8 @@
--- misc/syntax/Syntax.in.orig 2012-12-28 12:47:48.000000000 +0400 --- misc/syntax/Syntax.in.orig 2012-12-28 12:47:48.000000000 +0400
+++ misc/syntax/Syntax.in 2013-03-07 09:36:14.233306543 +0400 +++ misc/syntax/Syntax.in 2013-03-07 09:36:14.233306543 +0400
@@ -67,7 +67,7 @@ @@ -69,4 +69,4 @@
file (.\*[Mm]akefile[\\\.A-Za-z0-9]\*|..\*\\.mk|Kbuild)$ Makefile
include makefile.syntax
-file CMakeLists.txt$ CMake -file CMakeLists.txt$ CMake
+file (\/CMakeLists.txt|.cmake)$ CMake +file (\/CMakeLists.txt|.cmake)$ CMake
include cmake.syntax include cmake.syntax
file ..\*\\.(pp|PP|pas|PAS|dpr|DPR|inc|INC)$ Pascal\sProgram

11
mc-apps-mediainfo.patch
View File

@ -1,11 +0,0 @@
diff -ru misc.orig/mc.ext.in misc/mc.ext.in
--- misc.orig/mc.ext.in 2011-02-05 17:54:56.000000000 +0300
+++ misc/mc.ext.in 2011-03-06 10:51:12.340002584 +0300
@@ -471,6 +471,7 @@
Open=(mplayer %f >/dev/null 2>&1 &)
#Open=(gtv %f >/dev/null 2>&1 &)
#Open=(xanim %f >/dev/null 2>&1 &)
+ View=%view{ascii} which mediainfo > /dev/null 2>&1 && mediainfo %f || file %f
### Documents ###

12
mc-apps-torrent.patch
View File

@ -1,12 +0,0 @@
--- misc/mc.ext.in.orig 2012-03-19 20:26:22.000000000 +0400
+++ misc/mc.ext.in 2012-04-04 19:49:06.427780685 +0400
@@ -614,7 +614,8 @@
# torrent
regex/\.([tT][oO][rR][rR][eE][nN][tT])$
- View=%view{ascii} ctorrent -x %f 2>/dev/null
+ View=%view{ascii} which ctorrent >/dev/null 2>&1 && ctorrent -x %f 2>/dev/null || which transmission-show >/dev/null 2>&1 && transmission-show %f || file %f
+
### Plain compressed files ###

103
mc-apps.patch
View File

@ -1,103 +0,0 @@
--- misc/mc.ext.in.orig 2012-03-19 20:26:22.000000000 +0400
+++ misc/mc.ext.in 2012-03-20 19:56:03.372083301 +0400
@@ -121,7 +121,7 @@
# Open=%cd %p/utar://
View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf -
-regex/\.t(ar\.bz2|bz2?|b2)$
+regex/\.t(ar\.bz2|bz2?|b2|bz2)$
Open=%cd %p/utar://
View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
@@ -403,7 +403,7 @@
Include=image
include/image
- Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
+ Open=if [ "$DISPLAY" = "" ]; then asciiview %f; else (display %f >/dev/null 2>&1 &); fi
View=%view{ascii} identify %f
#View=%view{ascii} asciiview %f
@@ -497,12 +497,12 @@
# Postscript
type/^PostScript
- Open=(gv %f &)
+ Open=(gv %f >/dev/null 2>&1 &)
View=%view{ascii} ps2ascii %f
# PDF
type/^PDF
- Open=(xpdf %f &)
+ Open=(xpdf %f >/dev/null 2>&1 &)
#Open=(acroread %f &)
#Open=(ghostview %f &)
View=%view{ascii} pdftotext %f -
@@ -517,48 +517,44 @@
# StarOffice 5.2
shell/.sdw
- Open=(ooffice %f &)
+ Open=(ooffice %f >/dev/null 2>&1 &)
# StarOffice 6 and OpenOffice.org formats
-regex/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
- Open=(ooffice %f &)
+regex/\.(odb|odc|odf|odg|odi|odm|odp|ods|odt|otg|oth|otp|ots|ott|sda|sdc|sdd|sdp|sds|sdw|sgl|smf|stc|std|sti|stw|sxc|sxd|sxg|sxi|sxm|sxw|vor)$
+ Open=(ooffice %f >/dev/null 2>&1 &)
View=%view{ascii} odt2txt %f
# AbiWord
shell/.abw
- Open=(abiword %f &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
# Microsoft Word Document
regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
- Open=(abiword %f >/dev/null 2>&1 &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
type/^Microsoft\ Word
- Open=(abiword %f >/dev/null 2>&1 &)
+ Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
# RTF document
regex/\.([rR][tT][fF])$
- Open=(abiword %f >/dev/null 2>&1 &)
+ 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=(gnumeric %f >/dev/null 2>&1 &)
+ 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=(gnumeric %f >/dev/null 2>&1 &)
+ 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
-# Use OpenOffice.org to open any MS Office documents
-type/^Microsoft\ Office\ Document
- Open=(ooffice %f &)
-
# Framemaker
type/^FrameMaker
Open=fmclient -f %f
# DVI
regex/\.([dD][vV][iI])$
- Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi
+ Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f >/dev/null 2>&1 &); fi
View=%view{ascii} dvi2tty %f
# TeX
@@ -567,7 +563,7 @@
# DjVu
regex/\.(djvu?|DJVU?)$
- Open=djview %f &
+ Open=djview %f >/dev/null 2>&1 &
View=%view{ascii} djvused -e print-pure-txt %f
### Miscellaneous ###

14
mc-esc-seq.patch
View File

@ -1,13 +1,11 @@
Index: lib/util.c --- lib/util.c.orig 2013-07-09 14:43:17.000000000 +0400
=================================================================== +++ lib/util.c 2013-07-11 18:48:01.258511499 +0400
--- lib/util.c.orig 2010-07-05 21:12:51.000000000 +0200 @@ -745,6 +745,8 @@
+++ lib/util.c 2010-07-06 19:19:06.919536838 +0200 while (*(++r) != '\0' && strchr ("0123456789;?", *r) != NULL)
@@ -853,6 +853,8 @@ strip_ctrl_codes (char *s) ;
/* strchr() matches trailing binary 0 */
while (*(++r) && strchr ("0123456789;?", *r));
} }
+ else if (*r == '(') + else if (*r == '(')
+ r++; + r++;
else if (*r == ']') else if (*r == ']')
{ {
/* /*

47
mc-ext-audio.patch Normal file
View File

@ -0,0 +1,47 @@
--- misc/mc.ext.in.orig 2012-12-11 01:04:32.000000000 +0400
+++ misc/mc.ext.in 2013-03-10 10:59:02.741159661 +0400
@@ -433,16 +433,19 @@
### Sound files ###
regex/i/\.(wav|snd|voc|au|smp|aiff|snd|m4a|ape|aac|wv)$
- Open=@EXTHELPERSDIR@/sound.sh open common
+ Include=audio
regex/i/\.(mod|s3m|xm|it|mtm|669|stm|ult|far)$
Open=@EXTHELPERSDIR@/sound.sh open mod
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mod
shell/i/.waw22
Open=@EXTHELPERSDIR@/sound.sh open wav22
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wav22
shell/i/.mp3
Open=@EXTHELPERSDIR@/sound.sh open mp3
+ Include=audio
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view mp3
regex/i/\.og[gax]$
@@ -450,15 +453,22 @@
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view ogg
regex/i/\.(spx|flac)$
- Open=@EXTHELPERSDIR@/sound.sh open common
+ Include=audio
regex/i/\.(midi?|rmid?)$
Open=@EXTHELPERSDIR@/sound.sh open midi
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view midi
shell/i/.wma
Open=@EXTHELPERSDIR@/sound.sh open wma
View=%view{ascii} @EXTHELPERSDIR@/sound.sh view wma
+shell/i/.mka
+ Include=audio
+
+include/audio
+ Open=@EXTHELPERSDIR@/sound.sh open common
+ View=%view{ascii} @EXTHELPERSDIR@/sound.sh view common
### Play lists ###

16
mc-extd-doc.patch Normal file
View File

@ -0,0 +1,16 @@
--- misc/ext.d/doc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/doc.sh.in 2013-03-10 08:03:31.889494487 +0400
@@ -50,3 +50,3 @@
msdoc)
- which wvHtml >/dev/null 2>&1 &&
+ which wvHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1 &&
{
@@ -57,2 +57,3 @@
} || \
+ wvText "${MC_EXT_FILENAME}" - || \
antiword -t "${MC_EXT_FILENAME}" || \
@@ -63,3 +64,3 @@
msxls)
- which xlHtml >/dev/null 2>&1 && {
+ which xlHtml >/dev/null 2>&1 && which elinks >/dev/null 2>&1 && {
tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX`

13
mc-extd-misc.patch Normal file
View File

@ -0,0 +1,13 @@
--- misc/ext.d/misc.sh.in.orig 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/misc.sh.in 2013-03-09 12:10:56.696615817 +0400
@@ -47,3 +47,9 @@
torrent)
- ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
+ if type -p ctorrent >/dev/null 2>&1 ; then
+ ctorrent -x "${MC_EXT_FILENAME}" 2>/dev/null
+ elif type -p transmission-show >/dev/null 2>&1 ; then
+ transmission-show "${MC_EXT_FILENAME}"
+ else
+ file "${MC_EXT_FILENAME}"
+ fi
;;

56
mc-extd-sound.patch Normal file
View File

@ -0,0 +1,56 @@
--- misc/ext.d/sound.sh.orig 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/sound.sh 2013-03-10 11:54:01.186301679 +0400
@@ -6,27 +6,46 @@
action=$1
filetype=$2
-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
+[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
+
+_xdg_open()
+{
+ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
+ gmplayer "${MC_EXT_FILENAME}"
+ elif type -p mplayer ; then
+ mplayer "${MC_EXT_FILENAME}"
+ else
+ xdg-open "${MC_EXT_FILENAME}"
+ fi
+}
do_view_action() {
filetype=$1
+ if type -p mediainfo >/dev/null 2>&1 ; then
+ mediainfo "${MC_EXT_FILENAME}"
+ return $?
+ fi
+
case "${filetype}" in
mp3)
- mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \
- sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ if type -p mpg123 ; then
+ mpg123 -vtn1 "${MC_EXT_FILENAME}" 2>&1 | \
+ sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ return 0
+ fi
;;
ogg)
- ogginfo "${MC_EXT_FILENAME}"
+ type -p ogginfo && ogginfo "${MC_EXT_FILENAME}" && return 0
;;
wma)
mplayer -quiet -slave -frames 0 -vo null -ao null -identify "${MC_EXT_FILENAME}" 2>/dev/null | \
tail +13 || file "${MC_EXT_FILENAME}"
- ;;
- *)
- cat "${MC_EXT_FILENAME}"
+ return $?
;;
esac
+
+ mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | sed -n '/^ID_/p'
}
do_open_action() {

39
mc-extd-video.patch Normal file
View File

@ -0,0 +1,39 @@
--- misc/ext.d/video.sh.orig 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/video.sh 2013-03-09 12:29:54.845011661 +0400
@@ -6,7 +6,18 @@
action=$1
filetype=$2
-[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="xdg-open"
+[ -n "${MC_XDG_OPEN}" ] || MC_XDG_OPEN="_xdg_open"
+
+_xdg_open()
+{
+ if [ -n "$DISPLAY" ] && type -p gmplayer ; then
+ gmplayer "${MC_EXT_FILENAME}"
+ elif type -p mplayer ; then
+ mplayer "${MC_EXT_FILENAME}"
+ else
+ xdg-open "${MC_EXT_FILENAME}"
+ fi
+}
do_view_action() {
filetype=$1
@@ -13,8 +13,14 @@
case "${filetype}" in
*)
- mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \
- sed -n 's/^ID_//p'
+ if type -p mediainfo >/dev/null 2>&1 ; then
+ mediainfo "${MC_EXT_FILENAME}"
+ elif type -p mplayer >/dev/null 2>&1 ; then
+ mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \
+ sed -n 's/^ID_//p'
+ else
+ file "${MC_EXT_FILENAME}"
+ fi
;;
esac
}

72
mc-extd-xdg.patch Normal file
View File

@ -0,0 +1,72 @@
diff -ru1 misc/ext.d.orig/archive.sh misc/ext.d/archive.sh
--- misc/ext.d.orig/archive.sh 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/archive.sh 2013-03-10 09:01:31.154705008 +0400
@@ -145,3 +145,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}" "${pager}"
diff -ru1 misc/ext.d.orig/doc.sh.in misc/ext.d/doc.sh.in
--- misc/ext.d.orig/doc.sh.in 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/doc.sh.in 2013-03-10 09:01:48.230710602 +0400
@@ -189,3 +189,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"
diff -ru1 misc/ext.d.orig/image.sh misc/ext.d/image.sh
--- misc/ext.d.orig/image.sh 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/image.sh 2013-03-10 09:02:00.086714848 +0400
@@ -56,3 +56,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"
diff -ru1 misc/ext.d.orig/misc.sh.in misc/ext.d/misc.sh.in
--- misc/ext.d.orig/misc.sh.in 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/misc.sh.in 2013-03-10 09:02:13.470718625 +0400
@@ -90,3 +90,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"
diff -ru1 misc/ext.d.orig/package.sh misc/ext.d/package.sh
--- misc/ext.d.orig/package.sh 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/package.sh 2013-03-10 09:02:23.630723087 +0400
@@ -53,3 +53,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"
diff -ru1 misc/ext.d.orig/sound.sh misc/ext.d/sound.sh
--- misc/ext.d.orig/sound.sh 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/sound.sh 2013-03-10 09:02:31.222725342 +0400
@@ -86,3 +86,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"
diff -ru1 misc/ext.d.orig/text.sh.in misc/ext.d/text.sh.in
--- misc/ext.d.orig/text.sh.in 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/text.sh.in 2013-03-10 09:02:39.018727707 +0400
@@ -135,3 +135,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}" "${pager}"
diff -ru1 misc/ext.d.orig/video.sh misc/ext.d/video.sh
--- misc/ext.d.orig/video.sh 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/video.sh 2013-03-10 09:02:48.414731630 +0400
@@ -45,3 +45,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"
diff -ru1 misc/ext.d.orig/web.sh.in misc/ext.d/web.sh.in
--- misc/ext.d.orig/web.sh.in 2012-12-27 12:13:20.000000000 +0400
+++ misc/ext.d/web.sh.in 2013-03-10 09:02:56.670734093 +0400
@@ -48,3 +48,3 @@
open)
- "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
+ [ -n "$DISPLAY" ] && "${MC_XDG_OPEN}" "${MC_EXT_FILENAME}" 2>/dev/null || \
do_open_action "${filetype}"

126
mc-extensions.patch
View File

@ -1,126 +0,0 @@
--- misc/mc.ext.in.orig 2012-07-23 14:07:11.000000000 +0200
+++ misc/mc.ext.in 2012-07-23 14:11:39.000000000 +0200
@@ -236,8 +236,9 @@
# deb
regex/\.u?deb$
- Open=%cd %p/deb://
- View=%view{ascii} dpkg-deb -I %f && echo && dpkg-deb -c %f
+ Open=%cd %p/deb://
+ #Open=%cd %p/uar://
+ View=%view{ascii} if type -p dpkg-deb >/dev/null ; then dpkg-deb -I %f && echo && dpkg-deb -c %f ; else file %f && echo && ar tv %f ; fi
# dpkg
shell/.debd
@@ -415,7 +416,8 @@
### 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
+ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Include=audio
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
@@ -425,15 +425,21 @@
Open=vplay -s 22 %f
regex/\.([mM][pP]3)$
- Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
- View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ #Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ #View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
+ Include=audio
+
+regex/\.([mM][kK][aA])$
+ Include=audio
regex/\.([oO][gG][gG|aA|xX])$
- Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ #Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Include=audio
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
+ #Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
+ Include=audio
regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
Open=timidity %f
@@ -442,11 +450,15 @@
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=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
+ Open=mplayer -vo null -playlist %f
### Video ###
@@ -502,14 +514,16 @@
# Postscript
type/^PostScript
- Open=(gv %f >/dev/null 2>&1 &)
+ #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=(xpdf %f >/dev/null 2>&1 &)
#Open=(acroread %f &)
#Open=(ghostview %f &)
+ Open=(xdg-open %f >/dev/null 2>&1 &)
View=%view{ascii} pdftotext %f -
# The following code very ugly and should not be taken as example.
@@ -535,27 +549,33 @@
# 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=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f >/dev/null 2>&1 &)
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=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f >/dev/null 2>&1 &)
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=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (OOo %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f >/dev/null 2>&1 &)
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=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f >/dev/null 2>&1 &)
# 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=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f >/dev/null 2>&1 &)
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=if which gnumeric ; then (gnumeric %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
+ Open=(xdg-open %f >/dev/null 2>&1 &)
View=%view{ascii} xls2csv %f || strings %f
# Framemaker

18
mc-multi-press-f-keys.patch
View File

@ -34,15 +34,15 @@ Index: lib/tty/key.c
if (!mc_global.tty.alternate_plus_minus) if (!mc_global.tty.alternate_plus_minus)
switch (c) switch (c)
{ {
@@ -1724,7 +1737,7 @@ get_key_code (int no_delay) @@ -1928,7 +1928,7 @@ get_key_code (int no_delay)
{ {
/* Convert escape-digits to F-keys */ /* Convert escape-digits to F-keys */
if (g_ascii_isdigit (c)) if (g_ascii_isdigit (c))
- c = KEY_F (c - '0'); - c = KEY_F (c - '0');
+ c = KEY_F_IMMUTABLE (c - '0'); + c = KEY_F_IMMUTABLE (c - '0');
else if (c == ' ') else if (c == ' ')
c = ESC_CHAR; c = ESC_CHAR;
else else
Index: lib/tty/tty-slang.h Index: lib/tty/tty-slang.h
=================================================================== ===================================================================
--- lib/tty/tty-slang.h.orig --- lib/tty/tty-slang.h.orig

38
mc-palmsupport.patch
View File

@ -1,38 +0,0 @@
Index: misc/mc.menu
===================================================================
--- misc/mc.menu.orig 2010-07-05 21:12:51.000000000 +0200
+++ misc/mc.menu 2010-07-06 18:50:29.444518504 +0200
@@ -222,6 +222,33 @@ U Uudecode marked news articles (n
fi
echo "Please test the output file before deleting anything."
++ & t r & ! t t
+m Install as MEMO on palm pilot
+ echo "Installing MEMO..."
+ install-memo %f
+
+=+ f \.pdb$ | f \.prc$ | f \.pqa$ | f \.PDB$ | f \.PRC$ | f \.PQA$ & t r & ! t t
+p Install on palm pilot (programs or databases)
+ echo "Installing file on PALM"
+ pilot-xfer -i %f
+
++ t t
+M Install tagged files as MEMOs on palm pilot
+ for i in %t
+ do
+ echo "Installing MEMO: $i"
+ done
+ install-memo -t %t
+
++ t t
+P Install tagged files on palm pilot (programs or databases)
+ echo "Installing files on PALM"
+ for i in %t
+ do
+ echo "Installing file: $i"
+ done
+ pilot-xfer -i %t
+
=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lzma$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.Z$ | f \.tar\.bz2$ & t r
x Extract the contents of a compressed tar file
unset PRG

12
mc-rpm.patch
View File

@ -18,14 +18,14 @@ Index: src/vfs/extfs/helpers/rpm
echo "$FILEPREF 0 $DATE INFO/EPOCH" echo "$FILEPREF 0 $DATE INFO/EPOCH"
echo "$FILEPREF 0 $DATE INFO/LICENSE" echo "$FILEPREF 0 $DATE INFO/LICENSE"
echo "$FILEPREF 0 $DATE INFO/REQUIRENAME" echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES" + echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS" + echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
echo "$FILEPREF 0 $DATE INFO/OBSOLETES" echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
echo "$FILEPREF 0 $DATE INFO/PROVIDES" echo "$FILEPREF 0 $DATE INFO/PROVIDES"
+ echo "$FILEPREF 0 $DATE INFO/ENHANCES" + echo "$FILEPREF 0 $DATE INFO/ENHANCES"
+ echo "$FILEPREF 0 $DATE INFO/SUGGESTS" + echo "$FILEPREF 0 $DATE INFO/SUGGESTS"
+ echo "$FILEPREF 0 $DATE INFO/RECOMMENDS" + echo "$FILEPREF 0 $DATE INFO/RECOMMENDS"
+ echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS" + echo "$FILEPREF 0 $DATE INFO/SUPPLEMENTS"
echo "$FILEPREF 0 $DATE INFO/CONFLICTS" echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
echo "$FILEPREF 0 $DATE INFO/CHANGELOG" echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
} }

25
mc-word_docs.patch
View File

@ -1,25 +0,0 @@
Index: misc/mc.ext.in
===================================================================
--- misc/mc.ext.in.orig 2010-07-06 18:51:59.439510211 +0200
+++ misc/mc.ext.in 2010-07-06 18:54:56.647019263 +0200
@@ -510,12 +510,17 @@ shell/.abw
Open=if which abiword ; then (abiword %f >/dev/null 2>&1 &); else (ooffice %f >/dev/null 2>&1 &); fi >/dev/null
# Microsoft Word Document
-regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
+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
- View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ 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
- View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
+ 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
+ View=%view{ascii} wvText %f - || strings %f
# RTF document
regex/\.([rR][tT][fF])$

15
mc-x11browser.diff
View File

@ -1,15 +0,0 @@
Index: misc/mc.ext.in
===================================================================
--- misc/mc.ext.in.orig 2010-07-06 18:56:05.000000000 +0200
+++ misc/mc.ext.in 2010-07-06 18:56:56.835018761 +0200
@@ -493,8 +493,8 @@ type/^PDF
# html
regex/\.([hH][tT][mM][lL]?)$
- Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
- View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
+ Open=/usr/share/mc/x11_browser file://%f
+ View=%view{ascii} w3m -dump -T text/html %f;
# StarOffice 5.2
shell/.sdw

38
mc.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Jul 17 10:24:58 UTC 2013 - subchaser1@gmail.com
- Update to new upstream release 4.8.9
* extfs: support unrar-5
* extfs: use xorriso (if exists) for writing into ISO images
* extfs: display additional info while vieweing .iso files
with F3
* mcedit: support unlimited file size
- The changes since 4.8.1.7 are to numerous to list here,
please read the file /usr/share/doc/packages/mc/NEWS for
a complete list
- modify mc-multi-press-f-keys.patch: adopted for changes in
sources
- modify mc-esc-seq.patch: adopted for changes in sources
- modify mc-rpm.patch: adopted for changes in sources
- modify mc-Syntax.cmake.patch: added .cmake file ext for cmake
syntax highlighting
- changes made for ext.d hanlers
* add mc-ext-audio.patch: view action added for all audio files
* add mc-extd-sound.patch: implement old functionality
* add mc-extd-video.patch: implement old functionality
* remove mc-apps-mediainfo.patch: implementation is moved to
mc-extd-sound.patch and mc-extd-video.patch
* add mc-extd-misc.patch: implement old functionality
* remove mc-apps-torrent.patch: moved to mc-extd-misc.patch
* add mc-extd-doc.patch: use elinks only when installed
* remove mc-word_docs.patch: Word docs now handled correctly
using xdg-open utility
* add mc-extd-xdg.patch: use xdg-open in X11 sessions only
* remove mc-apps.patch: re-implemented in patches for ext.d
handlers
* remove mc-extensions.patch: implementations is moved to
sound/video/doc patches for ext.d handlers
* remove mc-x11browser.diff: obsolated, implemented in ext.d/web.sh
- remove mc-palmsupport.patch: Palm Pilot support removed from
system-wide menu file
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 7 06:10:19 UTC 2013 - subchaser1@gmail.com Thu Mar 7 06:10:19 UTC 2013 - subchaser1@gmail.com

66
mc.spec
View File

@ -21,9 +21,9 @@ Summary: Midnight Commander
License: GPL-3.0+ License: GPL-3.0+
Group: Productivity/File utilities Group: Productivity/File utilities
Url: http://www.midnight-commander.org/ Url: http://www.midnight-commander.org/
Version: 4.8.1.7 Version: 4.8.9
Release: 0.0 Release: 0.0
Source: https://www.midnight-commander.org/downloads/mc-%{version}.tar.xz Source: http://ftp.midnight-commander.org/mc-%{version}.tar.xz
Source1: x11_browser Source1: x11_browser
Source2: %{name}.desktop Source2: %{name}.desktop
Source3: %{name}.png Source3: %{name}.png
@ -31,12 +31,12 @@ Source4: cmake.syntax
Source5: mc-rpmlintrc Source5: mc-rpmlintrc
Patch18: mc-Syntax.cmake.patch Patch18: mc-Syntax.cmake.patch
Patch0: mc-fix_lib_search_path.patch Patch0: mc-fix_lib_search_path.patch
Patch6: mc-apps.patch Patch61: mc-extd-misc.patch
Patch61: mc-apps-mediainfo.patch Patch62: mc-extd-video.patch
Patch62: mc-apps-torrent.patch Patch63: mc-extd-doc.patch
Patch7: mc-palmsupport.patch Patch64: mc-extd-sound.patch
Patch8: mc-word_docs.patch Patch69: mc-extd-xdg.patch
Patch9: mc-x11browser.diff Patch71: mc-ext-audio.patch
Patch12: mc-wrapper.patch Patch12: mc-wrapper.patch
Patch16: mc-esc-seq.patch Patch16: mc-esc-seq.patch
Patch17: mc-rpm.patch Patch17: mc-rpm.patch
@ -50,7 +50,6 @@ Patch32: 20_wrong_path_to_wrappers.patch
# PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation. # PATCH-FIX-UPSTREAM mc-multi-press-f-keys.patch mc287 sbrabec@suse.cz - Fixed Esc + Numeral F-key emulation.
Patch41: mc-multi-press-f-keys.patch Patch41: mc-multi-press-f-keys.patch
# Patches from Fedora # Patches from Fedora
Patch50: mc-extensions.patch
#Patch adding -fpie and -pie to compilation and linking of setuid binaries #Patch adding -fpie and -pie to compilation and linking of setuid binaries
Patch52: mc-pie.patch Patch52: mc-pie.patch
@ -105,12 +104,12 @@ target directory.
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch6
%patch61 %patch61
%patch62 %patch62
%patch7 %patch63
%patch8 %patch64
%patch9 %patch69
%patch71
%patch12 %patch12
%patch16 %patch16
%patch17 %patch17
@ -121,13 +120,15 @@ target directory.
%patch31 %patch31
%patch32 %patch32
%patch41 %patch41
%patch50
%patch52 -p1 %patch52 -p1
%build %build
autoreconf --force --install autoreconf --force --install
%define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter %define warn_flags -W -Wall -Wstrict-prototypes -Wpointer-arith -Wformat-security -Wno-unused-parameter
export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}" export CFLAGS="$RPM_OPT_FLAGS %{warn_flags}"
export X11_WWW="%{_datadir}/mc/x11_browser"
%configure \ %configure \
--localstatedir=/var/lib \ --localstatedir=/var/lib \
--enable-charset \ --enable-charset \
@ -151,7 +152,9 @@ install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%suse_update_desktop_file -i %name System FileManager %suse_update_desktop_file -i %name System FileManager
# Remove not supported language # Remove not supported language
rm -rf %{buildroot}%{_datadir}/locale/be@tarask rm -rf %{buildroot}%{_datadir}/locale/be@tarask
%{find_lang} %{name}
%find_lang %name
%fdupes -s %{buildroot}%{_prefix} %fdupes -s %{buildroot}%{_prefix}
%clean %clean
@ -168,20 +171,21 @@ rm -rf %{buildroot}
%doc ABOUT-NLS COPYING NEWS README %doc ABOUT-NLS COPYING NEWS README
%config %{_sysconfdir}/profile.d/* %config %{_sysconfdir}/profile.d/*
%{_bindir}/mc* %{_bindir}/mc*
%dir %{_sysconfdir}/mc %dir %{_sysconfdir}/mc/
%config %{_sysconfdir}/mc/filehighlight.ini %config %{_sysconfdir}/mc/filehighlight.ini
%config %{_sysconfdir}/mc/sfs.ini %config %{_sysconfdir}/mc/sfs.ini
%config %{_sysconfdir}/mc/mc.menu %config %{_sysconfdir}/mc/mc.menu
%config %{_sysconfdir}/mc/mc.ext %config %{_sysconfdir}/mc/mc.ext
%config %{_sysconfdir}/mc/mc.keymap.emacs ###config #{_sysconfdir}/mc/edit.spell.rc
%config %{_sysconfdir}/mc/edit.spell.rc
%config %{_sysconfdir}/mc/mcedit.menu %config %{_sysconfdir}/mc/mcedit.menu
%config %{_sysconfdir}/mc/mc.keymap.default
%config %{_sysconfdir}/mc/mc.keymap %config %{_sysconfdir}/mc/mc.keymap
%config %{_sysconfdir}/mc/mc.default.keymap
%config %{_sysconfdir}/mc/mc.emacs.keymap
%config %{_sysconfdir}/mc/edit.indent.rc %config %{_sysconfdir}/mc/edit.indent.rc
%dir %{_libexecdir}/mc #(!)dir #{_libexecdir}/mc
%verify(not mode) %{_libexecdir}/mc/cons.saver %verify(not mode) %{_libexecdir}/mc/cons.saver
%{_mandir}/man1/* %{_mandir}/man1/*
%exclude %{_mandir}/*/man1/*
%{_datadir}/mc %{_datadir}/mc
%{_datadir}/mc/syntax/Syntax %{_datadir}/mc/syntax/Syntax
%{_datadir}/mc/mc.charsets %{_datadir}/mc/mc.charsets
@ -192,18 +196,26 @@ rm -rf %{buildroot}
%{_datadir}/mc/help/mc.hlp %{_datadir}/mc/help/mc.hlp
%exclude %{_datadir}/mc/help/mc.hlp.* %exclude %{_datadir}/mc/help/mc.hlp.*
%exclude %{_sysconfdir}/mc/mc.menu.* %exclude %{_sysconfdir}/mc/mc.menu.*
%exclude %{_datadir}/locale/*/LC_MESSAGES/mc.mo
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png %{_datadir}/pixmaps/%{name}.png
%exclude %{_sysconfdir}/mc/mc.menu.* %exclude %{_sysconfdir}/mc/mc.menu.*
%files lang -f %{name}.lang %files lang -f %name.lang
%defattr(-, root, root) %defattr(-, root, root)
%lang(es) %doc %{_mandir}/es %lang(hu) %dir %{_mandir}/hu/
%lang(hu) %doc %{_mandir}/hu %lang(hu) %dir %{_mandir}/hu/man1/
%lang(it) %doc %{_mandir}/it %lang(hu) %{_mandir}/hu/man1/mc.1.gz
%lang(pl) %doc %{_mandir}/pl
%lang(ru) %doc %{_mandir}/ru %lang(pl) %dir %{_mandir}/pl/
%lang(sr) %doc %{_mandir}/sr %lang(pl) %dir %{_mandir}/pl/man1/
%lang(pl) %{_mandir}/pl/man1/mc.1.gz
%lang(sr) %dir %{_mandir}/sr/
%lang(sr) %dir %{_mandir}/sr/man1/
%lang(sr) %{_mandir}/sr/man1/mc.1.gz
%lang(cs) %doc %{_datadir}/mc/*/mc.*.cs %lang(cs) %doc %{_datadir}/mc/*/mc.*.cs
%lang(es) %doc %{_datadir}/mc/*/mc.*.es %lang(es) %doc %{_datadir}/mc/*/mc.*.es
%lang(hu) %doc %{_datadir}/mc/*/mc.*.hu %lang(hu) %doc %{_datadir}/mc/*/mc.*.hu