diff options
| -rw-r--r-- | libre/mc-libre/PKGBUILD | 20 | ||||
| -rw-r--r-- | libre/mc-libre/libre.patch | 319 |
2 files changed, 334 insertions, 5 deletions
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index c9f3d03dd..2da038816 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -7,9 +7,9 @@ _pkgname=mc pkgname=mc-libre pkgver=4.8.12 -pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar recommendation removed" -arch=('i686' 'x86_64') +pkgrel=1.1 +pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar support removed" +arch=('i686' 'x86_64' 'mips64el') url="http://www.ibiblio.org/mc/" license=('GPL') depends=( @@ -45,7 +45,16 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/mc.keymap' 'etc/mc/mc.menu' 'etc/mc/sfs.ini') -source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") +source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2" + 'libre.patch') + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + patch -Np1 -i ../libre.patch + rm -v src/vfs/extfs/helpers/u{ace,rar}.in +} + build() { cd "${srcdir}/${_pkgname}-${pkgver}" @@ -69,4 +78,5 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('a64c426364bfaee56b628f6c0738aade') +md5sums=('a64c426364bfaee56b628f6c0738aade' + '008b3132beba7061578a6a59885f93f8') diff --git a/libre/mc-libre/libre.patch b/libre/mc-libre/libre.patch new file mode 100644 index 000000000..df88e6c9f --- /dev/null +++ b/libre/mc-libre/libre.patch @@ -0,0 +1,319 @@ +diff --git a/configure b/configure +index 01e8c83..710d411 100755 +--- a/configure ++++ b/configure +@@ -27316,7 +27316,7 @@ _ACEOF + 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/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/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/uc1541 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 intl/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/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/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/uc1541 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 intl/Makefile po/Makefile.in" + + + if test x$enable_tests != xno; then +@@ -28576,7 +28576,6 @@ do + "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" ;; +@@ -28586,7 +28585,6 @@ do + "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" ;; +diff --git a/configure.ac b/configure.ac +index 6591c53..8ac2163 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -547,7 +547,6 @@ 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 +@@ -557,7 +556,6 @@ 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 + +diff --git a/misc/ext.d/archive.sh b/misc/ext.d/archive.sh +index 2264b12..39885ae 100755 +--- a/misc/ext.d/archive.sh ++++ b/misc/ext.d/archive.sh +@@ -61,8 +61,7 @@ do_view_action() { + lha l "${MC_EXT_FILENAME}" + ;; + arj) +- arj l "${MC_EXT_FILENAME}" 2>/dev/null || \ +- unarj l "${MC_EXT_FILENAME}" ++ arj l "${MC_EXT_FILENAME}" 2>/dev/null + ;; + cab) + cabextract -l "${MC_EXT_FILENAME}" +@@ -70,10 +69,6 @@ do_view_action() { + ha) + ha lf "${MC_EXT_FILENAME}" + ;; +- rar) +- rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null || \ +- unrar v -c- "${MC_EXT_FILENAME}" +- ;; + alz) + unalz -l "${MC_EXT_FILENAME}" + ;; +@@ -93,9 +88,6 @@ do_view_action() { + 7z l "${MC_EXT_FILENAME}" + + ;; +- ace) +- unace l "${MC_EXT_FILENAME}" +- ;; + arc) + arc l "${MC_EXT_FILENAME}" + ;; +diff --git a/misc/filehighlight.ini b/misc/filehighlight.ini +index 8bc1722..430bebb 100644 +--- a/misc/filehighlight.ini ++++ b/misc/filehighlight.ini +@@ -28,7 +28,7 @@ + regexp=(^#.*|.*~$) + + [archive] +- extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z;ace ++ extensions=gz;bz2;tar;tgz;rpm;Z;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z + + [doc] + extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm;docx;docm;xlsx;xlsm;pptx;pptm +diff --git a/misc/mc.ext.in b/misc/mc.ext.in +index 68c6819..aefb267 100644 +--- a/misc/mc.ext.in ++++ b/misc/mc.ext.in +@@ -175,11 +175,6 @@ shell/i/.ha + 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 +- + # ALZip + shell/i/.alz + Open=%cd %p/ualz:// +@@ -667,12 +662,6 @@ shell/i/.torrent + + ### Plain compressed files ### + +-# ace +-shell/i/.ace +- Open=%cd %p/uace:// +- View=%view{ascii} @EXTHELPERSDIR@/archive.sh view ace +- Extract=unace x %f +- + # arc + shell/i/.arc + Open=%cd %p/uarc:// +diff --git a/misc/syntax/php.syntax b/misc/syntax/php.syntax +index ebefb7e..7a4ec29 100644 +--- a/misc/syntax/php.syntax ++++ b/misc/syntax/php.syntax +@@ -2174,22 +2174,6 @@ context default + # Radius constants + keyword whole RADIUS\_\[0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_\] white + +-# Rar Functions +- keyword whole rar_close yellow +- keyword whole rar_entry_get yellow +- keyword whole rar_list yellow +- keyword whole rar_open yellow +- +-# Rar Functions Rar methods +- keyword whole Rar yellow +- +-# Rar Functions constants +- keyword whole RAR_HOST_BEOS white +- keyword whole RAR_HOST_MSDOS white +- keyword whole RAR_HOST_OS2 white +- keyword whole RAR_HOST_UNIX white +- keyword whole RAR_HOST_WIN32 white +- + # GNU Readline + keyword whole readline\[0123456789_abcdefghijklmnopqrstuvwxyz\] yellow + +diff --git a/misc/syntax/sh.syntax b/misc/syntax/sh.syntax +index f5537df..e3b3017 100644 +--- a/misc/syntax/sh.syntax ++++ b/misc/syntax/sh.syntax +@@ -610,7 +610,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ + keyword whole pwunconv cyan + keyword whole ramsize cyan + keyword whole ranlib cyan +- keyword whole rar cyan + keyword whole rarp cyan + keyword whole raw cyan + keyword whole rbash cyan +@@ -782,7 +781,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ + keyword whole ul cyan + keyword whole umount cyan + keyword whole uname cyan +- keyword whole unarj cyan + keyword whole uncompress cyan + keyword whole unexpand cyan + keyword whole unicode_start cyan +@@ -1712,7 +1710,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ + keyword whole pwunconv cyan + keyword whole ramsize cyan + keyword whole ranlib cyan +- keyword whole rar cyan + keyword whole rarp cyan + keyword whole raw cyan + keyword whole rbash cyan +@@ -1884,7 +1881,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ + keyword whole ul cyan + keyword whole umount cyan + keyword whole uname cyan +- keyword whole unarj cyan + keyword whole uncompress cyan + keyword whole unexpand cyan + keyword whole unicode_start cyan +diff --git a/src/vfs/extfs/helpers/Makefile.am b/src/vfs/extfs/helpers/Makefile.am +index 06ea789..099acf1 100644 +--- a/src/vfs/extfs/helpers/Makefile.am ++++ b/src/vfs/extfs/helpers/Makefile.am +@@ -24,7 +24,6 @@ EXTFS_IN = \ + patchfs.in \ + rpms+.in \ + s3+.in \ +- uace.in \ + ualz.in \ + uar.in \ + uarc.in \ +@@ -34,7 +33,6 @@ EXTFS_IN = \ + uha.in \ + ulha.in \ + ulib.in \ +- urar.in \ + uzip.in \ + uzoo.in + +@@ -54,7 +52,6 @@ EXTFS_OUT = \ + patchfs \ + rpms+ \ + s3+ \ +- uace \ + ualz \ + uar \ + uarc \ +@@ -64,7 +61,6 @@ EXTFS_OUT = \ + uha \ + ulha \ + ulib \ +- urar \ + uzip \ + uzoo + +diff --git a/src/vfs/extfs/helpers/Makefile.in b/src/vfs/extfs/helpers/Makefile.in +index b5f4864..d166e55 100644 +--- a/src/vfs/extfs/helpers/Makefile.in ++++ b/src/vfs/extfs/helpers/Makefile.in +@@ -86,10 +86,10 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/deba.in $(srcdir)/debd.in $(srcdir)/dpkg+.in \ + $(srcdir)/iso9660.in $(srcdir)/hp48+.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)/uc1541.in $(srcdir)/ucab.in $(srcdir)/uha.in \ +- $(srcdir)/ulha.in $(srcdir)/ulib.in $(srcdir)/urar.in \ ++ $(srcdir)/ulha.in $(srcdir)/ulib.in \ + $(srcdir)/uzip.in $(srcdir)/uzoo.in README + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ +@@ -149,8 +149,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs + 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 uc1541 \ +- ucab uha ulha ulib urar uzip uzoo ++ lslR mailfs patchfs rpms+ s3+ ualz uar uarc uarj uc1541 \ ++ 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 \ +@@ -439,7 +439,6 @@ EXTFS_IN = \ + patchfs.in \ + rpms+.in \ + s3+.in \ +- uace.in \ + ualz.in \ + uar.in \ + uarc.in \ +@@ -449,7 +448,6 @@ EXTFS_IN = \ + uha.in \ + ulha.in \ + ulib.in \ +- urar.in \ + uzip.in \ + uzoo.in + +@@ -470,7 +468,6 @@ EXTFS_OUT = \ + patchfs \ + rpms+ \ + s3+ \ +- uace \ + ualz \ + uar \ + uarc \ +@@ -480,7 +477,6 @@ EXTFS_OUT = \ + uha \ + ulha \ + ulib \ +- urar \ + uzip \ + uzoo + +@@ -550,8 +546,6 @@ rpms+: $(top_builddir)/config.status $(srcdir)/rpms+.in + 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 +@@ -570,8 +564,6 @@ ulha: $(top_builddir)/config.status $(srcdir)/ulha.in + 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 +diff --git a/src/vfs/extfs/helpers/uarj.in b/src/vfs/extfs/helpers/uarj.in +index 15549a0..7dffc37 100644 +--- a/src/vfs/extfs/helpers/uarj.in ++++ b/src/vfs/extfs/helpers/uarj.in +@@ -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/ |