From 32793d9a5b60ef0591c71c12ad75121d9b155adf Mon Sep 17 00:00:00 2001 From: root Date: Mon, 25 Mar 2013 00:05:30 -0700 Subject: Mon Mar 25 00:05:30 PDT 2013 --- community/newsbeuter/PKGBUILD | 17 ++++-- community/newsbeuter/gcc47.patch | 90 +++++++++++++++++++++++++++++++ community/newsbeuter/libjson.patch | 29 ++++++++++ community/newsbeuter/newsbeuter.changelog | 3 ++ 4 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 community/newsbeuter/gcc47.patch create mode 100644 community/newsbeuter/libjson.patch (limited to 'community/newsbeuter') diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD index 3a06787e7..3e14c70fe 100644 --- a/community/newsbeuter/PKGBUILD +++ b/community/newsbeuter/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 66351 2012-02-23 20:58:14Z jlichtblau $ +# $Id: PKGBUILD 86876 2013-03-23 23:10:35Z td123 $ # Maintainer: Jaroslav Lichtblau # Contributor: Sven Pfleiderer pkgname=newsbeuter pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A RSS feed reader for the text console with special Podcast support" arch=('i686' 'x86_64') url="http://www.newsbeuter.org/" license=('custom: MIT') -depends=('curl' 'json-c' 'libxml2' 'sqlite3' 'stfl') +depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl') makedepends=('swig' 'gettext') optdepends=('ruby') options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825') +source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz + 'gcc47.patch' + 'libjson.patch') +sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825' + '24f30f83649deb8e2e268ebd2394243eb25824701f0c576a6c20f3f64e70dd52' + '6fa9f8a814474e3262595745309c0263c7f3d40feb4ea8da29d2808ab710e781') build() { cd ${srcdir}/$pkgname-$pkgver + patch -p1 -i "${srcdir}"/gcc47.patch + patch -p1 -i "${srcdir}"/libjson.patch + make prefix=/usr } diff --git a/community/newsbeuter/gcc47.patch b/community/newsbeuter/gcc47.patch new file mode 100644 index 000000000..9cb2e1182 --- /dev/null +++ b/community/newsbeuter/gcc47.patch @@ -0,0 +1,90 @@ +diff -u -r -U5 newsbeuter-2.5/src/controller.cpp newsbeuter-2.5.includes/src/controller.cpp +--- newsbeuter-2.5/src/controller.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/controller.cpp 2012-02-18 15:57:32.525947811 -0500 +@@ -36,10 +36,11 @@ + + #include + #include + #include + #include ++#include + + #include + + #include + #include +diff -u -r -U5 newsbeuter-2.5/src/google_api.cpp newsbeuter-2.5.includes/src/google_api.cpp +--- newsbeuter-2.5/src/google_api.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/google_api.cpp 2012-02-18 15:28:32.287929217 -0500 +@@ -7,10 +7,12 @@ + #include + #include + + #include + ++#include ++ + #define GREADER_LOGIN "https://www.google.com/accounts/ClientLogin" + #define GREADER_API_PREFIX "http://www.google.com/reader/api/0/" + #define GREADER_FEED_PREFIX "http://www.google.com/reader/atom/" + + #define GREADER_SUBSCRIPTION_LIST GREADER_API_PREFIX "subscription/list" +diff -u -r -U5 newsbeuter-2.5/src/pb_controller.cpp newsbeuter-2.5.includes/src/pb_controller.cpp +--- newsbeuter-2.5/src/pb_controller.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/pb_controller.cpp 2012-02-18 15:57:48.241947978 -0500 +@@ -10,10 +10,11 @@ + #include + #include + #include + #include + #include ++#include + + #include + #include + #include + #include +diff -u -r -U5 newsbeuter-2.5/src/queueloader.cpp newsbeuter-2.5.includes/src/queueloader.cpp +--- newsbeuter-2.5/src/queueloader.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/queueloader.cpp 2012-02-18 15:57:59.472948099 -0500 +@@ -5,10 +5,11 @@ + #include + #include + #include + #include + #include ++#include + + using namespace newsbeuter; + + namespace podbeuter { + +diff -u -r -U5 newsbeuter-2.5/src/reloadthread.cpp newsbeuter-2.5.includes/src/reloadthread.cpp +--- newsbeuter-2.5/src/reloadthread.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/reloadthread.cpp 2012-02-18 15:21:21.137924605 -0500 +@@ -1,8 +1,10 @@ + #include + #include + ++#include ++ + namespace newsbeuter { + + reloadthread::reloadthread(controller * c, configcontainer * cf) : ctrl(c), oldtime(0), waittime_sec(0), suppressed_first(false), cfg(cf) { + LOG(LOG_INFO,"reloadthread: waiting %u seconds between reloads",waittime_sec); + } +diff -u -r -U5 newsbeuter-2.5/src/utils.cpp newsbeuter-2.5.includes/src/utils.cpp +--- newsbeuter-2.5/src/utils.cpp 2012-01-06 09:41:13.000000000 -0500 ++++ newsbeuter-2.5.includes/src/utils.cpp 2012-02-18 15:01:55.076912171 -0500 +@@ -8,10 +8,11 @@ + #include + #include + #include + #include + #include ++#include + + #include + #include + #include + #include diff --git a/community/newsbeuter/libjson.patch b/community/newsbeuter/libjson.patch new file mode 100644 index 000000000..7c34b5bad --- /dev/null +++ b/community/newsbeuter/libjson.patch @@ -0,0 +1,29 @@ +Description: propagate boolean json type +Apparently the libjson project decided to rename their boolean type to +json_bool... +Author: Nico Golde +Bug-Debian: http://bugs.debian.org/689225 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: vendor +Bug: http://bugs.debian.org/689225 +Bug-Debian: http://bugs.debian.org/689225 +Forwarded: + +Index: newsbeuter-2.5/src/ttrss_api.cpp +=================================================================== +--- newsbeuter-2.5.orig/src/ttrss_api.cpp 2012-09-30 17:25:23.000000000 +0200 ++++ newsbeuter-2.5/src/ttrss_api.cpp 2012-09-30 17:43:24.000000000 +0200 +@@ -220,7 +220,7 @@ + const char * link = json_object_get_string(json_object_object_get(item_obj, "link")); + const char * content = json_object_get_string(json_object_object_get(item_obj, "content")); + time_t updated = (time_t)json_object_get_int(json_object_object_get(item_obj, "updated")); +- boolean unread = json_object_get_boolean(json_object_object_get(item_obj, "unread")); ++ json_bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread")); + + rsspp::item item; + diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog index f2a048aa1..794d2b935 100644 --- a/community/newsbeuter/newsbeuter.changelog +++ b/community/newsbeuter/newsbeuter.changelog @@ -1,3 +1,6 @@ +2013-03-07 Andrea Scarpino + * ruby 2.0 rebuild + 2012-02-23 Jaroslav Lichtblau * newsbeuter 2.5-1 -- cgit v1.2.3-54-g00ecf