diff options
Diffstat (limited to 'libre/mc/libre.patch')
| -rw-r--r-- | libre/mc/libre.patch | 234 |
1 files changed, 58 insertions, 176 deletions
diff --git a/libre/mc/libre.patch b/libre/mc/libre.patch index 5fdc85fd4..ab911b1c9 100644 --- a/libre/mc/libre.patch +++ b/libre/mc/libre.patch @@ -1,33 +1,6 @@ ---- mc-4.8.24.orig/configure 2020-01-18 16:43:02.000000000 -0500 -+++ mc-4.8.24/configure 2020-04-11 01:02:50.107213882 -0500 -@@ -27064,7 +27064,7 @@ - ac_config_files="$ac_config_files src/man2hlp/man2hlp" - - --ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in" -+ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in" - - - ac_config_files="$ac_config_files tests/Makefile tests/lib/Makefile tests/lib/mcconfig/Makefile tests/lib/search/Makefile tests/lib/strutil/Makefile tests/lib/vfs/Makefile tests/lib/widget/Makefile tests/src/Makefile tests/src/filemanager/Makefile tests/src/editor/Makefile tests/src/editor/test-data.txt tests/src/vfs/Makefile tests/src/vfs/extfs/Makefile tests/src/vfs/extfs/helpers-list/Makefile tests/src/vfs/extfs/helpers-list/data/config.sh tests/src/vfs/extfs/helpers-list/misc/Makefile" -@@ -28332,7 +28332,6 @@ - "src/vfs/extfs/helpers/patchfs") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/patchfs" ;; - "src/vfs/extfs/helpers/rpms+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/rpms+" ;; - "src/vfs/extfs/helpers/s3+") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/s3+" ;; -- "src/vfs/extfs/helpers/uace") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uace" ;; - "src/vfs/extfs/helpers/ualz") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ualz" ;; - "src/vfs/extfs/helpers/uar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uar" ;; - "src/vfs/extfs/helpers/uarc") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uarc" ;; -@@ -28341,7 +28340,6 @@ - "src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;; - "src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;; - "src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;; -- "src/vfs/extfs/helpers/urar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/urar" ;; - "src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;; - "src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;; - "src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;; ---- mc-4.8.24.orig/configure.ac 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/configure.ac 2020-04-11 01:04:19.637212947 -0500 -@@ -615,7 +615,6 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -616,7 +616,6 @@ src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ @@ -35,27 +8,25 @@ src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc -@@ -624,7 +623,6 @@ - src/vfs/extfs/helpers/uha +@@ -626,7 +625,6 @@ src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib + src/vfs/extfs/helpers/unar -src/vfs/extfs/helpers/urar + src/vfs/extfs/helpers/uwim src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo - ---- mc-4.8.24.orig/misc/ext.d/archive.sh 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/misc/ext.d/archive.sh 2020-04-11 01:05:50.017212003 -0500 -@@ -82,8 +82,7 @@ - lha l "${MC_EXT_FILENAME}" +--- a/misc/ext.d/archive.sh ++++ b/misc/ext.d/archive.sh +@@ -85,7 +85,6 @@ ;; arj) -- arj l "${MC_EXT_FILENAME}" 2>/dev/null || \ -- unarj l "${MC_EXT_FILENAME}" -+ arj l "${MC_EXT_FILENAME}" 2>/dev/null + arj l "${MC_EXT_FILENAME}" 2>/dev/null || \ +- unarj l "${MC_EXT_FILENAME}" 2>/dev/null || \ + 7za l "${MC_EXT_FILENAME}" 2>/dev/null ;; cab) - cabextract -l "${MC_EXT_FILENAME}" -@@ -91,10 +90,6 @@ +@@ -95,10 +94,6 @@ ha) ha lf "${MC_EXT_FILENAME}" ;; @@ -66,7 +37,7 @@ alz) unalz -l "${MC_EXT_FILENAME}" ;; -@@ -126,9 +121,6 @@ +@@ -130,9 +125,6 @@ 7z l "${MC_EXT_FILENAME}" ;; @@ -76,46 +47,47 @@ arc) arc l "${MC_EXT_FILENAME}" ;; ---- mc-4.8.24.orig/misc/filehighlight.ini 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/misc/filehighlight.ini 2020-04-11 01:07:34.567210912 -0500 +--- a/misc/filehighlight.ini ++++ b/misc/filehighlight.ini @@ -28,7 +28,7 @@ regexp=(^#.*|.*~$) [archive] -- extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;deb;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;xz;zip;zoo;zst -+ extensions=7z;Z;apk;arc;arj;ark;bz2;cab;deb;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;xz;zip;zoo;zst +- extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;vsix;xz;zip;zoo;zst ++ extensions=7z;Z;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;vsix;xz;zip;zoo;zst [doc] - extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt ---- mc-4.8.24.orig/misc/mc.ext.in 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/misc/mc.ext.in 2020-04-11 01:09:41.727209584 -0500 -@@ -191,11 +191,6 @@ - Open=%cd %p/uha:// - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha - --# rar --regex/i/\.r(ar|[0-9][0-9])$ -- Open=%cd %p/urar:// -- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view rar + extensions=chm;css;ctl;diz;doc;docm;docx;dtd;fodg;fodp;fods;fodt;htm;html;letter;lsm;mail;man;me;msg;nroff;odg;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt +--- a/misc/mc.ext.ini.in ++++ b/misc/mc.ext.ini.in +@@ -286,12 +286,6 @@ + Open=%cd %p/uha:// + View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ha + +-[rar] +-Regex=\.r(ar|[0-9][0-9])$ +-RegexIgnoreCase=true +-Open=%cd %p/urar:// +-View=%view{ascii} @EXTHELPERSDIR@/archive.sh view rar - # ALZip - shell/i/.alz - Open=%cd %p/ualz:// -@@ -723,12 +718,6 @@ + [alz] + Shell=.alz +@@ -844,12 +838,6 @@ ### Plain compressed files ### --# ace --shell/i/.ace -- Open=%cd %p/uace:// -- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ace -- Extract=unace x %f +-[ace] +-Shell=.ace +-ShellIgnoreCase=true +-Open=%cd %p/uace:// +-View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ace - - # arc - shell/i/.arc - Open=%cd %p/uarc:// ---- mc-4.8.24.orig/misc/syntax/php.syntax 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/misc/syntax/php.syntax 2020-04-11 01:10:58.417208783 -0500 + [arc] + Shell=.arc + ShellIgnoreCase=true +--- a/misc/syntax/php.syntax ++++ b/misc/syntax/php.syntax @@ -2178,22 +2178,6 @@ # Radius constants keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white @@ -139,9 +111,9 @@ # GNU Readline keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow ---- mc-4.8.24.orig/misc/syntax/sh.syntax 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/misc/syntax/sh.syntax 2020-04-11 01:12:11.577208020 -0500 -@@ -610,7 +610,6 @@ +--- a/misc/syntax/sh.syntax ++++ b/misc/syntax/sh.syntax +@@ -613,7 +613,6 @@ keyword whole pwunconv cyan keyword whole ramsize cyan keyword whole ranlib cyan @@ -149,7 +121,7 @@ keyword whole rarp cyan keyword whole raw cyan keyword whole rbash cyan -@@ -782,7 +781,6 @@ +@@ -785,7 +784,6 @@ keyword whole ul cyan keyword whole umount cyan keyword whole uname cyan @@ -157,7 +129,7 @@ keyword whole uncompress cyan keyword whole unexpand cyan keyword whole unicode_start cyan -@@ -1714,7 +1712,6 @@ +@@ -1717,7 +1715,6 @@ keyword whole pwunconv cyan keyword whole ramsize cyan keyword whole ranlib cyan @@ -165,7 +137,7 @@ keyword whole rarp cyan keyword whole raw cyan keyword whole rbash cyan -@@ -1886,7 +1883,6 @@ +@@ -1889,7 +1886,6 @@ keyword whole ul cyan keyword whole umount cyan keyword whole uname cyan @@ -173,8 +145,8 @@ keyword whole uncompress cyan keyword whole unexpand cyan keyword whole unicode_start cyan ---- mc-4.8.24.orig/src/vfs/extfs/helpers/Makefile.am 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/src/vfs/extfs/helpers/Makefile.am 2020-04-11 01:13:34.177207157 -0500 +--- a/src/vfs/extfs/helpers/Makefile.am ++++ b/src/vfs/extfs/helpers/Makefile.am @@ -22,7 +22,6 @@ patchfs.in \ rpms+.in \ @@ -183,73 +155,15 @@ ualz.in \ uar.in \ uarc.in \ -@@ -31,7 +30,6 @@ - uha.in \ - ulha.in \ - ulib.in \ -- urar.in \ - uzip.in \ - uzoo.in - -@@ -51,7 +49,6 @@ - patchfs \ - rpms+ \ - s3+ \ -- uace \ - ualz \ - uar \ - uarc \ -@@ -60,7 +57,6 @@ - uha \ - ulha \ - ulib \ -- urar \ - uzip \ - uzoo - ---- mc-4.8.24.orig/src/vfs/extfs/helpers/Makefile.in 2020-01-18 16:43:04.000000000 -0500 -+++ mc-4.8.24/src/vfs/extfs/helpers/Makefile.in 2020-04-11 01:17:03.527204972 -0500 -@@ -145,8 +145,8 @@ - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \ -- lslR mailfs patchfs rpms+ s3+ uace ualz uar uarc uarj ucab uha \ -- ulha ulib urar uzip uzoo -+ lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj ucab uha \ -+ ulha ulib uzip uzoo - CONFIG_CLEAN_VPATH_FILES = - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ -@@ -203,10 +203,10 @@ - $(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \ - $(srcdir)/hp48+.in $(srcdir)/iso9660.in $(srcdir)/lslR.in \ - $(srcdir)/mailfs.in $(srcdir)/patchfs.in $(srcdir)/rpms+.in \ -- $(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \ -+ $(srcdir)/s3+.in $(srcdir)/ualz.in \ - $(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \ - $(srcdir)/ucab.in $(srcdir)/uha.in $(srcdir)/ulha.in \ -- $(srcdir)/ulib.in $(srcdir)/urar.in $(srcdir)/uzip.in \ -+ $(srcdir)/ulib.in $(srcdir)/uzip.in \ - $(srcdir)/uzoo.in README - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ -@@ -433,7 +433,6 @@ - patchfs.in \ - rpms+.in \ - s3+.in \ -- uace.in \ - ualz.in \ - uar.in \ - uarc.in \ -@@ -442,7 +441,6 @@ - uha.in \ +@@ -32,7 +31,6 @@ ulha.in \ ulib.in \ + unar.in \ - urar.in \ + uwim.in \ uzip.in \ uzoo.in - -@@ -463,7 +461,6 @@ +@@ -53,7 +51,6 @@ patchfs \ rpms+ \ s3+ \ @@ -257,43 +171,11 @@ ualz \ uar \ uarc \ -@@ -472,7 +469,6 @@ - uha \ +@@ -63,7 +60,6 @@ ulha \ ulib \ + unar \ - urar \ + uwim \ uzip \ uzoo - -@@ -539,8 +535,6 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - s3+: $(top_builddir)/config.status $(srcdir)/s3+.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --uace: $(top_builddir)/config.status $(srcdir)/uace.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - ualz: $(top_builddir)/config.status $(srcdir)/ualz.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - uar: $(top_builddir)/config.status $(srcdir)/uar.in -@@ -557,8 +551,6 @@ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - ulib: $(top_builddir)/config.status $(srcdir)/ulib.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ --urar: $(top_builddir)/config.status $(srcdir)/urar.in -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - uzip: $(top_builddir)/config.status $(srcdir)/uzip.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in ---- mc-4.8.24.orig/src/vfs/extfs/helpers/uarj.in 2020-01-01 10:52:34.000000000 -0500 -+++ mc-4.8.24/src/vfs/extfs/helpers/uarj.in 2020-04-11 01:18:24.717204124 -0500 -@@ -3,9 +3,8 @@ - # Written by Viatcheslav Odintsov (2:5020/181) - # (C) 2002 ARJ Software Russia. - # --# This is an updated parser for ARJ archives in Midnight Commander. You need --# full ARJ rather than UNARJ. Open-source ARJ v 3.10 for Unix platforms can --# be obtained here: -+# This is an updated parser for ARJ archives in Midnight Commander. -+# Open-source ARJ v 3.10 for Unix platforms can be obtained here: - # - # - http://www.sourceforge.net/projects/arj/ - # - http://arj.sourceforge.net/ |