[arch-commits] Commit in gwibber/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Sat Jan 26 16:24:27 UTC 2013
Date: Saturday, January 26, 2013 @ 17:24:26
Author: bgyorgy
Revision: 83022
upgpkg: gwibber 3.6.0-2
Add some fixes from Ubuntu
Added:
gwibber/trunk/lp_1051801.patch
gwibber/trunk/lp_1088775.patch
gwibber/trunk/lp_934530.patch
Modified:
gwibber/trunk/PKGBUILD
------------------+
PKGBUILD | 17 ++++++++++++++---
lp_1051801.patch | 12 ++++++++++++
lp_1088775.patch | 16 ++++++++++++++++
lp_934530.patch | 21 +++++++++++++++++++++
4 files changed, 63 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-01-26 16:00:34 UTC (rev 83021)
+++ PKGBUILD 2013-01-26 16:24:26 UTC (rev 83022)
@@ -3,7 +3,7 @@
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')
url="http://gwibber.com/"
@@ -12,13 +12,24 @@
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
Added: lp_1051801.patch
===================================================================
--- lp_1051801.patch (rev 0)
+++ lp_1051801.patch 2013-01-26 16:24:26 UTC (rev 83022)
@@ -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()
+
Added: lp_1088775.patch
===================================================================
--- lp_1088775.patch (rev 0)
+++ lp_1088775.patch 2013-01-26 16:24:26 UTC (rev 83022)
@@ -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
+
Added: lp_934530.patch
===================================================================
--- lp_934530.patch (rev 0)
+++ lp_934530.patch 2013-01-26 16:24:26 UTC (rev 83022)
@@ -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:
+
More information about the arch-commits
mailing list