diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-01 00:01:20 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-01 00:01:20 +0000 |
| commit | 752015395fc8b95cc4a86b68189cb747fe9a8499 (patch) | |
| tree | 3e64f1f739447b52eab8498bf13bcbc9410cde8e /community/mc | |
| parent | b7cd4b184f75d3d2b54b356e08f296df3a9afb38 (diff) | |
Tue May 1 00:01:20 UTC 2012
Diffstat (limited to 'community/mc')
| -rw-r--r-- | community/mc/PKGBUILD | 15 | ||||
| -rw-r--r-- | community/mc/changeset_8607bcc1.diff | 22 |
2 files changed, 33 insertions, 4 deletions
diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index bd44690c8..9eea0ebcf 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69681 2012-04-22 13:52:54Z schuay $ +# $Id: PKGBUILD 70092 2012-04-29 08:10:26Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc pkgver=4.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" @@ -26,7 +26,8 @@ optdepends=('p7zip: support for 7zip archives' 'unrar: urar extfs' 'zip: uzip extfs') options=('!emptydirs' '!makeflags') -source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") +source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2" + 'changeset_8607bcc1.diff') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -39,6 +40,9 @@ build() { --without-debug --without-gnome --without-included-gettext \ --libexecdir=/usr/lib + # see FS#29562 + patch -Np0 < ${srcdir}/changeset_8607bcc1.diff + make } @@ -55,4 +59,7 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('12d38ad4969df3f8bbf66c3967a191ee') + + +md5sums=('12d38ad4969df3f8bbf66c3967a191ee' + '998b44a100a671085526a7723bb72092') diff --git a/community/mc/changeset_8607bcc1.diff b/community/mc/changeset_8607bcc1.diff new file mode 100644 index 000000000..071d6159e --- /dev/null +++ b/community/mc/changeset_8607bcc1.diff @@ -0,0 +1,22 @@ +Index: src/vfs/cpio/cpio.c
+===================================================================
+--- src/vfs/cpio/cpio.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
++++ src/vfs/cpio/cpio.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
+@@ -250,5 +250,5 @@
+ mc_close (fd);
+ s = g_strconcat (super->name, decompress_extension (type), (char *) NULL);
+- tmp_vpath = vfs_path_from_str (s);
++ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
+ fd = mc_open (tmp_vpath, O_RDONLY);
+ vfs_path_free (tmp_vpath);
+Index: src/vfs/tar/tar.c
+===================================================================
+--- src/vfs/tar/tar.c (revision 764cdf2497ac1fe79b4237e9c75d600f7d868351)
++++ src/vfs/tar/tar.c (revision 8607bcc103ce2f9449b6b9736a9709cdb62a7178)
+@@ -317,5 +317,5 @@
+ mc_close (result);
+ s = g_strconcat (archive->name, decompress_extension (type), (char *) NULL);
+- tmp_vpath = vfs_path_from_str (s);
++ tmp_vpath = vfs_path_from_str_flags (s, VPF_NO_CANON);
+ result = mc_open (tmp_vpath, O_RDONLY);
+ vfs_path_free (tmp_vpath);
|