Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (966a4a87dcbde9c56d8ca03b28895728076badc6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (966a4a87dcbde9c56d8ca03b28895728076badc6)
  • Date: Fri, 22 Sep 2017 19:49:35 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 +++
http/newsboat/BUILD | 5 +++++
http/newsboat/DEPENDS | 14 ++++++++++++++
http/newsboat/DETAILS | 18 ++++++++++++++++++
http/newsboat/HISTORY | 3 +++
http/newsboat/INSTALL | 1 +
http/newsboat/PRE_BUILD | 9 +++++++++
http/newsboat/boost_regex.patch | 22 ++++++++++++++++++++++
http/newsboat/gcc46.patch | 36 ++++++++++++++++++++++++++++++++++++
http/newsboat/newsboat.gpg |binary
10 files changed, 111 insertions(+)

New commits:
commit 966a4a87dcbde9c56d8ca03b28895728076badc6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

newsboat: new spell, RSS/Atom feed reader for text terminals

diff --git a/ChangeLog b/ChangeLog
index da8d412..978b717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-09-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * http/newsboat: new spell, RSS/Atom feed reader for text terminals
+
2017-09-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* haskell/haskell-disk-free-space: new spell, library for querying
free disk
space
diff --git a/http/newsboat/BUILD b/http/newsboat/BUILD
new file mode 100755
index 0000000..c92554a
--- /dev/null
+++ b/http/newsboat/BUILD
@@ -0,0 +1,5 @@
+if is_depends_enabled ${SPELL} boost; then
+ LDFLAGS="-lboost_regex ${LDFLAGS}"
+fi &&
+
+make prefix="${INSTALL_ROOT}/usr"
diff --git a/http/newsboat/DEPENDS b/http/newsboat/DEPENDS
new file mode 100755
index 0000000..1a1c3dc
--- /dev/null
+++ b/http/newsboat/DEPENDS
@@ -0,0 +1,14 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+
+depends sqlite &&
+depends curl &&
+depends gettext &&
+depends pkgconfig &&
+depends libxml2 &&
+depends -sub CXX gcc &&
+depends stfl &&
+depends json-c &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ depends -sub REGEX boost
+fi
diff --git a/http/newsboat/DETAILS b/http/newsboat/DETAILS
new file mode 100755
index 0000000..2becfd2
--- /dev/null
+++ b/http/newsboat/DETAILS
@@ -0,0 +1,18 @@
+ SPELL=newsboat
+ VERSION=2.10
+ SOURCE=${SPELL}-${VERSION}.tar.xz
+ SOURCE2=${SOURCE}.asc
+ SOURCE_URL[0]=https://newsboat.org/releases/${VERSION}/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=newsboat.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://newsboat.org/
+ LICENSE[0]=MIT
+ ENTERED=20170922
+ KEYWORDS="news rss"
+ SHORT="RSS/Atom feed reader for text terminals"
+cat << EOF
+Newsboat is an actively maintained fork of Newsbeuter, RSS/Atom feed reader
for
+text terminals.
+EOF
diff --git a/http/newsboat/HISTORY b/http/newsboat/HISTORY
new file mode 100644
index 0000000..26f64f3
--- /dev/null
+++ b/http/newsboat/HISTORY
@@ -0,0 +1,3 @@
+2017-09-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, gcc46.patch,
+ boost_regex.patch, newsboat.gpg: created spell, version 2.10
diff --git a/http/newsboat/INSTALL b/http/newsboat/INSTALL
new file mode 100755
index 0000000..8a3ae87
--- /dev/null
+++ b/http/newsboat/INSTALL
@@ -0,0 +1 @@
+make prefix="${INSTALL_ROOT}/usr" install
diff --git a/http/newsboat/PRE_BUILD b/http/newsboat/PRE_BUILD
new file mode 100755
index 0000000..9366387
--- /dev/null
+++ b/http/newsboat/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
+ sedit "s:-std=c++11:-std=c++0x:" Makefile
+
+ patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&
+ patch -p0 < "${SPELL_DIRECTORY}/boost_regex.patch"
+fi
diff --git a/http/newsboat/boost_regex.patch b/http/newsboat/boost_regex.patch
new file mode 100644
index 0000000..246d127
--- /dev/null
+++ b/http/newsboat/boost_regex.patch
@@ -0,0 +1,22 @@
+--- src/utils.cpp.orig 2017-09-20 15:35:24.000000000 -0400
++++ src/utils.cpp 2017-09-21 22:02:53.090549692 -0400
+@@ -24,7 +24,7 @@
+ #include <cstdarg>
+ #include <cstdio>
+ #include <algorithm>
+-#include <regex>
++#include <boost/regex.hpp>
+
+ #include <curl/curl.h>
+
+@@ -1069,8 +1069,8 @@
+ //throw away the query part 'title-with-dashes'
+ std::string title = path.substr(0,pos_of_qmrk);
+ //Throw away common webpage suffixes: .html, .php, .aspx, .htm
+- std::regex rx("\\.html$|\\.htm$|\\.php$|\\.aspx$");
+- title = std::regex_replace(title,rx,"");
++ boost::regex rx("\\.html$|\\.htm$|\\.php$|\\.aspx$");
++ title = boost::regex_replace(title,rx,"");
+ // if there is nothing left, just give up
+ if (title.empty())
+ return title;
diff --git a/http/newsboat/gcc46.patch b/http/newsboat/gcc46.patch
new file mode 100644
index 0000000..a8213c8
--- /dev/null
+++ b/http/newsboat/gcc46.patch
@@ -0,0 +1,36 @@
+--- src/cache.cpp.orig 2017-09-20 15:35:24.000000000 -0400
++++ src/cache.cpp 2017-09-22 08:07:07.216014236 -0400
+@@ -206,7 +206,7 @@
+ static int guid_callback(void * myguids, int argc, char ** argv, char ** /*
azColName */) {
+ auto* guids = static_cast<std::unordered_set<std::string> *>(myguids);
+ assert (argc == 1);
+- guids->emplace(argv[0]);
++ guids->insert(argv[0]);
+ return 0;
+ }
+
+--- src/tagsouppullparser.cpp.orig 2017-09-20 15:35:24.000000000 -0400
++++ src/tagsouppullparser.cpp 2017-09-22 08:09:36.264588407 -0400
+@@ -504,7 +504,7 @@
+ text = tagstr.substr(last_pos, pos - last_pos);
+ if (text[text.length()-1] == '/') {
+ // a kludge for <br/>
+- text.pop_back();
++ text.erase(text.size() - 1);
+ }
+ LOG(level::DEBUG, "parse_tag: tag name = %s", text);
+ } else {
+--- src/listformatter.cpp.orig 2017-09-20 15:35:24.000000000 -0400
++++ src/listformatter.cpp 2017-09-22 14:57:54.720041454 -0400
+@@ -46,10 +46,7 @@
+ }
+
+ if (itempos == UINT_MAX) {
+- lines.insert(
+- lines.cend(),
+- formatted_text.cbegin(),
+- formatted_text.cend());
++ std::move(formatted_text.cbegin(), formatted_text.cend(),
std::back_inserter(lines));
+ } else {
+ lines[itempos] = formatted_text[0];
+ }
diff --git a/http/newsboat/newsboat.gpg b/http/newsboat/newsboat.gpg
new file mode 100644
index 0000000..738bf9c
Binary files /dev/null and b/http/newsboat/newsboat.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (966a4a87dcbde9c56d8ca03b28895728076badc6), Vlad Glagolev, 09/22/2017

Archive powered by MHonArc 2.6.24.

Top of Page