network/newsbeuter: Updated for version 2.6.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

6 files changed, 15 insertions, 80 deletions

diff --git a/network/newsbeuter/README b/network/newsbeuter/README
index 3e3670fd2699..d2881508914d 100644
--- a/network/newsbeuter/README
+++ b/network/newsbeuter/README
@@ -1,5 +1,5 @@
 Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
 Newsbeuter's configurability and features make it a good choice for
 users that want a fast feed reader controlled by the keyboard.
-Newsbeuter can sync with Google Reader and TinyTinyRSS, and can  
-download podcasts distributed through RSS feeds.
+Newsbeuter can sync with TinyTinyRSS and can download podcasts
+distributed through RSS feeds.
diff --git a/network/newsbeuter/json-c.diff b/network/newsbeuter/json-c.diff
deleted file mode 100644
index 49d5a5bc89bd..000000000000
--- a/network/newsbeuter/json-c.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur newsbeuter-2.5.a/src/ttrss_api.cpp newsbeuter-2.5.b/src/ttrss_api.cpp
---- newsbeuter-2.5.a/src/ttrss_api.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5.b/src/ttrss_api.cpp	2012-12-24 20:08:35.505897356 -0800
-@@ -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"));
-+		bool unread = json_object_get_boolean(json_object_object_get(item_obj, "unread"));
- 
- 		rsspp::item item;
- 
diff --git a/network/newsbeuter/newsbeuter.SlackBuild b/network/newsbeuter/newsbeuter.SlackBuild
index 5fb4e8a2d292..97e4b407fba8 100644
--- a/network/newsbeuter/newsbeuter.SlackBuild
+++ b/network/newsbeuter/newsbeuter.SlackBuild
@@ -6,8 +6,8 @@
 # Released under the WTFPL
 
 PRGNAM=newsbeuter
-VERSION=${VERSION:-2.5}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.6}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 case "$( uname -m )" in
@@ -50,11 +50,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
   -o -perm 400 \) -exec chmod 644 {} \;
 
-# patch for GCC header changes
-patch -p1 --verbose < $CWD/unistd.diff
-# patch for json-c api change
-patch -p1 --verbose < $CWD/json-c.diff
-
 CXXFLAGS="$SLKCFLAGS" \
 make \
   prefix=/usr \
diff --git a/network/newsbeuter/newsbeuter.info b/network/newsbeuter/newsbeuter.info
index 33e6faed1d81..40caf5eec267 100644
--- a/network/newsbeuter/newsbeuter.info
+++ b/network/newsbeuter/newsbeuter.info
@@ -1,10 +1,10 @@
 PRGNAM="newsbeuter"
-VERSION="2.5"
+VERSION="2.6"
 HOMEPAGE="http://www.newsbeuter.org/"
-DOWNLOAD="http://www.newsbeuter.org/downloads/newsbeuter-2.5.tar.gz"
-MD5SUM="bb8cd3f2a3693de4c16be28c869a1f75"
+DOWNLOAD="http://www.newsbeuter.org/downloads/newsbeuter-2.6.tar.gz"
+MD5SUM="4a36627c5fabca6b2718a0ac78e6666f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="json-c stfl"
 MAINTAINER="Benjamin Trigona-Harany"
-EMAIL="bosth@alumni.sfu.ca"
+EMAIL="slackbuilds@jaxartes.net"
diff --git a/network/newsbeuter/slack-desc b/network/newsbeuter/slack-desc
index ba5ed3d5d31a..61ee071c747b 100644
--- a/network/newsbeuter/slack-desc
+++ b/network/newsbeuter/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
 newsbeuter: Newsbeuter (RSS feedreader)
@@ -11,8 +11,8 @@ newsbeuter:
 newsbeuter: Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
 newsbeuter: Newsbeuter's configurability and features make it a good choice for
 newsbeuter: users that want a fast feed reader controlled by the keyboard.
-newsbeuter: Newsbeuter can sync with Google Reader and TinyTinyRSS, and can
-newsbeuter: download podcasts distributed through RSS feeds.
+newsbeuter: Newsbeuter can sync with TinyTinyRSS and can download podcasts
+newsbeuter: distributed through RSS feeds.
 newsbeuter:
 newsbeuter:
 newsbeuter: Homepage: http://www.newsbeuter.org/
diff --git a/network/newsbeuter/unistd.diff b/network/newsbeuter/unistd.diff
deleted file mode 100644
index c8c81d034e15..000000000000
--- a/network/newsbeuter/unistd.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur newsbeuter-2.5.orig/src/controller.cpp newsbeuter-2.5/src/controller.cpp
---- newsbeuter-2.5.orig/src/controller.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5/src/controller.cpp	2012-04-15 00:21:24.642248190 -0700
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <config.h>
- #include <view.h>
- #include <controller.h>
-diff -Naur newsbeuter-2.5.orig/src/google_api.cpp newsbeuter-2.5/src/google_api.cpp
---- newsbeuter-2.5.orig/src/google_api.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5/src/google_api.cpp	2012-04-15 00:21:43.357248631 -0700
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <vector>
- #include <cstring>
- #include <iostream>
-diff -Naur newsbeuter-2.5.orig/src/pb_controller.cpp newsbeuter-2.5/src/pb_controller.cpp
---- newsbeuter-2.5.orig/src/pb_controller.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5/src/pb_controller.cpp	2012-04-15 00:22:24.230249617 -0700
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <pb_controller.h>
- #include <pb_view.h>
- #include <poddlthread.h>
-diff -Naur newsbeuter-2.5.orig/src/queueloader.cpp newsbeuter-2.5/src/queueloader.cpp
---- newsbeuter-2.5.orig/src/queueloader.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5/src/queueloader.cpp	2012-04-15 00:30:41.627260915 -0700
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <stflpp.h>
- #include <utils.h>
- #include <queueloader.h>
-diff -Naur newsbeuter-2.5.orig/src/reloadthread.cpp newsbeuter-2.5/src/reloadthread.cpp
---- newsbeuter-2.5.orig/src/reloadthread.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5/src/reloadthread.cpp	2012-04-15 00:21:18.934248123 -0700
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <reloadthread.h>
- #include <logger.h>
- 
-diff -Naur newsbeuter-2.5.orig/src/utils.cpp newsbeuter-2.5/src/utils.cpp
---- newsbeuter-2.5.orig/src/utils.cpp	2012-01-06 06:41:13.000000000 -0800
-+++ newsbeuter-2.5/src/utils.cpp	2012-04-15 00:20:23.038246866 -0700
-@@ -1,3 +1,4 @@
-+#include <unistd.h>
- #include <utils.h>
- #include <logger.h>
- #include <config.h>