Christoph Reiter
GitHub
commit
23f159cdca
@ -1,12 +0,0 @@
|
||||
The joys of ncurses "ABI 6".
|
||||
|
||||
--- origsrc/nano-5.3/src/definitions.h 2009-12-01 21:36:42.000000000 -0600
|
||||
+++ src/nano-5.3/src/definitions.h 2010-05-28 13:52:18.936447000 -0500
|
||||
@@ -79,6 +79,7 @@
|
||||
#elif defined(HAVE_NCURSESW_NCURSES_H)
|
||||
#include <ncursesw/ncurses.h>
|
||||
#elif defined(HAVE_NCURSES_H)
|
||||
+#define NCURSES_INTERNALS
|
||||
#include <ncurses.h>
|
||||
#else
|
||||
/* Curses support. */
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=nano
|
||||
pkgver=6.2
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="Pico editor clone with enhancements"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL')
|
||||
@ -15,16 +15,9 @@ makedepends=('autotools'
|
||||
'libiconv-devel'
|
||||
'gettext-devel')
|
||||
backup=('etc/nanorc')
|
||||
install=nano.install
|
||||
source=(https://www.nano-editor.org/dist/v6/${pkgname}-${pkgver}.tar.xz{,.asc}
|
||||
2.2.4-wchar.patch
|
||||
nano-2.3.4-fix-ncurses-location.patch
|
||||
nano-2.8.0-msys2.patch)
|
||||
source=(https://www.nano-editor.org/dist/v6/${pkgname}-${pkgver}.tar.xz{,.asc})
|
||||
sha256sums=('2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3'
|
||||
'SKIP'
|
||||
'021d6bba4d45068b6d24aefdaed5044675f05b01430b68d27721f90d5ea6f5d3'
|
||||
'62b0e50470254ed09e55c068b29b72fe784d0552f97fbc5a15b6ee791c9cbd72'
|
||||
'5566700bbd3e8e157869d76086c731169d3352adb345fe9c3be48762b36a174e')
|
||||
'SKIP')
|
||||
validpgpkeys=('8DA6FE7BFA7A418AB3CB2354BCB356DF91009FA7' # "Chris Allegretta <chrisa@asty.org>"
|
||||
'A7F6A64A67DA09EF92782DD79DF4862AF1175C5B' # "Benno Schulenberg <bensberg@justemail.net>"
|
||||
'BFD009061E535052AD0DF2150D28D4D2A0ACE884' # "Benno Schulenberg <bensberg@telfort.nl>"
|
||||
@ -32,12 +25,6 @@ validpgpkeys=('8DA6FE7BFA7A418AB3CB2354BCB356DF91009FA7' # "Chris Allegretta <ch
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
msg2 "2.2.4-wchar.patch"
|
||||
patch -p2 -i ${srcdir}/2.2.4-wchar.patch
|
||||
msg2 "nano-2.3.4-fix-ncurses-location.patch"
|
||||
patch -p1 -i ${srcdir}/nano-2.3.4-fix-ncurses-location.patch
|
||||
msg2 "nano-2.8.0-msys2.patch"
|
||||
patch -p1 -i ${srcdir}/nano-2.8.0-msys2.patch
|
||||
|
||||
autoreconf -fiv
|
||||
}
|
||||
@ -47,14 +34,13 @@ build() {
|
||||
|
||||
export gl_cv_have_weak=no
|
||||
|
||||
./configure --build=${CHOST} \
|
||||
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
|
||||
./configure --build=${CYGWIN_CHOST} \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--enable-color \
|
||||
--enable-nanorc \
|
||||
--enable-utf8 \
|
||||
CFLAGS="${CFLAGS} -I/usr/include/ncursesw" \
|
||||
CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw"
|
||||
--enable-utf8
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
--- nano-2.9.2/configure.ac.orig 2018-01-11 15:07:04.197241900 +0100
|
||||
+++ nano-2.9.2/configure.ac 2018-01-11 15:08:08.022892500 +0100
|
||||
@@ -531,11 +531,11 @@
|
||||
fi
|
||||
|
||||
if eval "test x$CURSES_LIB_NAME = x"; then
|
||||
- AC_CHECK_HEADERS(ncurses.h)
|
||||
+ AC_CHECK_HEADERS(ncursesw/ncurses.h)
|
||||
|
||||
if test "x$enable_utf8" != xno; then
|
||||
OLDLIBS="$LIBS"
|
||||
- AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
|
||||
+ AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw6-config, no)
|
||||
if test "x$NCURSESW_CONFIG" != xno; then
|
||||
CURSES_LIB=`$NCURSESW_CONFIG --libs`
|
||||
LIBS="$CURSES_LIB $LIBS"
|
||||
@ -1,73 +0,0 @@
|
||||
diff -Naur nano-2.8.0/config.guess.orig nano-2.8.0/config.guess
|
||||
--- nano-2.8.0/config.guess.orig 2016-09-09 01:06:00.000000000 -0400
|
||||
+++ nano-2.8.0/config.guess 2017-04-09 01:22:34.067167300 -0400
|
||||
@@ -947,6 +947,9 @@
|
||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
||||
GUESS=x86_64-pc-cygwin
|
||||
;;
|
||||
+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
|
||||
+ echo x86_64-unknown-msys
|
||||
+ exit ;;
|
||||
prep*:SunOS:5.*:*)
|
||||
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
|
||||
GUESS=powerpcle-unknown-solaris2$SUN_REL
|
||||
diff -Naur nano-2.8.0/config.rpath.orig nano-2.8.0/config.rpath
|
||||
--- nano-2.8.0/config.rpath.orig 2017-04-08 18:50:34.621811900 -0400
|
||||
+++ nano-2.8.0/config.rpath 2017-04-08 20:10:26.717665200 -0400
|
||||
@@ -57,7 +57,7 @@
|
||||
aix*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
- mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
+ mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
@@ -149,7 +149,7 @@
|
||||
hardcode_minus_L=no
|
||||
|
||||
case "$host_os" in
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
@@ -198,7 +198,7 @@
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
@@ -348,7 +348,7 @@
|
||||
;;
|
||||
bsdi[45]*)
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
@@ -537,7 +537,7 @@
|
||||
bsdi[45]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
- cygwin* | mingw* | pw32* | cegcc*)
|
||||
+ cygwin* | msys* | mingw* | pw32* | cegcc*)
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
diff -Naurp nano-2.8.0/syntax/cmake.nanorc.orig nano-2.8.0/syntax/cmake.nanorc
|
||||
--- nano-2.8.0/syntax/cmake.nanorc.orig 2017-03-20 09:55:38.000000000 -0400
|
||||
+++ nano-2.8.0/syntax/cmake.nanorc 2017-04-09 01:22:34.085172900 -0400
|
||||
@@ -13,7 +13,7 @@ color brightgreen "[[:space:]]\<(OR|AND|
|
||||
icolor brightred "^[[:space:]]*((end)?(function|macro)|return)"
|
||||
|
||||
icolor cyan start="\$(ENV)?\{" end="\}"
|
||||
-color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
|
||||
+color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|MSYS|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
|
||||
|
||||
color brightblue "(^|[[:space:]])#.*"
|
||||
color ,green "[[:space:]]+$"
|
||||
@ -1,20 +0,0 @@
|
||||
infodir=usr/share/info
|
||||
filelist=nano.info.gz
|
||||
|
||||
post_install() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist}; do
|
||||
install-info $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install $1
|
||||
}
|
||||
|
||||
pre_remove() {
|
||||
[ -x usr/bin/install-info ] || return 0
|
||||
for file in ${filelist}; do
|
||||
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
|
||||
done
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user