diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-05-26 12:44:37 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-05-26 12:44:37 +0200 |
| commit | 24824c1a353e3597bbc3e70059efa3a0c8a35847 (patch) | |
| tree | b740a26254010e6b72b5cb0b383da273588e804a /main/fish | |
| parent | b1478d40a79251b28b069f5de4282efc02585758 (diff) | |
| download | aports-24824c1a353e3597bbc3e70059efa3a0c8a35847.tar.bz2 aports-24824c1a353e3597bbc3e70059efa3a0c8a35847.tar.xz | |
main/fish: upgrade to 2.3.0
Diffstat (limited to 'main/fish')
| -rw-r--r-- | main/fish/APKBUILD | 48 | ||||
| -rw-r--r-- | main/fish/fish-safe-strerror.patch | 12 | ||||
| -rw-r--r-- | main/fish/include-select-header.patch | 10 |
3 files changed, 20 insertions, 50 deletions
diff --git a/main/fish/APKBUILD b/main/fish/APKBUILD index c01dc6f004..a45a3a0881 100644 --- a/main/fish/APKBUILD +++ b/main/fish/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=fish -pkgver=2.2.0 -pkgrel=3 +pkgver=2.3.0 +pkgrel=0 pkgdesc="a modern interactive commandline shell" url="http://www.fishshell.com/" arch="all" @@ -12,42 +12,34 @@ depends_dev="ncurses-dev" makedepends="$depends_dev autoconf automake libtool doxygen" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" subpackages="$pkgname-doc" -source="http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz - include-select-header.patch - fish-safe-strerror.patch" +source="http://fishshell.com/files/$pkgver/$pkgname-$pkgver.tar.gz" -_builddir="$srcdir"/fish-$pkgver +builddir="$srcdir"/$pkgname-$pkgver prepare() { - cd "$_builddir" + default_prepare || return 1 - local i= - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1 ;; - esac - done - - autoconf + cd "$builddir" + autoconf || return 1 } build() { - cd "$_builddir" - ./configure --prefix=/usr \ - --sysconfdir=/etc || return 1 + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + || return 1 make || return 1 } package() { - cd "$_builddir" + cd "$builddir" make install DESTDIR="$pkgdir" || return 1 } -md5sums="f6c3d940148593ff6648adb07986cbcb fish-2.2.0.tar.gz -9f34cc8d83592ebf75242bd3f695dedb include-select-header.patch -50547af78aef0c4d45904e79cd637e0e fish-safe-strerror.patch" -sha256sums="a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a fish-2.2.0.tar.gz -3a6b68370b936726036da6804e82ee4831fec1463ac9832c83f917b02e77e8aa include-select-header.patch -dd13865f8b45ea616cb37678268ecee65ce4539575ee98ab503633c7b2145edd fish-safe-strerror.patch" -sha512sums="210047f56b105a3d372f03d3a2de41661ed18001e3c8fa053ae4aa43089118d4467837ea022bc44f9877ecc3d0563b365f97920c002faccebaa663c4f079e9e0 fish-2.2.0.tar.gz -c7d4e43d0e8cf1fe4f1fc8d4aac995860520ec80c8bb397fed84739817b1b01830ecbf2d761db2cd95d0aa5fa959d54165413d7d9cd4b814791cf895086e417e include-select-header.patch -f23d3b3db8fd9ac28f04a638478183abdebcf0dfbf50989625897741ebd19a771d6cd2baeae08b6c5887013fdba84118b2429b17cf541260ab894f173c81db17 fish-safe-strerror.patch" +md5sums="86c51dadf9c9cae223f4096190e78443 fish-2.3.0.tar.gz" +sha256sums="912bac47552b1aa0d483a39ade330356632586a8f726c0e805b46d45cfad54e5 fish-2.3.0.tar.gz" +sha512sums="acfeb8daad34250c626172428573d5baf86c43d37379fb29da296973931cb5e0b8d7cb5d2ed64eb6e3b984a3a65fc800dd8f78dce7d5e4719bc5dc143be27e8a fish-2.3.0.tar.gz" diff --git a/main/fish/fish-safe-strerror.patch b/main/fish/fish-safe-strerror.patch deleted file mode 100644 index 86916b3d38..0000000000 --- a/main/fish/fish-safe-strerror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN a/wutil.cpp b/wutil.cpp ---- a/wutil.cpp 2013-10-19 22:10:26.000000000 +0200 -+++ b/wutil.cpp 2014-02-05 17:30:54.372370762 +0100 -@@ -319,7 +319,7 @@ static inline void safe_append(char *buf - - const char *safe_strerror(int err) - { --#if defined(__UCLIBC__) -+#if defined(__UCLIBC__) || !defined(__GLIBC__) - // uClibc does not have sys_errlist, however, its strerror is believed to be async-safe - // See #808 - return strerror(err); diff --git a/main/fish/include-select-header.patch b/main/fish/include-select-header.patch deleted file mode 100644 index 267efb0a6f..0000000000 --- a/main/fish/include-select-header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- fish-2.2.0.orig/iothread.cpp -+++ fish-2.2.0/iothread.cpp -@@ -11,6 +11,7 @@ - #include <signal.h> - #include <fcntl.h> - #include <queue> -+#include <sys/select.h> - - #ifdef _POSIX_THREAD_THREADS_MAX - #if _POSIX_THREAD_THREADS_MAX < 64 |