diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
| commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
| tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /community/mc | |
| parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
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 0bfb9ac04..1b038c7b1 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' 'mips64el') 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);
|