Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/newsbeuter/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/ruby-ncurses/PKGBUILD
	community/subtle/PKGBUILD
	extra/gegl/PKGBUILD
	extra/libebml/PKGBUILD
	extra/libmatroska/PKGBUILD
	extra/ncmpc/PKGBUILD
	extra/nx/PKGBUILD
	extra/qtwebkit/PKGBUILD

4 files changed, 133 insertions, 6 deletions

diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD
index fa0e14dca..f8ee7447d 100644
--- a/community/newsbeuter/PKGBUILD
+++ b/community/newsbeuter/PKGBUILD
@@ -1,28 +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 <dragonlord@aur.archlinux.org>
 # Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
 
 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' 'mips64el')
 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
-	newsbeuter-2.5-gcc47.patch)
+        'gcc47.patch'
+        'libjson.patch')
 sha256sums=('abc54b7bee3e062cd166787edf35aadbeb0ae1f5fcc8d955b77143aaca096825'
-	    'c48029c63cfc45d5df3bdbc4c9fd345463a61ad97f6eac797db62d63c49c6af8')
+            '24f30f83649deb8e2e268ebd2394243eb25824701f0c576a6c20f3f64e70dd52'
+            '6fa9f8a814474e3262595745309c0263c7f3d40feb4ea8da29d2808ab710e781')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/newsbeuter-2.5-gcc47.patch
+
+  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 <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>
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 <nion@debian.org>
+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 <andrea@archlinux.org>
+    * ruby 2.0 rebuild
+
 2012-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* newsbeuter 2.5-1