From 2469b3ce1b82a1fe2e37bb6aae98e69e96abac2e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 3 Dec 2013 17:26:20 -0200 Subject: mc-libre-4.8.11-1: updating version, remove unar support due it doesn't works on this package at the moment --- libre/mc-libre/PKGBUILD | 34 ++++---------------- libre/mc-libre/fs36962.diff | 77 --------------------------------------------- libre/mc-libre/unar.in | 64 ------------------------------------- 3 files changed, 6 insertions(+), 169 deletions(-) delete mode 100644 libre/mc-libre/fs36962.diff delete mode 100644 libre/mc-libre/unar.in diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index ea1a990f6..8b555654e 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $ +# $Id: PKGBUILD 101948 2013-12-02 21:12:10Z schuay $ # Contributor: Daniel J Griffiths # Maintainer: schuay # Maintainer (Parabola): André Silva @@ -6,9 +6,9 @@ _pkgname=mc pkgname=mc-libre -pkgver=4.8.10 -pkgrel=2.1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar support and arj recommendation included and nonfree unace recommendation removed" +pkgver=4.8.11 +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') url="http://www.ibiblio.org/mc/" license=('GPL') @@ -32,7 +32,6 @@ optdepends=( 'python2-pytz: s3+ extfs' 'smb: VFS support' 'arj: uarj extfs' - 'unar: urar extfs' 'zip: uzip extfs' 'p7zip: support for 7zip archives') conflicts=('mc') @@ -46,30 +45,11 @@ 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" - "fs36962.diff" - "unar.in") - -prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - ## add unar support removing nonfree urar on the source - rm -v src/vfs/extfs/helpers/urar.in - install -m644 $srcdir/unar.in src/vfs/extfs/helpers - sed -i '\|rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null|d - s| unrar v -c-|unar| - ' misc/ext.d/archive.sh - sed -i 's|urar.in|unar.in|g' $(grep -rlI 'urar.in') - sed -i '\|src/vfs/extfs/helpers/urar| s|urar|unar|g - ' configure{,.ac} - sed -i 's|urar|unar|g' src/vfs/extfs/helpers/Makefile.{am,in} -} +source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") build() { cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 < "${srcdir}/fs36962.diff" - ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \ --with-x --libexecdir=/usr/lib @@ -89,6 +69,4 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('eb4bdc23abd4fdfa14911d53d65c8186' - '7f7cf5388a5390c2ed49965492f490aa' - 'f549a6c13ac0c3052986fcdc945648a9') +md5sums=('7262788c0e799393cd37318b43a14adc') diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff deleted file mode 100644 index 0db5ed42b..000000000 --- a/libre/mc-libre/fs36962.diff +++ /dev/null @@ -1,77 +0,0 @@ -diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c ---- mc-4.8.10-orig/src/filemanager/file.c 2013-08-02 22:02:40.000000000 +0400 -+++ mc-4.8.10/src/filemanager/file.c 2013-09-17 09:59:30.699635407 +0400 -@@ -1272,8 +1272,8 @@ - - /** Initialize variables for progress bars */ - static FileProgressStatus --panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source, -- FileOpContext * ctx, filegui_dialog_type_t dialog_type) -+panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx, -+ filegui_dialog_type_t dialog_type) - { - FileProgressStatus status; - -@@ -1282,7 +1282,7 @@ - return FILE_CONT; - #endif - -- if (operation != OP_MOVE && verbose && file_op_compute_totals) -+ if (verbose && file_op_compute_totals) - { - ComputeDirSizeUI *ui; - -@@ -2378,13 +2378,6 @@ - mc_refresh (); - if (ctx->erase_at_end) - { -- /* remove files after move */ -- if (erase_list != NULL) -- { -- file_op_context_destroy_ui (ctx); -- file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM); -- } -- - while (erase_list != NULL && return_status != FILE_ABORT) - { - struct link *lp = (struct link *) erase_list->data; -@@ -2792,14 +2785,12 @@ - { - if (operation == OP_DELETE) - dialog_type = FILEGUI_DIALOG_DELETE_ITEM; -+ else if (single_entry && S_ISDIR (selection (panel)->st.st_mode)) -+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; -+ else if (single_entry || force_single) -+ dialog_type = FILEGUI_DIALOG_ONE_ITEM; - else -- { -- dialog_type = ((operation != OP_COPY) || single_entry || force_single) -- ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM; -- -- if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode)) -- dialog_type = FILEGUI_DIALOG_MULTI_ITEM; -- } -+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; - } - - /* Initialize things */ -@@ -2844,8 +2835,8 @@ - else - source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL); - #endif /* WITH_FULL_PATHS */ -- if (panel_operate_init_totals -- (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT) -+ if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) -+ == FILE_CONT) - { - if (operation == OP_DELETE) - { -@@ -2936,7 +2927,7 @@ - goto clean_up; - } - -- if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT) -+ if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT) - { - /* Loop for every file, perform the actual copy operation */ - for (i = 0; i < panel->count; i++) diff --git a/libre/mc-libre/unar.in b/libre/mc-libre/unar.in deleted file mode 100644 index 3ba37b019..000000000 --- a/libre/mc-libre/unar.in +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh - -UNAR=`which unar 2>/dev/null` - -# Define $UNAR version -UNAR_VERSION=`$UNAR -v` - -mcunar4fs_list () -{ - $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' -BEGIN { flag=0 } -/^-------/ { flag++; if (flag > 1) exit 0; next } -flag==1 { - str = substr($0, 2) - getline - split($4, a, "-") - if (index($6, "D") != 0) - $6="drwxr-xr-x" - else - if (index($6, ".") != 0) - $6="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str -}' -} - -mcunarfs_list () -{ - $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` ' -BEGIN { flag=0 } -/^-----------/ { flag++; if (flag > 1) exit 0; next } -flag==1 { - split($5, a, "-") - if (index($1, "D") != 0) - $1="drwxr-xr-x" - else - if (index($1, ".") != 0) - $1="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8 -}' -} - -mcunarfs_list () -{ - mcunarfs_list "$@" -} - -mcunarfs_copyout () -{ - $UNAR -q "$1" "$2" > "$3" -} - -umask 077 - -cmd="$1" -shift - -case "$cmd" in - # Workaround for a bug in mc - directories must precede files to - # avoid duplicate entries, so we sort output by filenames - list) mcunarfs_list "$@" | sort -k 8 ;; - copyout) mcunarfs_copyout "$@" ;; - *) exit 1 ;; -esac -exit 0 -- cgit v1.2.3-54-g00ecf