diff options
Diffstat (limited to 'community/gwibber')
| -rw-r--r-- | community/gwibber/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/gwibber/gtkspell3-port.patch | 29 | ||||
| -rw-r--r-- | community/gwibber/lp_959068.patch | 27 |
3 files changed, 41 insertions, 32 deletions
diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index 476a1c3e2..1bb2f3054 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 83023 2013-01-26 16:24:38Z bgyorgy $ +# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=gwibber pkgver=3.6.0 -pkgrel=2 +pkgrel=4 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/" 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') +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) + lp_1088775.patch + gtkspell3-port.patch) md5sums=('5988e36e9f592c6eca6537ba6878307a' '8c43ae0ed96c52602befeff640a8672a' '0eb53f4f248a6c600b6c6dfaac12341f' - '5698a3b1699c018719b193362486c9b5') + '5698a3b1699c018719b193362486c9b5' + 'e8c657543542d8141fdfe4b87a24d7fe') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,6 +32,9 @@ build() { 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 @@ -37,6 +42,8 @@ build() { # 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 diff --git a/community/gwibber/gtkspell3-port.patch b/community/gwibber/gtkspell3-port.patch new file mode 100644 index 000000000..a7cc5da37 --- /dev/null +++ b/community/gwibber/gtkspell3-port.patch @@ -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) + { diff --git a/community/gwibber/lp_959068.patch b/community/gwibber/lp_959068.patch deleted file mode 100644 index 66b288ba7..000000000 --- a/community/gwibber/lp_959068.patch +++ /dev/null @@ -1,27 +0,0 @@ -=== modified file 'libgwibber/streams.vala' ---- old/libgwibber/streams.vala 2012-03-19 13:35:30 +0000 -+++ new/libgwibber/streams.vala 2012-04-04 20:53:49 +0000 -@@ -213,13 +213,21 @@ - model = create_model (); - } - model.row_removed.connect((_m, _i) => { -+ var to_remove = new GLib.List <string> (); - foreach (var v in seen.entries) - { - if (v.value == _i) - { -- seen.unset(v.key); -+ /* defer calling unset until after we are done iterating -+ * the HashMap, it will resize making the iterator invalid -+ * This is fixed in the 0.7 series of libgee -+ * https://bugzilla.gnome.org/show_bug.cgi?id=671327 -+ */ -+ to_remove.prepend (v.key); - } - } -+ foreach (var v in to_remove) -+ seen.unset(v); - }); - Idle.add(() => { - refresh_model_async.begin (); - |