summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-03-26 09:09:47 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-03-26 09:09:47 +0000
commitec2da43c51111eaa09bcc37c381521c6f9dada48 (patch)
treeb29ebdefcd924a73b305326dcb510754922fc06c
parent7d4c3a9d1265c1ec3f8460d83df8e6a5c019a1a4 (diff)
downloadaports-ec2da43c51111eaa09bcc37c381521c6f9dada48.tar.bz2
aports-ec2da43c51111eaa09bcc37c381521c6f9dada48.tar.xz
main/sqsh: build fix for readline-6.3
-rw-r--r--main/sqsh/APKBUILD14
-rw-r--r--main/sqsh/readline-6.3.patch13
2 files changed, 22 insertions, 5 deletions
diff --git a/main/sqsh/APKBUILD b/main/sqsh/APKBUILD
index ae1808f51..339be54d3 100644
--- a/main/sqsh/APKBUILD
+++ b/main/sqsh/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
pkgname=sqsh
pkgver=2.4
-pkgrel=0
+pkgrel=1
pkgdesc="Sybase iSQL replacement"
url="http://www.sqsh.org"
arch="all"
@@ -12,7 +12,8 @@ depends_dev=""
makedepends="freetds-dev readline-dev ncurses-dev"
install=""
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/project/sqsh/sqsh/sqsh-$pkgver/sqsh-$pkgver.tgz"
+source="http://downloads.sourceforge.net/project/sqsh/sqsh/sqsh-$pkgver/sqsh-$pkgver.tgz
+ readline-6.3.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
@@ -47,6 +48,9 @@ package() {
make DESTDIR="$pkgdir" install.man || return 1
}
-md5sums="0ad6cc9452d3257866ccde5f14ffa013 sqsh-2.4.tgz"
-sha256sums="f3e1e3c1b142a369bf7db4411db10d8f2d010d787abbc95c8227af1c19b22ec8 sqsh-2.4.tgz"
-sha512sums="6d9b7edab4e26b072dd894c5bce67d9f9670ec7dca658c6d366a0419a1c52ad9b7800750af1c7b702072f359b0efa01a699d5722b996bcd513dfa049b922f9fb sqsh-2.4.tgz"
+md5sums="0ad6cc9452d3257866ccde5f14ffa013 sqsh-2.4.tgz
+741e42e85e0cd80233931c0cb815aef6 readline-6.3.patch"
+sha256sums="f3e1e3c1b142a369bf7db4411db10d8f2d010d787abbc95c8227af1c19b22ec8 sqsh-2.4.tgz
+b453e37fd41835bf81d55ca74b64891655795d7f643106f3cf0602ce2e921a62 readline-6.3.patch"
+sha512sums="6d9b7edab4e26b072dd894c5bce67d9f9670ec7dca658c6d366a0419a1c52ad9b7800750af1c7b702072f359b0efa01a699d5722b996bcd513dfa049b922f9fb sqsh-2.4.tgz
+5105895b9583f3043ba91cdbb857136acd2176f596f173c0c9440810f774fbb6d9e15cc35474527a7ac68612d49568f995c198f3833ddd8c583e4b77baf03097 readline-6.3.patch"
diff --git a/main/sqsh/readline-6.3.patch b/main/sqsh/readline-6.3.patch
new file mode 100644
index 000000000..7a8250dcc
--- /dev/null
+++ b/main/sqsh/readline-6.3.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sqsh_readline.c b/src/sqsh_readline.c
+index 2ec565d..f30c119 100644
+--- a/src/sqsh_readline.c
++++ b/src/sqsh_readline.c
+@@ -159,7 +159,7 @@ int sqsh_readline_init()
+
+ rl_readline_name = "sqsh" ;
+ rl_completion_entry_function = (rl_compentry_func_t*)sqsh_completion ;
+- rl_attempted_completion_function = (CPPFunction*)sqsh_completion ;
++ rl_attempted_completion_function = (rl_completion_func_t*)sqsh_completion ;
+
+ /*
+ * sqsh-2.1.8 - Remove '@' and '$' from the readline default list of word break