Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (34e0a4fdf0b7883d143537294da79c04badc8a97)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (34e0a4fdf0b7883d143537294da79c04badc8a97)
  • Date: Sun, 21 Jan 2018 00:04:36 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

http/newsboat/0001-fix-compile-error.patch | 39
+++++++++++++++++++++++++++++
http/newsboat/HISTORY | 4 ++
http/newsboat/PRE_BUILD | 5 ++-
http/newsboat/TRIGGERS | 1
4 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 34e0a4fdf0b7883d143537294da79c04badc8a97
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/newsboat: fix compile error

commit 9ac574e59eb6eec53c54f322e7649152965ce099
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

http/newsboat: on cast json-c check self

diff --git a/http/newsboat/0001-fix-compile-error.patch
b/http/newsboat/0001-fix-compile-error.patch
new file mode 100644
index 0000000..cd74463
--- /dev/null
+++ b/http/newsboat/0001-fix-compile-error.patch
@@ -0,0 +1,39 @@
+From 35b45400dcd7656dd2678a8ecea17b93d29c5056 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 21 Jan 2018 01:01:54 +0100
+Subject: [PATCH] fix compile error
+
+---
+ src/inoreader_api.cpp | 2 +-
+ src/oldreader_api.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/inoreader_api.cpp b/src/inoreader_api.cpp
+index d1b0989..64400c9 100644
+--- a/src/inoreader_api.cpp
++++ b/src/inoreader_api.cpp
+@@ -136,7 +136,7 @@ std::vector<tagged_feedurl>
inoreader_api::get_subscribed_urls() {
+
+ json_object_object_get_ex(sub, "categories", &node);
+ struct array_list * categories = json_object_get_array(node);
+- for (int i = 0; i < array_list_length(categories); i++) {
++ for (unsigned int i = 0; i < array_list_length(categories);
i++) {
+ json_object* cat = json_object_array_get_idx(node, i);
+ json_object* label_node {};
+ json_object_object_get_ex(cat, "label", &label_node);
+diff --git a/src/oldreader_api.cpp b/src/oldreader_api.cpp
+index 7cdf032..335bec3 100644
+--- a/src/oldreader_api.cpp
++++ b/src/oldreader_api.cpp
+@@ -134,7 +134,7 @@ std::vector<tagged_feedurl>
oldreader_api::get_subscribed_urls() {
+
+ json_object_object_get_ex(sub, "categories", &node);
+ struct array_list * categories =
json_object_get_array(node);
+- for (int i = 0; i < array_list_length(categories);
i++) {
++ for (unsigned int i = 0; i <
array_list_length(categories); i++) {
+ json_object* cat =
json_object_array_get_idx(node, i);
+ json_object* label_node {};
+ json_object_object_get_ex(cat, "label",
&label_node);
+--
+2.15.1
+
diff --git a/http/newsboat/HISTORY b/http/newsboat/HISTORY
index d22e230..aad3ac2 100644
--- a/http/newsboat/HISTORY
+++ b/http/newsboat/HISTORY
@@ -1,3 +1,7 @@
+2018-01-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * TRIGGERS: on cast json-c check self
+ * PRE_BUILD, 0001-fix-compile-error.patch: fix compile error
+
2017-12-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.10.2
* gcc46.patch: updated
diff --git a/http/newsboat/PRE_BUILD b/http/newsboat/PRE_BUILD
index 9366387..8971f59 100755
--- a/http/newsboat/PRE_BUILD
+++ b/http/newsboat/PRE_BUILD
@@ -6,4 +6,7 @@ if spell_ok gcc && is_version_less $(installed_version gcc)
4.8; then

patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&
patch -p0 < "${SPELL_DIRECTORY}/boost_regex.patch"
-fi
+fi &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-compile-error.patch"
+
diff --git a/http/newsboat/TRIGGERS b/http/newsboat/TRIGGERS
new file mode 100755
index 0000000..07c815a
--- /dev/null
+++ b/http/newsboat/TRIGGERS
@@ -0,0 +1 @@
+on_cast json-c check_self



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (34e0a4fdf0b7883d143537294da79c04badc8a97), Florian Franzmann, 01/20/2018

Archive powered by MHonArc 2.6.24.

Top of Page