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

Conflicts:
	community/fcitx-chewing/PKGBUILD
	community/fcitx-cloudpinyin/PKGBUILD
	community/fcitx-rime/PKGBUILD
	community/linux-tools/PKGBUILD
	community/lxpanel/PKGBUILD
	community/pdns/PKGBUILD
	core/bash/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	extra/json-c/PKGBUILD
	extra/liblouis/PKGBUILD
	extra/live-media/PKGBUILD
	extra/samba/PKGBUILD
	extra/transmission/PKGBUILD
	social/opentracker/PKGBUILD

4 files changed, 64 insertions, 4 deletions

diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
index b9f22e14c..476a1c3e2 100644
--- a/community/gwibber/PKGBUILD
+++ b/community/gwibber/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79486 2012-11-06 04:11:00Z bgyorgy $
+# $Id: PKGBUILD 83023 2013-01-26 16:24:38Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gwibber
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gwibber.com/"
@@ -12,13 +12,24 @@ depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtk
 makedepends=('intltool' 'vala')
 options=('!libtool')
 install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('5988e36e9f592c6eca6537ba6878307a')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
+        lp_934530.patch
+        lp_1051801.patch
+        lp_1088775.patch)
+md5sums=('5988e36e9f592c6eca6537ba6878307a'
+         '8c43ae0ed96c52602befeff640a8672a'
+         '0eb53f4f248a6c600b6c6dfaac12341f'
+         '5698a3b1699c018719b193362486c9b5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
+  # Apply some fixes from Ubuntu
+  patch -Np1 -i "$srcdir/lp_934530.patch"
+  patch -Np1 -i "$srcdir/lp_1051801.patch"
+  patch -Np1 -i "$srcdir/lp_1088775.patch"
+
   # Use the standalone accounts configuration panel
   sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala
   sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py
diff --git a/community/gwibber/lp_1051801.patch b/community/gwibber/lp_1051801.patch
new file mode 100644
index 000000000..706c79e54
--- /dev/null
+++ b/community/gwibber/lp_1051801.patch
@@ -0,0 +1,12 @@
+=== modified file 'bin/gwibber-service'
+--- old/bin/gwibber-service	2012-02-13 20:39:02 +0000
++++ new/bin/gwibber-service	2012-09-20 06:35:40 +0000
+@@ -74,6 +74,7 @@
+ message_monitor = dispatcher.MessagesMonitor()
+ """
+ 
++dbus.mainloop.glib.threads_init()
+ logger.debug("Setting up monitors")
+ connection_monitor = dispatcher.ConnectionMonitor()
+ urlshortener = dispatcher.URLShorten()
+
diff --git a/community/gwibber/lp_1088775.patch b/community/gwibber/lp_1088775.patch
new file mode 100644
index 000000000..2f3b318d0
--- /dev/null
+++ b/community/gwibber/lp_1088775.patch
@@ -0,0 +1,16 @@
+=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
+--- old/gwibber/microblog/plugins/facebook/__init__.py	2012-09-24 20:55:20 +0000
++++ new/gwibber/microblog/plugins/facebook/__init__.py	2013-01-14 15:41:35 +0000
+@@ -326,7 +326,10 @@
+     
+     if data.has_key("privacy"):
+       m["privacy"] = {}
+-      m["privacy"]["description"] = data["privacy"]["description"]
++      if data["privacy"].has_key("description"):
++        m["privacy"]["description"] = data["privacy"]["description"]
++      else:
++        m["privacy"]["description"] = ""
+       m["privacy"]["value"] = data["privacy"]["value"]
+ 
+     # Handle target for wall posts with a specific recipient
+
diff --git a/community/gwibber/lp_934530.patch b/community/gwibber/lp_934530.patch
new file mode 100644
index 000000000..6f2bd4302
--- /dev/null
+++ b/community/gwibber/lp_934530.patch
@@ -0,0 +1,21 @@
+=== modified file 'gwibber/microblog/network.py'
+--- old/gwibber/microblog/network.py	2012-03-31 15:02:54 +0000
++++ new/gwibber/microblog/network.py	2012-06-13 16:48:52 +0000
+@@ -37,8 +37,14 @@
+       logger.error("HTTP Error for %s - error code: %s", e.geturl().split("?")[0], e.getcode())
+       self.res = "HTTP error: {0}".format(e.getcode())
+     except urllib2.URLError, e:
+-      logger.error("Network failure: %s", e.reason)
+-      self.res = "Network error: {0}".format(e.reason)
++      logger.error("Network failure: %s", e.message)
++      self.res = "Network error: {0}".format(e.message)
++    except IOError, e:
++      logger.error("Network failure: %s", e.message)
++      self.res = "Network error: {0}".format(e.message)
++    except:
++      logger.error("Network failure: UNKNOWN")
++      self.res = "Network error: UNKNOWN"
+ 
+   def get_json(self):
+     try:
+