mc: Update to 4.8.33
* build for cygwin * remove redundent autoreconf
This commit is contained in:
parent
6febb89825
commit
4879f105ac
15
mc/PKGBUILD
15
mc/PKGBUILD
@ -1,7 +1,7 @@
|
|||||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||||
|
|
||||||
pkgname=mc
|
pkgname=mc
|
||||||
pkgver=4.8.32
|
pkgver=4.8.33
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
|
pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
@ -30,11 +30,9 @@ backup=('etc/mc/edit.indent.rc'
|
|||||||
'etc/mc/sfs.ini')
|
'etc/mc/sfs.ini')
|
||||||
source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/MidnightCommander/${pkgname}/archive/${pkgver}.tar.gz"
|
source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/MidnightCommander/${pkgname}/archive/${pkgver}.tar.gz"
|
||||||
4.7.5.2-ncursesw-term.h.patch
|
4.7.5.2-ncursesw-term.h.patch
|
||||||
mc-4.8.19-msys2.patch
|
|
||||||
0003-vfs-win32-absolute-paths.patch)
|
0003-vfs-win32-absolute-paths.patch)
|
||||||
sha256sums=('5b8e6a66b53f67a430296e3e490c00af17cbbb449f6c56f406ff02a11d516ba1'
|
sha256sums=('092e440930fda43574739e45a8b41af384b974e6720184b6707d127b84082c51'
|
||||||
'49e9a7d918088c8760b0090e99cd6257fa56efa3a4d3e6c9166270cda9c2e8e3'
|
'49e9a7d918088c8760b0090e99cd6257fa56efa3a4d3e6c9166270cda9c2e8e3'
|
||||||
'513a015f237a6907bbbf92bcc13351d831740163a0b8a508a99ba647dea64981'
|
|
||||||
'fc33fcde6ead0406df9df2292804bd5f2d18fb05fc8b51a827f6abb1f6266b54')
|
'fc33fcde6ead0406df9df2292804bd5f2d18fb05fc8b51a827f6abb1f6266b54')
|
||||||
noextract=(${pkgname}-${pkgver}.tar.gz)
|
noextract=(${pkgname}-${pkgver}.tar.gz)
|
||||||
|
|
||||||
@ -49,20 +47,17 @@ prepare() {
|
|||||||
sed -i "s/CURR_MC_VERSION=.*/CURR_MC_VERSION=${pkgver}/" version.sh
|
sed -i "s/CURR_MC_VERSION=.*/CURR_MC_VERSION=${pkgver}/" version.sh
|
||||||
sed -i "s/SHOR_MC_VERSION=.*/SHOR_MC_VERSION=${pkgver}/" version.sh
|
sed -i "s/SHOR_MC_VERSION=.*/SHOR_MC_VERSION=${pkgver}/" version.sh
|
||||||
|
|
||||||
./autogen.sh
|
|
||||||
|
|
||||||
patch -Np2 -i "${srcdir}/4.7.5.2-ncursesw-term.h.patch"
|
patch -Np2 -i "${srcdir}/4.7.5.2-ncursesw-term.h.patch"
|
||||||
patch -Np1 -i "${srcdir}/mc-4.8.19-msys2.patch"
|
|
||||||
patch -Np0 -i "${srcdir}/0003-vfs-win32-absolute-paths.patch"
|
patch -Np0 -i "${srcdir}/0003-vfs-win32-absolute-paths.patch"
|
||||||
|
|
||||||
autoreconf -fi
|
./autogen.sh
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||||
|
|
||||||
./configure --build=${CHOST} \
|
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
|
||||||
|
./configure --build=${CYGWIN_CHOST} \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--without-libintl-prefix \
|
--without-libintl-prefix \
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
diff --git mc-4.8.19.orig/configure mc-4.8.19/configure
|
|
||||||
index a89d720..e682489 100755
|
|
||||||
--- mc-4.8.19.orig/configure
|
|
||||||
+++ mc-4.8.19/configure
|
|
||||||
@@ -15789,7 +15789,7 @@ fi
|
|
||||||
|
|
||||||
# on cygwin, the linker does not accept the "-z" option
|
|
||||||
case $host_os in
|
|
||||||
- cygwin*)
|
|
||||||
+ cygwin* | msys*)
|
|
||||||
TESTS_LDFLAGS="-Wl,--allow-multiple-definition"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
diff --git mc-4.8.19.orig/m4/threadlib.m4 mc-4.8.19/m4/threadlib.m4
|
|
||||||
index 05cc4ff..6f85014 100644
|
|
||||||
--- mc-4.8.19.orig/m4/threadlib.m4
|
|
||||||
+++ mc-4.8.19/m4/threadlib.m4
|
|
||||||
@@ -61,7 +61,7 @@ changequote(,)dnl
|
|
||||||
dnl bugs that lead to endless loops or crashes. See
|
|
||||||
dnl <http://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
|
|
||||||
osf*) gl_use_threads=no ;;
|
|
||||||
- cygwin*)
|
|
||||||
+ cygwin* | msys*)
|
|
||||||
case `uname -r` in
|
|
||||||
1.[0-5].*) gl_use_threads=no ;;
|
|
||||||
*) gl_use_threads=yes ;;
|
|
||||||
diff --git mc-4.8.19.orig/m4.include/mc-tests.m4 mc-4.8.19/m4.include/mc-tests.m4
|
|
||||||
index 742ecb0..23207c4 100644
|
|
||||||
--- mc-4.8.19.orig/m4.include/mc-tests.m4
|
|
||||||
+++ mc-4.8.19/m4.include/mc-tests.m4
|
|
||||||
@@ -44,7 +44,7 @@ AC_DEFUN([mc_UNIT_TESTS],[
|
|
||||||
|
|
||||||
# on cygwin, the linker does not accept the "-z" option
|
|
||||||
case $host_os in
|
|
||||||
- cygwin*)
|
|
||||||
+ cygwin* | msys*)
|
|
||||||
TESTS_LDFLAGS="-Wl,--allow-multiple-definition"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
Loading…
x
Reference in New Issue
Block a user