aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-03-24 12:46:24 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-03-24 12:46:24 +0000
commitc8a18b22ab119ae31ac78340023a8c8ac380c4bb (patch)
tree5278bba92f3a3d9ff6da4c24afccbfef30f3553b
parentd27347d66180f4bba25a5cbc08fcfc933755dfd5 (diff)
downloadaports-c8a18b22ab119ae31ac78340023a8c8ac380c4bb.tar.bz2
aports-c8a18b22ab119ae31ac78340023a8c8ac380c4bb.tar.xz
main/nano: upgrade to 2.4.0
-rw-r--r--main/nano/APKBUILD20
-rw-r--r--main/nano/time_t.patch11
2 files changed, 26 insertions, 5 deletions
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD
index e8efe62325..cec005a304 100644
--- a/main/nano/APKBUILD
+++ b/main/nano/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Michael Zhou <zhoumichaely@gmail.com>
pkgname=nano
-pkgver=2.3.2
+pkgver=2.4.0
pkgrel=0
pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor."
url="http://www.nano-editor.org/"
@@ -11,13 +11,19 @@ depends=
makedepends="ncurses-dev"
install=
subpackages="$pkgname-doc"
-source="http://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
+source="http://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
+ time_t.patch
+ "
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
- update_config_sub || return 1
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
build() {
@@ -31,7 +37,6 @@ build() {
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-nls \
- --disable-speller \
|| return 1
make || return 1
}
@@ -45,4 +50,9 @@ package() {
sed -i 's:# include:include:g' "$pkgdir"/etc/nanorc
}
-md5sums="6451aeae836471cadea8567c44a46c99 nano-2.3.2.tar.gz"
+md5sums="e5c9c6424ee2303663ae4b99ecd4b493 nano-2.4.0.tar.gz
+476f1059619a1b965f9a2ebf10f01401 time_t.patch"
+sha256sums="5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd nano-2.4.0.tar.gz
+a12db65a531bef5a64a39f8fae056c5c1a1fb9de6cd66d50725abc8e1a7f982b time_t.patch"
+sha512sums="7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d nano-2.4.0.tar.gz
+5b2de5333936defe352c5bf6a1f018a9f0446e7b4644020e177cc8651b708cb02bc57ed09c856320253d4db40eb9937452a48be4c52393f606bb31f1199fb912 time_t.patch"
diff --git a/main/nano/time_t.patch b/main/nano/time_t.patch
new file mode 100644
index 0000000000..ee6423a055
--- /dev/null
+++ b/main/nano/time_t.patch
@@ -0,0 +1,11 @@
+--- ./src/text.c.orig
++++ ./src/text.c
+@@ -2664,7 +2664,7 @@
+ ssize_t current_y_save = openfile->current_y;
+ ssize_t lineno_save = openfile->current->lineno;
+ struct stat spellfileinfo;
+- __time_t timestamp;
++ time_t timestamp;
+ pid_t pid_spell;
+ char *ptr;
+ static int arglen = 3;