[arch-commits] Commit in mc/trunk (PKGBUILD mc-4.7.0.2_hotlist_syntax.patch)

Pierre Schmitz pierre at archlinux.org
Sat Sep 11 16:25:31 UTC 2010


    Date: Saturday, September 11, 2010 @ 12:25:31
  Author: pierre
Revision: 90427

upgpkg: mc 4.7.4-1
python2 rebuild

Modified:
  mc/trunk/PKGBUILD
Deleted:
  mc/trunk/mc-4.7.0.2_hotlist_syntax.patch

---------------------------------+
 PKGBUILD                        |   15 ++++++++-----
 mc-4.7.0.2_hotlist_syntax.patch |   42 --------------------------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-11 16:23:53 UTC (rev 90426)
+++ PKGBUILD	2010-09-11 16:25:31 UTC (rev 90427)
@@ -5,7 +5,7 @@
 # Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=mc
-pkgver=4.7.2
+pkgver=4.7.4
 pkgrel=1
 pkgdesc="A filemanager/shell that emulates Norton Commander"
 arch=('i686' 'x86_64')
@@ -18,8 +18,8 @@
 conflicts=('mc-utf8')
 replaces=('mc-utf8')
 options=('!emptydirs' '!makeflags')
-source=(http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('82d0f923f686e462eeb739760f8c45bd')
+source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('ae07f873b91e8a2e4a3b081f1adedd2e')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,7 +32,7 @@
 	    --without-debug --without-gnome --without-included-gettext \
 	    --libexecdir=/usr/lib
 
-	make || return 1
+	make
 }
 
 package() {
@@ -41,9 +41,12 @@
 	make DESTDIR=${pkgdir} install
 
 	# Fix FS#15177
-	sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
-	    ${pkgdir}/usr/lib/mc/extfs.d/uzip
+	sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \
+		-i ${pkgdir}/usr/lib/mc/extfs.d/uzip
 
 	# Fix FS#18312
 	rm ${pkgdir}/usr/lib/mc/extfs.d/u7z
+
+	sed 's#/usr/bin/env python#/usr/bin/python2#' \
+		-i ${pkgdir}/usr/lib/mc/extfs.d/s3+
 }

Deleted: mc-4.7.0.2_hotlist_syntax.patch
===================================================================
--- mc-4.7.0.2_hotlist_syntax.patch	2010-09-11 16:23:53 UTC (rev 90426)
+++ mc-4.7.0.2_hotlist_syntax.patch	2010-09-11 16:25:31 UTC (rev 90427)
@@ -1,42 +0,0 @@
---- /lib/tty/tty-internal.h
-+++ /lib/tty/tty-internal.h
-@@ -8,4 +8,15 @@
- 
- #include "lib/global.h"   /* include <glib.h> */
-+
-+/* Taken from S-Lang's slutty.c */
-+#ifdef ultrix   /* Ultrix gets _POSIX_VDISABLE wrong! */
-+# define NULL_VALUE -1
-+#else
-+# ifdef _POSIX_VDISABLE
-+#  define NULL_VALUE _POSIX_VDISABLE
-+# else
-+#  define NULL_VALUE 255
-+# endif
-+#endif
- 
- /* If true lines are shown by spaces */
---- /lib/tty/tty-ncurses.c
-+++ /lib/tty/tty-ncurses.c
-@@ -63,4 +63,5 @@
- 
- /*** file scope macro definitions **************************************/
-+
- #if defined(_AIX) && !defined(CTRL)
- #   define CTRL(x) ((x) & 0x1f)
-@@ -159,4 +160,6 @@
-     /* use Ctrl-g to generate SIGINT */
-     cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */
-+    /* disable SIGQUIT to allow use Ctrl-\ key */
-+    cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
-     tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
-
---- /misc/syntax/Syntax
-+++ /misc/syntax/Syntax
-@@ -140,5 +140,5 @@
- include spec.syntax
- 
--file ..\*\\.repo$ YUM\sRepo File
-+file ..\*\\.repo$ YUM\sRepo\sFile
- include yum-repo.syntax
-




More information about the arch-commits mailing list