newsbeuter: remove
abandoned and doesn't build with up to date json-c. newsboat is the maintained fork.
This commit is contained in:
Michael Gehring
parent
6800456967
commit
d95b5cf90d
@ -1,2 +0,0 @@
|
||||
This package has been abandoned upstream, an actively maintained fork as newsboat
|
||||
is available
|
||||
@ -1,55 +0,0 @@
|
||||
From 12551d798f145d5dc5b4f910914f95f2c0492428 Mon Sep 17 00:00:00 2001
|
||||
From: "V.Krishn" <vkrishn4@gmail.com>
|
||||
Date: Fri, 10 Apr 2015 04:00:33 +0530
|
||||
Subject: [PATCH] Remove iconv translit references
|
||||
|
||||
---
|
||||
src/stflpp.cpp | 4 ++--
|
||||
src/utils.cpp | 3 +--
|
||||
2 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/stflpp.cpp b/src/stflpp.cpp
|
||||
index fb6dcae..7893679 100644
|
||||
--- src/stflpp.cpp
|
||||
+++ src/stflpp.cpp
|
||||
@@ -16,7 +16,7 @@ namespace newsbeuter {
|
||||
*/
|
||||
|
||||
stfl::form::form(const std::string& text) : f(0) {
|
||||
- ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str());
|
||||
+ ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET))).c_str());
|
||||
if (!ipool) {
|
||||
throw exception(errno);
|
||||
}
|
||||
@@ -82,7 +82,7 @@ static std::mutex quote_mtx;
|
||||
|
||||
std::string stfl::quote(const std::string& text) {
|
||||
std::lock_guard<std::mutex> lock(quote_mtx);
|
||||
- stfl_ipool * ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str());
|
||||
+ stfl_ipool * ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET))).c_str());
|
||||
std::string retval = stfl_ipool_fromwc(ipool,stfl_quote(stfl_ipool_towc(ipool,text.c_str())));
|
||||
stfl_ipool_destroy(ipool);
|
||||
return retval;
|
||||
diff --git a/src/utils.cpp b/src/utils.cpp
|
||||
index ce4b36b..67d780c 100644
|
||||
--- src/utils.cpp
|
||||
+++ src/utils.cpp
|
||||
@@ -262,7 +262,7 @@ std::string utils::convert_text(const std::string& text, const std::string& toco
|
||||
if (strcasecmp(tocode.c_str(), fromcode.c_str())==0)
|
||||
return text;
|
||||
|
||||
- iconv_t cd = ::iconv_open((tocode + "//TRANSLIT").c_str(), fromcode.c_str());
|
||||
+ iconv_t cd = ::iconv_open((tocode).c_str(), fromcode.c_str());
|
||||
|
||||
if (cd == reinterpret_cast<iconv_t>(-1))
|
||||
return result;
|
||||
@@ -498,7 +498,6 @@ std::wstring utils::str2wstr(const std::string& str) {
|
||||
|
||||
std::string utils::wstr2str(const std::wstring& wstr) {
|
||||
std::string codeset = nl_langinfo(CODESET);
|
||||
- codeset.append("//TRANSLIT");
|
||||
struct stfl_ipool * ipool = stfl_ipool_create(codeset.c_str());
|
||||
std::string result = stfl_ipool_fromwc(ipool, wstr.c_str());
|
||||
stfl_ipool_destroy(ipool);
|
||||
--
|
||||
1.7.10.4
|
||||
@ -1,93 +0,0 @@
|
||||
From e11b656bda59ca31b4f9ab4c5a14696813b0f6f4 Mon Sep 17 00:00:00 2001
|
||||
From: Tilman Keskinoz <arved@FreeBSD.org>
|
||||
Date: Thu, 12 Mar 2015 11:03:50 +0100
|
||||
Subject: [PATCH 1/3] Detach thread, to avoid thread being destructed when it
|
||||
is going out of scope
|
||||
|
||||
---
|
||||
src/pb_controller.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/pb_controller.cpp b/src/pb_controller.cpp
|
||||
index 09b5e89..da8ffcb 100644
|
||||
--- src/pb_controller.cpp
|
||||
+++ src/pb_controller.cpp
|
||||
@@ -287,6 +287,7 @@ void pb_controller::start_downloads() {
|
||||
if (it->status() == DL_QUEUED) {
|
||||
std::thread t {poddlthread(&(*it), cfg)};
|
||||
--dl2start;
|
||||
+ t.detach();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
From f79e5527ba5f54677540637f5b8d287215cfa051 Mon Sep 17 00:00:00 2001
|
||||
From: Tilman Keskinoz <arved@FreeBSD.org>
|
||||
Date: Thu, 12 Mar 2015 11:04:49 +0100
|
||||
Subject: [PATCH 2/3] Fix segfault
|
||||
|
||||
I think somewhere the poddlthread is copied and the memory messed up.
|
||||
Make it a shared_ptr to fix segfault.
|
||||
|
||||
Why is this a pointer anyway?
|
||||
---
|
||||
include/poddlthread.h | 3 ++-
|
||||
src/poddlthread.cpp | 1 -
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/poddlthread.h b/include/poddlthread.h
|
||||
index a10b9e7..cf0f1da 100644
|
||||
--- include/poddlthread.h
|
||||
+++ include/poddlthread.h
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
+#include <memory>
|
||||
|
||||
#include <configcontainer.h>
|
||||
|
||||
@@ -24,7 +25,7 @@ class poddlthread {
|
||||
private:
|
||||
void mkdir_p(const char * file);
|
||||
download * dl;
|
||||
- std::ofstream *f;
|
||||
+ std::shared_ptr<std::ofstream> f;
|
||||
timeval tv1;
|
||||
timeval tv2;
|
||||
size_t bytecount;
|
||||
diff --git a/src/poddlthread.cpp b/src/poddlthread.cpp
|
||||
index 583481e..3a1b390 100644
|
||||
--- src/poddlthread.cpp
|
||||
+++ src/poddlthread.cpp
|
||||
@@ -22,7 +22,6 @@ poddlthread::poddlthread(download * dl_, newsbeuter::configcontainer * c) : dl(d
|
||||
}
|
||||
|
||||
poddlthread::~poddlthread() {
|
||||
- delete f;
|
||||
}
|
||||
|
||||
void poddlthread::operator()() {
|
||||
|
||||
From 49dbf84d9500860c48c1d3137cf0d7ab89588726 Mon Sep 17 00:00:00 2001
|
||||
From: Tilman Keskinoz <arved@FreeBSD.org>
|
||||
Date: Thu, 12 Mar 2015 11:30:24 +0100
|
||||
Subject: [PATCH 3/3] Another threa.detach() missing
|
||||
|
||||
---
|
||||
src/pb_view.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/pb_view.cpp b/src/pb_view.cpp
|
||||
index fb61c72..f3cb478 100644
|
||||
--- src/pb_view.cpp
|
||||
+++ src/pb_view.cpp
|
||||
@@ -111,6 +111,7 @@ void pb_view::run(bool auto_download) {
|
||||
if (idx != -1) {
|
||||
if (ctrl->downloads()[idx].status() != DL_DOWNLOADING) {
|
||||
std::thread t {poddlthread(&ctrl->downloads()[idx], ctrl->get_cfgcont())};
|
||||
+ t.detach();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
--- Makefile.old 2014-01-18 17:10:41.000000000 -0600
|
||||
+++ Makefile 2014-11-16 11:50:42.732669294 -0600
|
||||
@@ -1,5 +1,5 @@
|
||||
# important directories
|
||||
-prefix?=/usr/local
|
||||
+prefix?=/usr
|
||||
mandir?=$(prefix)/share/man
|
||||
datadir?=$(prefix)/share
|
||||
localedir?=$(datadir)/locale
|
||||
@ -1,23 +0,0 @@
|
||||
# Template file for 'newsbeuter'
|
||||
pkgname=newsbeuter
|
||||
version=r2.9
|
||||
revision=10
|
||||
hostmakedepends="pkg-config perl"
|
||||
makedepends="stfl-devel json-c-devel libxml2-devel libcurl-devel sqlite-devel libressl-devel"
|
||||
short_desc="Newsbeuter is the Mutt of RSS feed readers"
|
||||
maintainer="Logen K <logen@sudotask.com>"
|
||||
license="MIT"
|
||||
homepage="http://www.newsbeuter.org"
|
||||
distfiles="https://github.com/akrennmair/${pkgname}/archive/${version}.tar.gz"
|
||||
checksum=489694a57d4af390aa15ab48b66517b0dc34a1cda4410eb5f6f997c6369f51d8
|
||||
|
||||
do_configure() {
|
||||
./config.sh
|
||||
}
|
||||
do_build() {
|
||||
make CC=$CC CXX=$CXX ${makejobs}
|
||||
}
|
||||
do_install() {
|
||||
make PREFIX=/usr DESTDIR=${DESTDIR} install
|
||||
vlicense LICENSE
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
pattern='r[\d.]+\d+'
|
||||
Loading…
x
Reference in New Issue
Block a user