Tue Oct 1 03:05:59 PDT 2013

2 files changed, 41 insertions, 7 deletions

diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD
index 6bf243222..cda7de6b6 100644
--- a/community/gwibber/PKGBUILD
+++ b/community/gwibber/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $
+# $Id: PKGBUILD 97853 2013-09-30 10:27:58Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gwibber
 pkgver=3.6.0
-pkgrel=4
+pkgrel=5
 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')
+depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf')
 makedepends=('intltool' 'vala')
 options=('!libtool')
 install=$pkgname.install
@@ -16,14 +16,16 @@ source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$p
         lp_934530.patch
         lp_1051801.patch
         lp_1088775.patch
-        gtkspell3-port.patch)
+        gtkspell3-port.patch
+        gwibber-pillow.patch)
 md5sums=('5988e36e9f592c6eca6537ba6878307a'
          '8c43ae0ed96c52602befeff640a8672a'
          '0eb53f4f248a6c600b6c6dfaac12341f'
          '5698a3b1699c018719b193362486c9b5'
-         'e8c657543542d8141fdfe4b87a24d7fe')
+         'e8c657543542d8141fdfe4b87a24d7fe'
+         '8380d55786490965dfad37be09216dcb')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
@@ -35,6 +37,9 @@ build() {
   # Port to the new gtkspell3
   patch -Np1 -i "$srcdir/gtkspell3-port.patch"
 
+  # Port to python-pillow
+  patch -Np1 -i "$srcdir/gwibber-pillow.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
@@ -42,6 +47,12 @@ build() {
   # Remove unneeded dependency on libdbusmenu
   sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in}
 
+  # Fix libaccounts-glib dependency
+  sed -i 's/--pkg accounts/--pkg libaccounts-glib/' */Makefile.{am,in} */*/Makefile.{am,in}
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
   autoreconf -fi
   intltoolize --force
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
@@ -51,6 +62,5 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/gwibber/gwibber-pillow.patch b/community/gwibber/gwibber-pillow.patch
new file mode 100644
index 000000000..211d22e73
--- /dev/null
+++ b/community/gwibber/gwibber-pillow.patch
@@ -0,0 +1,24 @@
+diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py gwibber-3.6.0/gwibber/microblog/util/imagehandler.py
+--- gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py	2012-08-21 06:14:09.000000000 +0200
++++ gwibber-3.6.0/gwibber/microblog/util/imagehandler.py	2013-09-15 15:03:07.056371930 +0200
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ 
+-import os, hashlib, urllib2, Image
++import os, hashlib, urllib2
++from PIL import Image
+ 
+ DEFAULT_AVATAR = 'http://digg.com/img/udl.png'
+ 
+diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/resources.py gwibber-3.6.0/gwibber/microblog/util/resources.py
+--- gwibber-3.6.0.orig/gwibber/microblog/util/resources.py	2012-08-21 06:14:09.000000000 +0200
++++ gwibber-3.6.0/gwibber/microblog/util/resources.py	2013-09-15 15:02:36.825648020 +0200
+@@ -8,7 +8,7 @@
+ from hashlib import sha1
+ from os import makedirs, remove, environ
+ from os.path import join, isdir, realpath, exists
+-import Image
++from PIL import Image
+ from datetime import datetime
+ from gwibber.microblog import network
+ from gwibber.microblog.util.const import *