overlay

commit: 2b05a1f0a2f302c155ed472059809d5b1636bea6
parent 85958ab1a5137239726deceab59eaa824baee6d1
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Sun, 28 Mar 2021 10:51:27 +0200

net-news/newsboat: Bring back non-rust version

Diffstat:
A
net-news/newsboat/Manifest
1
+
A
net-news/newsboat/files/newsboat-2.11-flags.patch
14
++++++++++++++
A
net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch
37
+++++++++++++++++++++++++++++++++++++
A
net-news/newsboat/metadata.xml
9
+++++++++
A
net-news/newsboat/newsboat-2.13.ebuild
54
++++++++++++++++++++++++++++++++++++++++++++++++++++++

5 files changed, 115 insertions(+), 0 deletions(-)
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
@@ -0,0 +1 @@
+DIST newsboat-2.13.tar.xz 460076 BLAKE2B e86fd3e3da8336527f3fd53e663f547a6066bfd1659bf83354a01139a9f6481afda893046faa1729cdfe03b19080032c70575cdcfd13b15aad40f2af808e2f6e SHA512 f7ce9717540e1c38809a44d531d28b26d5f9759479d311c127adec1ed6f3f6e8ad68799559ed31e9ecde7a988a683b0c9f58ff10e8dd4b2de60d75b7f8efe3da
diff --git a/net-news/newsboat/files/newsboat-2.11-flags.patch b/net-news/newsboat/files/newsboat-2.11-flags.patch
@@ -0,0 +1,14 @@
+--- newsboat-2.11/Makefile
++++ newsboat-2.11/Makefile
+@@ -18,9 +18,9 @@
+ DEFINES+=-DGIT_HASH=\"$(GIT_HASH)\"
+ endif
+ 
+-WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
++WARNFLAGS=-Wall -Wextra -Wunreachable-code
+ INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
+-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES)
++BARE_CXXFLAGS=-std=c++11 $(INCLUDES)
+ LDFLAGS+=-L.
+ 
+ PACKAGE=newsboat
diff --git a/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch
@@ -0,0 +1,37 @@
+Patch merged upstream for future versions of newsboat: https://github.com/newsboat/newsboat/pull/883
+
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Mon, 13 Apr 2020 12:52:46 +0200
+Subject: [PATCH] Add support for upcoming json-c 0.14.0.
+
+TRUE/FALSE are not defined anymore.  1 and 0 are used instead.
+
+
+---
+ src/newsblurapi.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/newsblur_api.cpp b/src/newsblur_api.cpp
+index 2d1acdae..e124852d 100644
+--- a/src/newsblur_api.cpp
++++ b/src/newsblur_api.cpp
+@@ -9,6 +9,19 @@
+ #include "strprintf.h"
+ #include "utils.h"
+ 
++/* json-c 0.13.99 does not define TRUE/FALSE anymore
++ * the json-c maintainers replaced them with pure 1/0
++ * https://github.com/json-c/json-c/commit/0992aac61f8b
++ */
++#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE  1
++#endif
++#endif
++
+ #define NEWSBLUR_ITEMS_PER_PAGE 6
+ 
+ namespace newsboat {
diff --git a/net-news/newsboat/metadata.xml b/net-news/newsboat/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/net-news/newsboat/newsboat-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An RSS/Atom feed reader for text terminals"
+HOMEPAGE="https://newsboat.org/ https://github.com/newsboat/newsboat"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://newsboat.org/releases/${PV}/${P}.tar.xz"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-db/sqlite-3.5:3
+	>=dev-libs/stfl-0.21
+	>=net-misc/curl-7.18.0
+	>=dev-libs/json-c-0.11:=
+	dev-libs/libxml2
+	sys-libs/ncurses:0=[unicode]
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.11-flags.patch
+	"${FILESDIR}"/${PN}-2.13-json-c-0.14.0.patch
+)
+
+src_configure() {
+	./config.sh || die
+}
+
+src_compile() {
+	emake prefix="/usr" CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+}
+
+src_test() {
+	# tests require UTF-8 locale
+	emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" test
+	# Tests fail if in ${S} rather than in ${S}/test
+	cd "${S}"/test || die
+	./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" docdir="/usr/share/doc/${PF}" install
+	dodoc CHANGELOG.md README.md TODO
+}