diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-08-05 12:23:19 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-08-05 12:23:35 +0200 |
| commit | 13add789f353c337a9f06bfcdd20aa5c20f0723b (patch) | |
| tree | 607a3b3541f9e88c5877ee81abb1657ab87b68e1 /main/pspg | |
| parent | 922f06f6ca59fab8e702c161e838fb9f38318102 (diff) | |
| download | aports-13add789f353c337a9f06bfcdd20aa5c20f0723b.tar.bz2 aports-13add789f353c337a9f06bfcdd20aa5c20f0723b.tar.xz | |
main/pspg: upgrade to 1.3.0
Diffstat (limited to 'main/pspg')
| -rw-r--r-- | main/pspg/APKBUILD | 8 | ||||
| -rw-r--r-- | main/pspg/fix-ax_with_curses_extra.patch | 30 |
2 files changed, 3 insertions, 35 deletions
diff --git a/main/pspg/APKBUILD b/main/pspg/APKBUILD index f9ac9a3d5d..fd164e76c5 100644 --- a/main/pspg/APKBUILD +++ b/main/pspg/APKBUILD @@ -1,15 +1,14 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=pspg -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=0 pkgdesc="A unix pager optimized for psql" url="https://github.com/okbob/pspg" arch="all" license="BSD-2-Clause" makedepends="automake autoconf ncurses-dev readline-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/okbob/$pkgname/archive/$pkgver.tar.gz - fix-ax_with_curses_extra.patch" +source="$pkgname-$pkgver.tar.gz::https://github.com/okbob/$pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -38,5 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="48de3416066c1098340057e2137c6ea05d9d3725550ef28bcadd9d74c323f5cc87e1bd39e84f3a66614d05f9656cb1206ca4b2146e506530906440d958788fc5 pspg-1.2.1.tar.gz -a7b9620d88077b02e80097afba6c22ec789ec54bcfc5834167ac5ba57861c9b00027748896d2740d03525c5b5ceb8ed68e28deab48d818c8deaf988bd736bf4c fix-ax_with_curses_extra.patch" +sha512sums="6c6e4b12008ca36ea4ecf6c60d474f897622427590d8326db73f7d5a6d2134c479db17b0765cd8861ccf422e5fab292e10fc7f7e7a548c5d3773c64c5e11d1dd pspg-1.3.0.tar.gz" diff --git a/main/pspg/fix-ax_with_curses_extra.patch b/main/pspg/fix-ax_with_curses_extra.patch deleted file mode 100644 index d3110b3946..0000000000 --- a/main/pspg/fix-ax_with_curses_extra.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2aedb98b7c0b60ebe2b347b5a511861146b2062d Mon Sep 17 00:00:00 2001 -From: Jakub Jirutka <jakub@jirutka.cz> -Date: Sat, 21 Jul 2018 12:27:28 +0200 -Subject: [PATCH] fix ax_with_curses_extra to find <panel.h> - -These autohells macros do not find panel.h in the root of the library -path when ncursesw variant is detected. This patch fixes the macros to -search both ncursesw/ subdirectory and the root of the library path. - -Based on https://github.com/crosstool-ng/crosstool-ng/blob/master/m4/ax_with_curses_extra.m4 - -Upstream-Issue: https://github.com/okbob/pspg/pull/72 ---- - tools/m4_ax_with_curses_extra.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/m4_ax_with_curses_extra.m4 b/tools/m4_ax_with_curses_extra.m4 -index 7056d68..81f5b79 100644 ---- a/tools/m4_ax_with_curses_extra.m4 -+++ b/tools/m4_ax_with_curses_extra.m4 -@@ -212,6 +212,9 @@ AC_DEFUN([_AX_WITH_CURSES_EXTRA], [ - ], [ - AS_IF([test "x$ax_cv_curses_which" = xncursesw], [ - _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncursesw/$4], [$5]) -+ AS_IF([test x$[]ax_cv_[]m4_tolower($1) != "xyes"], [ -+ _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$6]) -+ ]) - ], [test "x$ax_cv_curses_which" = xncurses], [ - _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$6]) - AS_IF([test x$[]ax_cv_[]m4_tolower($1) != "xyes"], [ |