Date: Monday, April 22, 2013 @ 00:16:47 Author: heftig Revision: 88679
db-move: moved gwibber from [community-testing] to [community] (i686, x86_64) Added: gwibber/repos/community-i686/PKGBUILD (from rev 88672, gwibber/repos/community-testing-i686/PKGBUILD) gwibber/repos/community-i686/gtkspell3-port.patch (from rev 88672, gwibber/repos/community-testing-i686/gtkspell3-port.patch) gwibber/repos/community-i686/gwibber.install (from rev 88672, gwibber/repos/community-testing-i686/gwibber.install) gwibber/repos/community-i686/lp_1051801.patch (from rev 88672, gwibber/repos/community-testing-i686/lp_1051801.patch) gwibber/repos/community-i686/lp_1088775.patch (from rev 88672, gwibber/repos/community-testing-i686/lp_1088775.patch) gwibber/repos/community-i686/lp_934530.patch (from rev 88672, gwibber/repos/community-testing-i686/lp_934530.patch) gwibber/repos/community-x86_64/PKGBUILD (from rev 88672, gwibber/repos/community-testing-x86_64/PKGBUILD) gwibber/repos/community-x86_64/gtkspell3-port.patch (from rev 88672, gwibber/repos/community-testing-x86_64/gtkspell3-port.patch) gwibber/repos/community-x86_64/gwibber.install (from rev 88672, gwibber/repos/community-testing-x86_64/gwibber.install) gwibber/repos/community-x86_64/lp_1051801.patch (from rev 88672, gwibber/repos/community-testing-x86_64/lp_1051801.patch) gwibber/repos/community-x86_64/lp_1088775.patch (from rev 88672, gwibber/repos/community-testing-x86_64/lp_1088775.patch) gwibber/repos/community-x86_64/lp_934530.patch (from rev 88672, gwibber/repos/community-testing-x86_64/lp_934530.patch) Deleted: gwibber/repos/community-i686/PKGBUILD gwibber/repos/community-i686/gtkspell3-port.patch gwibber/repos/community-i686/gwibber.install gwibber/repos/community-i686/lp_1051801.patch gwibber/repos/community-i686/lp_1088775.patch gwibber/repos/community-i686/lp_934530.patch gwibber/repos/community-testing-i686/ gwibber/repos/community-testing-x86_64/ gwibber/repos/community-x86_64/PKGBUILD gwibber/repos/community-x86_64/gtkspell3-port.patch gwibber/repos/community-x86_64/gwibber.install gwibber/repos/community-x86_64/lp_1051801.patch gwibber/repos/community-x86_64/lp_1088775.patch gwibber/repos/community-x86_64/lp_934530.patch ---------------------------------------+ /PKGBUILD | 112 ++++++++++++++++++++++++++++++++ /gtkspell3-port.patch | 58 ++++++++++++++++ /gwibber.install | 24 ++++++ /lp_1051801.patch | 24 ++++++ /lp_1088775.patch | 32 +++++++++ /lp_934530.patch | 42 ++++++++++++ community-i686/PKGBUILD | 56 ---------------- community-i686/gtkspell3-port.patch | 29 -------- community-i686/gwibber.install | 12 --- community-i686/lp_1051801.patch | 12 --- community-i686/lp_1088775.patch | 16 ---- community-i686/lp_934530.patch | 21 ------ community-x86_64/PKGBUILD | 56 ---------------- community-x86_64/gtkspell3-port.patch | 29 -------- community-x86_64/gwibber.install | 12 --- community-x86_64/lp_1051801.patch | 12 --- community-x86_64/lp_1088775.patch | 16 ---- community-x86_64/lp_934530.patch | 21 ------ 18 files changed, 292 insertions(+), 292 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-04-21 22:16:45 UTC (rev 88678) +++ community-i686/PKGBUILD 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,56 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=gwibber -pkgver=3.6.0 -pkgrel=3 -pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" -arch=('i686' 'x86_64') -url="http://gwibber.com/" -license=('GPL') -depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') -makedepends=('intltool' 'vala') -options=('!libtool') -install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - lp_934530.patch - lp_1051801.patch - lp_1088775.patch - gtkspell3-port.patch) -md5sums=('5988e36e9f592c6eca6537ba6878307a' - '8c43ae0ed96c52602befeff640a8672a' - '0eb53f4f248a6c600b6c6dfaac12341f' - '5698a3b1699c018719b193362486c9b5' - 'e8c657543542d8141fdfe4b87a24d7fe') - -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" - - # Port to the new gtkspell3 - patch -Np1 -i "$srcdir/gtkspell3-port.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 - - # Remove unneeded dependency on libdbusmenu - sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} - - autoreconf -fi - intltoolize --force - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static --disable-schemas-compile --disable-unity - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} Copied: gwibber/repos/community-i686/PKGBUILD (from rev 88672, gwibber/repos/community-testing-i686/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-04-21 22:16:47 UTC (rev 88679) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gwibber +pkgver=3.6.0 +pkgrel=4 +pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" +arch=('i686' 'x86_64') +url="http://gwibber.com/" +license=('GPL') +depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') +makedepends=('intltool' 'vala') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + lp_934530.patch + lp_1051801.patch + lp_1088775.patch + gtkspell3-port.patch) +md5sums=('5988e36e9f592c6eca6537ba6878307a' + '8c43ae0ed96c52602befeff640a8672a' + '0eb53f4f248a6c600b6c6dfaac12341f' + '5698a3b1699c018719b193362486c9b5' + 'e8c657543542d8141fdfe4b87a24d7fe') + +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" + + # Port to the new gtkspell3 + patch -Np1 -i "$srcdir/gtkspell3-port.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 + + # Remove unneeded dependency on libdbusmenu + sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} + + autoreconf -fi + intltoolize --force + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static --disable-schemas-compile --disable-unity + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} Deleted: community-i686/gtkspell3-port.patch =================================================================== --- community-i686/gtkspell3-port.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-i686/gtkspell3-port.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,29 +0,0 @@ -diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac ---- gwibber-3.6.0.orig/configure.ac 2012-10-03 02:09:08.000000000 +0200 -+++ gwibber-3.6.0/configure.ac 2013-03-28 21:34:39.227995294 +0100 -@@ -159,10 +159,10 @@ - - if test "x$enable_spell" = "xyes"; then - PKG_CHECK_MODULES(GTKSPELL, -- gtkspell-3.0) -+ gtkspell3-3.0) - AC_SUBST(GTKSPELL_CFLAGS) - AC_SUBST(GTKSPELL_CFLAGS) -- GTKSPELL_PKG="--pkg gtkspell-3.0" -+ GTKSPELL_PKG="--pkg gtkspell3-3.0" - AC_SUBST(GTKSPELL_PKG) - fi - -diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala ---- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala 2012-08-21 06:14:19.000000000 +0200 -+++ gwibber-3.6.0/libgwibber-gtk/entry.vala 2013-03-28 21:36:32.830637428 +0100 -@@ -141,7 +141,8 @@ - #if HAVE_GTKSPELL - try - { -- var spell = new Gtk.Spell.attach(this, null); -+ var spell = new GtkSpell.Checker(); -+ spell.attach(this); - } - catch (Error e) - { Copied: gwibber/repos/community-i686/gtkspell3-port.patch (from rev 88672, gwibber/repos/community-testing-i686/gtkspell3-port.patch) =================================================================== --- community-i686/gtkspell3-port.patch (rev 0) +++ community-i686/gtkspell3-port.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -0,0 +1,29 @@ +diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac +--- gwibber-3.6.0.orig/configure.ac 2012-10-03 02:09:08.000000000 +0200 ++++ gwibber-3.6.0/configure.ac 2013-03-28 21:34:39.227995294 +0100 +@@ -159,10 +159,10 @@ + + if test "x$enable_spell" = "xyes"; then + PKG_CHECK_MODULES(GTKSPELL, +- gtkspell-3.0) ++ gtkspell3-3.0) + AC_SUBST(GTKSPELL_CFLAGS) + AC_SUBST(GTKSPELL_CFLAGS) +- GTKSPELL_PKG="--pkg gtkspell-3.0" ++ GTKSPELL_PKG="--pkg gtkspell3-3.0" + AC_SUBST(GTKSPELL_PKG) + fi + +diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala +--- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala 2012-08-21 06:14:19.000000000 +0200 ++++ gwibber-3.6.0/libgwibber-gtk/entry.vala 2013-03-28 21:36:32.830637428 +0100 +@@ -141,7 +141,8 @@ + #if HAVE_GTKSPELL + try + { +- var spell = new Gtk.Spell.attach(this, null); ++ var spell = new GtkSpell.Checker(); ++ spell.attach(this); + } + catch (Error e) + { Deleted: community-i686/gwibber.install =================================================================== --- community-i686/gwibber.install 2013-04-21 22:16:45 UTC (rev 88678) +++ community-i686/gwibber.install 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Copied: gwibber/repos/community-i686/gwibber.install (from rev 88672, gwibber/repos/community-testing-i686/gwibber.install) =================================================================== --- community-i686/gwibber.install (rev 0) +++ community-i686/gwibber.install 2013-04-21 22:16:47 UTC (rev 88679) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} Deleted: community-i686/lp_1051801.patch =================================================================== --- community-i686/lp_1051801.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-i686/lp_1051801.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,12 +0,0 @@ -=== 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() - Copied: gwibber/repos/community-i686/lp_1051801.patch (from rev 88672, gwibber/repos/community-testing-i686/lp_1051801.patch) =================================================================== --- community-i686/lp_1051801.patch (rev 0) +++ community-i686/lp_1051801.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -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() + Deleted: community-i686/lp_1088775.patch =================================================================== --- community-i686/lp_1088775.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-i686/lp_1088775.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,16 +0,0 @@ -=== 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 - Copied: gwibber/repos/community-i686/lp_1088775.patch (from rev 88672, gwibber/repos/community-testing-i686/lp_1088775.patch) =================================================================== --- community-i686/lp_1088775.patch (rev 0) +++ community-i686/lp_1088775.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -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 + Deleted: community-i686/lp_934530.patch =================================================================== --- community-i686/lp_934530.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-i686/lp_934530.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,21 +0,0 @@ -=== 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: - Copied: gwibber/repos/community-i686/lp_934530.patch (from rev 88672, gwibber/repos/community-testing-i686/lp_934530.patch) =================================================================== --- community-i686/lp_934530.patch (rev 0) +++ community-i686/lp_934530.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -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: + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-04-21 22:16:45 UTC (rev 88678) +++ community-x86_64/PKGBUILD 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,56 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=gwibber -pkgver=3.6.0 -pkgrel=3 -pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" -arch=('i686' 'x86_64') -url="http://gwibber.com/" -license=('GPL') -depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') -makedepends=('intltool' 'vala') -options=('!libtool') -install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - lp_934530.patch - lp_1051801.patch - lp_1088775.patch - gtkspell3-port.patch) -md5sums=('5988e36e9f592c6eca6537ba6878307a' - '8c43ae0ed96c52602befeff640a8672a' - '0eb53f4f248a6c600b6c6dfaac12341f' - '5698a3b1699c018719b193362486c9b5' - 'e8c657543542d8141fdfe4b87a24d7fe') - -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" - - # Port to the new gtkspell3 - patch -Np1 -i "$srcdir/gtkspell3-port.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 - - # Remove unneeded dependency on libdbusmenu - sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} - - autoreconf -fi - intltoolize --force - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static --disable-schemas-compile --disable-unity - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} Copied: gwibber/repos/community-x86_64/PKGBUILD (from rev 88672, gwibber/repos/community-testing-x86_64/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-04-21 22:16:47 UTC (rev 88679) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gwibber +pkgver=3.6.0 +pkgrel=4 +pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" +arch=('i686' 'x86_64') +url="http://gwibber.com/" +license=('GPL') +depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') +makedepends=('intltool' 'vala') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + lp_934530.patch + lp_1051801.patch + lp_1088775.patch + gtkspell3-port.patch) +md5sums=('5988e36e9f592c6eca6537ba6878307a' + '8c43ae0ed96c52602befeff640a8672a' + '0eb53f4f248a6c600b6c6dfaac12341f' + '5698a3b1699c018719b193362486c9b5' + 'e8c657543542d8141fdfe4b87a24d7fe') + +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" + + # Port to the new gtkspell3 + patch -Np1 -i "$srcdir/gtkspell3-port.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 + + # Remove unneeded dependency on libdbusmenu + sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} + + autoreconf -fi + intltoolize --force + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static --disable-schemas-compile --disable-unity + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} Deleted: community-x86_64/gtkspell3-port.patch =================================================================== --- community-x86_64/gtkspell3-port.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-x86_64/gtkspell3-port.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,29 +0,0 @@ -diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac ---- gwibber-3.6.0.orig/configure.ac 2012-10-03 02:09:08.000000000 +0200 -+++ gwibber-3.6.0/configure.ac 2013-03-28 21:34:39.227995294 +0100 -@@ -159,10 +159,10 @@ - - if test "x$enable_spell" = "xyes"; then - PKG_CHECK_MODULES(GTKSPELL, -- gtkspell-3.0) -+ gtkspell3-3.0) - AC_SUBST(GTKSPELL_CFLAGS) - AC_SUBST(GTKSPELL_CFLAGS) -- GTKSPELL_PKG="--pkg gtkspell-3.0" -+ GTKSPELL_PKG="--pkg gtkspell3-3.0" - AC_SUBST(GTKSPELL_PKG) - fi - -diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala ---- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala 2012-08-21 06:14:19.000000000 +0200 -+++ gwibber-3.6.0/libgwibber-gtk/entry.vala 2013-03-28 21:36:32.830637428 +0100 -@@ -141,7 +141,8 @@ - #if HAVE_GTKSPELL - try - { -- var spell = new Gtk.Spell.attach(this, null); -+ var spell = new GtkSpell.Checker(); -+ spell.attach(this); - } - catch (Error e) - { Copied: gwibber/repos/community-x86_64/gtkspell3-port.patch (from rev 88672, gwibber/repos/community-testing-x86_64/gtkspell3-port.patch) =================================================================== --- community-x86_64/gtkspell3-port.patch (rev 0) +++ community-x86_64/gtkspell3-port.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -0,0 +1,29 @@ +diff -Naur gwibber-3.6.0.orig/configure.ac gwibber-3.6.0/configure.ac +--- gwibber-3.6.0.orig/configure.ac 2012-10-03 02:09:08.000000000 +0200 ++++ gwibber-3.6.0/configure.ac 2013-03-28 21:34:39.227995294 +0100 +@@ -159,10 +159,10 @@ + + if test "x$enable_spell" = "xyes"; then + PKG_CHECK_MODULES(GTKSPELL, +- gtkspell-3.0) ++ gtkspell3-3.0) + AC_SUBST(GTKSPELL_CFLAGS) + AC_SUBST(GTKSPELL_CFLAGS) +- GTKSPELL_PKG="--pkg gtkspell-3.0" ++ GTKSPELL_PKG="--pkg gtkspell3-3.0" + AC_SUBST(GTKSPELL_PKG) + fi + +diff -Naur gwibber-3.6.0.orig/libgwibber-gtk/entry.vala gwibber-3.6.0/libgwibber-gtk/entry.vala +--- gwibber-3.6.0.orig/libgwibber-gtk/entry.vala 2012-08-21 06:14:19.000000000 +0200 ++++ gwibber-3.6.0/libgwibber-gtk/entry.vala 2013-03-28 21:36:32.830637428 +0100 +@@ -141,7 +141,8 @@ + #if HAVE_GTKSPELL + try + { +- var spell = new Gtk.Spell.attach(this, null); ++ var spell = new GtkSpell.Checker(); ++ spell.attach(this); + } + catch (Error e) + { Deleted: community-x86_64/gwibber.install =================================================================== --- community-x86_64/gwibber.install 2013-04-21 22:16:45 UTC (rev 88678) +++ community-x86_64/gwibber.install 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Copied: gwibber/repos/community-x86_64/gwibber.install (from rev 88672, gwibber/repos/community-testing-x86_64/gwibber.install) =================================================================== --- community-x86_64/gwibber.install (rev 0) +++ community-x86_64/gwibber.install 2013-04-21 22:16:47 UTC (rev 88679) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} Deleted: community-x86_64/lp_1051801.patch =================================================================== --- community-x86_64/lp_1051801.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-x86_64/lp_1051801.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,12 +0,0 @@ -=== 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() - Copied: gwibber/repos/community-x86_64/lp_1051801.patch (from rev 88672, gwibber/repos/community-testing-x86_64/lp_1051801.patch) =================================================================== --- community-x86_64/lp_1051801.patch (rev 0) +++ community-x86_64/lp_1051801.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -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() + Deleted: community-x86_64/lp_1088775.patch =================================================================== --- community-x86_64/lp_1088775.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-x86_64/lp_1088775.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,16 +0,0 @@ -=== 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 - Copied: gwibber/repos/community-x86_64/lp_1088775.patch (from rev 88672, gwibber/repos/community-testing-x86_64/lp_1088775.patch) =================================================================== --- community-x86_64/lp_1088775.patch (rev 0) +++ community-x86_64/lp_1088775.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -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 + Deleted: community-x86_64/lp_934530.patch =================================================================== --- community-x86_64/lp_934530.patch 2013-04-21 22:16:45 UTC (rev 88678) +++ community-x86_64/lp_934530.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -1,21 +0,0 @@ -=== 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: - Copied: gwibber/repos/community-x86_64/lp_934530.patch (from rev 88672, gwibber/repos/community-testing-x86_64/lp_934530.patch) =================================================================== --- community-x86_64/lp_934530.patch (rev 0) +++ community-x86_64/lp_934530.patch 2013-04-21 22:16:47 UTC (rev 88679) @@ -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: +