diff options
Diffstat (limited to 'main/mc')
| -rw-r--r-- | main/mc/APKBUILD | 16 | ||||
| -rw-r--r-- | main/mc/ncurses.patch | 50 |
2 files changed, 6 insertions, 60 deletions
diff --git a/main/mc/APKBUILD b/main/mc/APKBUILD index 3b8807c27b..dc7c2b4af0 100644 --- a/main/mc/APKBUILD +++ b/main/mc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mc -pkgver=4.8.13 -pkgrel=1 +pkgver=4.8.14 +pkgrel=0 pkgdesc="A filemanager/shell that emulates Norton Commander" url="http://www.ibiblio.org/mc/" arch="all" @@ -9,8 +9,7 @@ license="GPL3+" depends="" subpackages="$pkgname-doc $pkgname-lang" makedepends="e2fsprogs-dev glib-dev pcre-dev ncurses-dev" -source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2 - ncurses.patch" +source="http://www.midnight-commander.org/downloads/mc-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver @@ -54,9 +53,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="12a521a50da6a86852177591b9623d5e mc-4.8.13.tar.bz2 -b00ff697691ea1669347d4740e261420 ncurses.patch" -sha256sums="22e1b809edba957eb9a392138bf87fea3877f7ca0b7463b7cc2eb94afa6f3e49 mc-4.8.13.tar.bz2 -75beb9f02f7b0a801abd4c823923c3c2f729a953a4b8cb79493fa5ecd5e640cf ncurses.patch" -sha512sums="9b5fc3c8a3c98ad2ed15e569d80f7b9d40749ff91239e0f0d12d103b40e43e8acdb2dec1fcc1b6543a3038dd4df0bfe48b32c61db491551b22fc0ff7c5ffee27 mc-4.8.13.tar.bz2 -8ff16486b9261d06c95eb8465aee5ad8ee4857c4e10ddb4b3ae0cfb52bfc29a2e6a70de67a080ec63b075a3a485322adbefb6aaeffdaa255e9c19e2bd58564a7 ncurses.patch" +md5sums="fe1cb75643c2bd4df64bbcf2dab76905 mc-4.8.14.tar.bz2" +sha256sums="61fd0fd2280c3d09d7e0aec8ab001fc89dad8e4fd9941f386414667b55152ec5 mc-4.8.14.tar.bz2" +sha512sums="69e1e48e7545b75cdfbcf24f5ade72c8ce92ad3d1410a91b847720dae2b7d5405f2f187337279da592482d0cc3dd2e1883ebd37b0b7ce0389a7821171a814b9a mc-4.8.14.tar.bz2" diff --git a/main/mc/ncurses.patch b/main/mc/ncurses.patch deleted file mode 100644 index 8c6f1dc58b..0000000000 --- a/main/mc/ncurses.patch +++ /dev/null @@ -1,50 +0,0 @@ -Gentoo-bug: https://bugs.gentoo.org/527118 ---- a/m4.include/mc-with-screen-ncurses.m4 -+++ b/m4.include/mc-with-screen-ncurses.m4 -@@ -101,6 +101,9 @@ - LIBS= - AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"], - [AC_MSG_ERROR([Cannot find ncurses library])]) -+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"], -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) -+ - - screen_type=ncurses - screen_msg="Ncurses library" -@@ -111,10 +114,15 @@ - AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes], - [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])]) - -+ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"], -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) -+ - if test x"$ncursesw_found" = "x"; then - LIBS= - AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"], - [AC_MSG_ERROR([Cannot find ncurses library])]) -+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"], -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) - fi - - dnl Check the header -@@ -166,6 +174,9 @@ - LIBS= - AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"], - [AC_MSG_ERROR([Cannot find ncursesw library])]) -+ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"], -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])]) -+ - - dnl Check the header - ncurses_h_found= ---- a/lib/tty/tty-ncurses.c -+++ b/lib/tty/tty-ncurses.c -@@ -66,7 +66,7 @@ - - /*** file scope macro definitions ****************************************************************/ - --#if defined(_AIX) && !defined(CTRL) -+#if !defined(CTRL) - #define CTRL(x) ((x) & 0x1f) - #endif - |