diff options
| author | Mike Crute <mike@crute.us> | 2017-12-26 01:30:28 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-27 14:36:41 +0100 |
| commit | efcfbac7d0cd4a6ecf537669fdaad89b268f0288 (patch) | |
| tree | a719572d857fdd80b213e6844269e8086f928ee8 /main/newsboat | |
| parent | 9fbba975d952b5e939120d857d727595ef63c639 (diff) | |
| download | aports-efcfbac7d0cd4a6ecf537669fdaad89b268f0288.tar.bz2 aports-efcfbac7d0cd4a6ecf537669fdaad89b268f0288.tar.xz | |
main/newsboat: update to 2.10.2
Upstream has incorporated all of our local patches in 2.10.2.
Diffstat (limited to 'main/newsboat')
| -rw-r--r-- | main/newsboat/APKBUILD | 15 | ||||
| -rw-r--r-- | main/newsboat/musl_const.patch | 11 | ||||
| -rw-r--r-- | main/newsboat/newsbeuter-2.10.1-ncurses6.patch | 12 | ||||
| -rw-r--r-- | main/newsboat/use-wchar_t-to-hold-current-input-character.patch | 23 |
4 files changed, 4 insertions, 57 deletions
diff --git a/main/newsboat/APKBUILD b/main/newsboat/APKBUILD index 883e057992..624a448398 100644 --- a/main/newsboat/APKBUILD +++ b/main/newsboat/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Mike Crute <mike@crute.us> pkgname=newsboat -pkgver=2.10.1 -pkgrel=1 +pkgver=2.10.2 +pkgrel=0 pkgdesc="An RSS/Atom feed reader for text terminals" url="https://newsboat.org/" arch="all" @@ -21,11 +21,7 @@ makedepends=" stfl-dev " subpackages="$pkgname-doc $pkgname-lang" -source="https://github.com/newsboat/newsboat/archive/r$pkgver.tar.gz - newsbeuter-2.10.1-ncurses6.patch - musl_const.patch - use-wchar_t-to-hold-current-input-character.patch - " +source="https://github.com/newsboat/newsboat/archive/r$pkgver.tar.gz" builddir="$srcdir/$pkgname-r$pkgver" @@ -46,7 +42,4 @@ package() { make DESTDIR="$pkgdir" prefix=/usr install } -sha512sums="38fa67fce209b1e80173749de145317696153c6d53ecc6a6200f34b2f9812d9578738fdc4f8ead64b0a47d2d2a75b79fbadf4057d7187f49540fde399aaa7b62 r2.10.1.tar.gz -337f2d9700b80a4abdfa9db69cd8242cf7465607fbf3e39aff33594c04f2132c13d4b2348ccc1868cd898780663e10ee5e59d45fe58e7d4a01723bced10c9af9 newsbeuter-2.10.1-ncurses6.patch -e0accc30c078c068f3e2a90e2b28c1759856ae4310ebadc5591fa008333c346afff8d874c3a62b3310c29cbf68194fd737bb43d8fc03504dd2ba866ff8ea199f musl_const.patch -66963e6d6cb1e94523f64b7b2d16e4f3e34629750fdf29fcf30e7181b14cbb9f812afec0542a1b49e9b68f6759e919d72d98162bc980e436c8d357c7df53ad09 use-wchar_t-to-hold-current-input-character.patch" +sha512sums="ca7933457f1b003f7df0e4bb5d94ad2504bd478e7002c550cb1757ab9d663ded5fd694b111751c5756560d4d55dde4357400dffc09505df1ee10fdf2790faf1e r2.10.2.tar.gz" diff --git a/main/newsboat/musl_const.patch b/main/newsboat/musl_const.patch deleted file mode 100644 index 19046387e3..0000000000 --- a/main/newsboat/musl_const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/utils.cpp -+++ b/src/utils.cpp -@@ -346,7 +346,7 @@ - * of all the Unix-like systems around there, only Linux/glibc seems to - * come with a SuSv3-conforming iconv implementation. - */ --#if !(__linux) && !defined(__GLIBC__) && !defined(__APPLE__) \ -+#if !(__linux__) && !defined(__GLIBC__) && !defined(__APPLE__) \ - && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) - const char * inbufp; - #else diff --git a/main/newsboat/newsbeuter-2.10.1-ncurses6.patch b/main/newsboat/newsbeuter-2.10.1-ncurses6.patch deleted file mode 100644 index cf9ae053c5..0000000000 --- a/main/newsboat/newsbeuter-2.10.1-ncurses6.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/config.sh -+++ b/config.sh -@@ -108,7 +108,8 @@ - check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4" - elif [ `uname -s` != "OpenBSD" ]; then - check_pkg "ncursesw" || \ -- check_custom "ncursesw5" "ncursesw5-config" || fail "ncursesw" -+ check_custom "ncursesw5" "ncursesw5-config" || \ -+ check_custom "ncursesw6" "ncursesw6-config" || fail "ncursesw" - fi - check_ssl_implementation - all_aboard_the_fail_boat diff --git a/main/newsboat/use-wchar_t-to-hold-current-input-character.patch b/main/newsboat/use-wchar_t-to-hold-current-input-character.patch deleted file mode 100644 index fec0d3ad43..0000000000 --- a/main/newsboat/use-wchar_t-to-hold-current-input-character.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ca789ed64bf71281b6a998da41032270748aa90e Mon Sep 17 00:00:00 2001 -From: Alexander Batischev <eual.jp@gmail.com> -Date: Wed, 1 Nov 2017 21:06:18 +0300 -Subject: [PATCH] Use wchar_t to hold current input character - -Fixes #43. ---- - filter/Scanner.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/filter/Scanner.h b/filter/Scanner.h -index 8ce5fc52..e578b8e1 100644 ---- a/filter/Scanner.h -+++ b/filter/Scanner.h -@@ -222,7 +222,7 @@ class Scanner { - Token *tokens; // list of tokens already peeked (first token is a dummy) - Token *pt; // current peek token - -- int ch; // current input character -+ wchar_t ch; // current input character - - int pos; // byte position of current character - int charPos; // position by unicode characters starting with 0 |