summaryrefslogtreecommitdiff
path: root/net-news/newsboat
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-news/newsboat
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'net-news/newsboat')
-rw-r--r--net-news/newsboat/Manifest3
-rw-r--r--net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch37
-rw-r--r--net-news/newsboat/newsboat-2.13.ebuild3
3 files changed, 41 insertions, 2 deletions
diff --git a/net-news/newsboat/Manifest b/net-news/newsboat/Manifest
index dcdfe53ad16e..5af891ad8de1 100644
--- a/net-news/newsboat/Manifest
+++ b/net-news/newsboat/Manifest
@@ -1,4 +1,5 @@
AUX newsboat-2.11-flags.patch 380 BLAKE2B 2479cfb65282b0cbdbf4d0c6d82257b00254970a6429d388a01b462e4294be2130f9ffebc9380b95d87b4de067768b1b263e28888de88ab48e7497e78d2424f8 SHA512 d031df9800fcbdeddd96b9aaa8fe936f66c35523adee0f1c8e1d08664f6a3ff9e04c606633f2df29fac5ee660b2f11b23c41e63499ad84a528426b9f9b1752b6
+AUX newsboat-2.13-json-c-0.14.0.patch 1007 BLAKE2B ba2770bf0d4c419ea54f871331d25ed68f016913507ccab32e5392dded6a1ea100f6f611de60a28e34438007987a6a53f9c1e20f1759c85ef8894650d49e04a6 SHA512 813ab4310cf055ce71c2dcc39110b6a5c33fa5f51fc40f5c77abbf1c964afaa7f45591aa088e97522eb17fa0d994a8f7c7f9c0fada6ae3defb3331831b3b4ba4
AUX newsboat-2.19-json-c-0.14.0.patch 970 BLAKE2B e6685bca764b01c62d0e76b743aa95c90541d10283cfb74f4a58c2f730cb311d35dd27a54496aa183f40bdc54afd4d9cc50e812cfe612ed1a69405f25c11e39c SHA512 482086d59d6fa0c67897c829ced6480e674b8e42b3d658e65842ac0a75719ca1981175165014567c53d74d4d902d266b2903865acebec02b7df4ee63f483c138
AUX newsboat-2.19-libressl.patch 5497 BLAKE2B 556f1cb3102014be879b99f8f1bdec642ca40e893cc46a1053d46a8065fc56e2a9b59c96db0af51707ae716b7334ad36ae13c06ee08c316483bec95ddc42583b SHA512 0e6d2970a5b78b7a11fe4639c4f17031e5b8498d5445e7f60be3290dfdb193a63d1c085f4277b678149c862180fd998c306cce8c52fd9f7288d42155007027d1
DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
@@ -104,6 +105,6 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST xdg-2.2.0.crate 13387 BLAKE2B f1a5909b6a4544eaf28d1d051e05a6b9b09043060e14e394410778ed175e9f27246afadf3851dec21020c5e2ca81ef4db44a34e58d9229972b2475ff5f40d6c9 SHA512 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
-EBUILD newsboat-2.13.ebuild 1252 BLAKE2B 20607997ab2079d9531b6214a21f556c0c78f4059d3276c08f87006eb19603e92a8daff0883b527f136959078a6172a7a77c2099616dfc481f60a4d062a17b00 SHA512 139266eed0947fbb7f479c9d973cf30a44b97c5ab3ee09d3909d494db016cc9045d064436d28bcc986d0a7d0dc15bb1df10014a4a9e38e4e6804733df3d84852
+EBUILD newsboat-2.13.ebuild 1298 BLAKE2B 116421fdc4e419d3d1c59abdd3f4495b4eb1d4c6edd889330297489c5cc71322654b36741c9a4836b37e9f08711732783be30e45b61f6eb5e8e08ec1cef1d6c4 SHA512 3ca881ea8dd9cc736a60569b08c19cddc2d9f93229279ab4a7227549a60f6efd1a63e3adb1abdedb01626f11aac4f3192a8666396d3da65863edf34080339198
EBUILD newsboat-2.19-r1.ebuild 3187 BLAKE2B 399c02bce80f6b2bbef3d0090d054865eef9e6a145f1cfe5cb6c5d44327df7803ed608357a00d7056fc2d35710f4bc0a4df906dfd9bedaf99451d1e68332ad9d SHA512 c12c83de368391b3ad5a9a052e16714c0efbae1a17240042098c6ec99822b7e7adb629a12ad873b5d6a0940629e1eb3f0c1ff5cf5e66e29d5196b5a11dee152a
MISC metadata.xml 216 BLAKE2B 6a9d054ae44666e41d1fa4f4876a8ef7bb95e7023a56b7a7f108cc2cc5b131e94d2080a5777dbbeef466a38db321c530af83dcec5eff25aa5bd8137dc949b6b7 SHA512 237dec64aa7d798b0b71f56a1c93a701fd424b0374d549a1f51272fd22905341157bdd7bcde6f77a7afeb83afede7e6eb2bbd0a2e3a70a9670933bd1d8732196
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
new file mode 100644
index 000000000000..4e46843c6b7f
--- /dev/null
+++ 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/newsboat-2.13.ebuild b/net-news/newsboat/newsboat-2.13.ebuild
index faeebc9cfb6e..fb6e8dc0de87 100644
--- a/net-news/newsboat/newsboat-2.13.ebuild
+++ b/net-news/newsboat/newsboat-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -36,6 +36,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-2.11-flags.patch
+ "${FILESDIR}"/${PN}-2.13-json-c-0.14.0.patch
)
src_configure() {