Date: Thursday, March 7, 2013 @ 08:35:12
Author: andrea
Revision: 85782
upgpkg: newsbeuter 2.5-2
ruby rebuild
Added:
newsbeuter/trunk/gcc47.patch
newsbeuter/trunk/libjson.patch
Modified:
newsbeuter/trunk/PKGBUILD
newsbeuter/trunk/newsbeuter.changelog
----------------------+
PKGBUILD | 13 +++++--
gcc47.patch | 90 +++++++++++++++++++++++++++++++++++++++++++++++++
libjson.patch | 29 +++++++++++++++
newsbeuter.changelog | 3 +
4 files changed, 132 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-07 07:29:48 UTC (rev 85781)
+++ PKGBUILD 2013-03-07 07:35:12 UTC (rev 85782)
@@ -4,7 +4,7 @@
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/";
@@ -15,12 +15,19 @@
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
}
Added: gcc47.patch
===================================================================
--- gcc47.patch (rev 0)
+++ gcc47.patch 2013-03-07 07:35:12 UTC (rev 85782)
@@ -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 <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
++#include <unistd.h>
+
+ #include <ncurses.h>
+
+ #include <libxml/xmlversion.h>
+ #include <libxml/parser.h>
+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 <config.h>
+ #include <utils.h>
+
+ #include <curl/curl.h>
+
++#include <unistd.h>
++
+ #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 <sys/stat.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ #include <cstdlib>
+ #include <signal.h>
++#include <unistd.h>
+
+ #include <keymap.h>
+ #include <configcontainer.h>
+ #include <colormanager.h>
+ #include <exceptions.h>
+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 <logger.h>
+ #include <fstream>
+ #include <cstring>
+ #include <config.h>
+ #include <libgen.h>
++#include <unistd.h>
+
+ 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 <reloadthread.h>
+ #include <logger.h>
+
++#include <unistd.h>
++
+ 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 <iconv.h>
+ #include <errno.h>
+ #include <pwd.h>
+ #include <libgen.h>
+ #include <sys/utsname.h>
++#include <unistd.h>
+
+ #include <sstream>
+ #include <locale>
+ #include <cwchar>
+ #include <cstring>
Added: libjson.patch
===================================================================
--- libjson.patch (rev 0)
+++ libjson.patch 2013-03-07 07:35:12 UTC (rev 85782)
@@ -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 <[email protected]>
+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;
+
Modified: newsbeuter.changelog
===================================================================
--- newsbeuter.changelog 2013-03-07 07:29:48 UTC (rev 85781)
+++ newsbeuter.changelog 2013-03-07 07:35:12 UTC (rev 85782)
@@ -1,3 +1,6 @@
+2013-03-07 Andrea Scarpino <[email protected]>
+ * ruby 2.0 rebuild
+
2012-02-23 Jaroslav Lichtblau <[email protected]>
* newsbeuter 2.5-1
