Date: Tuesday, August 12, 2014 @ 03:19:58 Author: bgyorgy Revision: 117224
upgpkg: synapse 0.2.10-7 Port to gee-0.8 (upstream source: http://bazaar.launchpad.net/~synapse-core/synapse-project/trunk/revision/524 ) Added: synapse/trunk/gee-0.8.patch Modified: synapse/trunk/PKGBUILD ---------------+ PKGBUILD | 20 +++++++++--- gee-0.8.patch | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-12 01:00:11 UTC (rev 117223) +++ PKGBUILD 2014-08-12 01:19:58 UTC (rev 117224) @@ -4,12 +4,12 @@ pkgname=synapse pkgver=0.2.10 -pkgrel=6 +pkgrel=7 pkgdesc="A semantic file launcher" arch=('i686' 'x86_64') url="https://launchpad.net/synapse-project"; license=('GPL3') -depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee06' 'libnotify' \ +depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \ 'libunique' 'libzeitgeist' 'rest' 'xdg-utils') makedepends=('intltool' 'vala') optdepends=('banshee: banshee plugin' @@ -25,13 +25,15 @@ source=("https://launchpad.net/$pkgname-project/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz"; "fix-check-desktop.patch" "check-null-exec.patch" - "concrete-gtk-timeout.patch") + "concrete-gtk-timeout.patch" + "gee-0.8.patch") sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff' 'b64fa4efc4efd01f77f84d19a7a63c10186d0211' 'f494e5b36a77421114ce04b7085369abe5c00d68' - '6ab8b30bb23fb143d641da62dec7caa61fcd4e28') + '6ab8b30bb23fb143d641da62dec7caa61fcd4e28' + '3e3e9359ff8b56fc7fbed405e5936dd97ab99047') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # XDG_CURRENT_DESKTOP fix @@ -43,9 +45,17 @@ # Namely use Gtk.Timeout: patch -Np1 -i "$srcdir"/concrete-gtk-timeout.patch + # Port to gee-0.8 + patch -Np1 -i "$srcdir"/gee-0.8.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + # DSO fix export LDFLAGS="$LDFLAGS -lm" + autoreconf -fi ./configure --prefix=/usr make } Added: gee-0.8.patch =================================================================== --- gee-0.8.patch (rev 0) +++ gee-0.8.patch 2014-08-12 01:19:58 UTC (rev 117224) @@ -0,0 +1,87 @@ +diff -Naur synapse-0.2.10.orig/configure.ac synapse-0.2.10/configure.ac +--- synapse-0.2.10.orig/configure.ac 2012-03-18 20:11:39.000000000 +0100 ++++ synapse-0.2.10/configure.ac 2014-08-12 02:52:44.447243355 +0200 +@@ -59,7 +59,7 @@ + gtk+-2.0 >= $MIN_GTK_VERSION \ + gtkhotkey-1.0 \ + gobject-2.0 \ +- gee-1.0 >= $MIN_GEE_VERSION \ ++ gee-0.8 >= $MIN_GEE_VERSION \ + gio-unix-2.0 \ + json-glib-1.0 >= $MIN_JSON_VERSION \ + libnotify \ +diff -Naur synapse-0.2.10.orig/src/core/Makefile.am synapse-0.2.10/src/core/Makefile.am +--- synapse-0.2.10.orig/src/core/Makefile.am 2012-03-18 20:02:58.000000000 +0100 ++++ synapse-0.2.10/src/core/Makefile.am 2014-08-12 02:53:07.964488996 +0200 +@@ -7,7 +7,7 @@ + + libsynapsecore_la_VALAFLAGS = \ + --pkg gtk+-2.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --pkg json-glib-1.0 \ + --pkg dbus-glib-1 \ + --pkg gio-unix-2.0 \ +diff -Naur synapse-0.2.10.orig/src/core/result-set.vala synapse-0.2.10/src/core/result-set.vala +--- synapse-0.2.10.orig/src/core/result-set.vala 2012-03-18 20:02:41.000000000 +0100 ++++ synapse-0.2.10/src/core/result-set.vala 2014-08-12 02:52:44.447243355 +0200 +@@ -20,7 +20,7 @@ + + namespace Synapse + { +- public class ResultSet : Object, Gee.Iterable <Gee.Map.Entry <Match, int>> ++ public class ResultSet : Object, Gee.Traversable<Match>, Gee.Iterable <Gee.Map.Entry <Match, int>> + { + protected Gee.Map<Match, int> matches; + protected Gee.Set<unowned string> uris; +@@ -88,6 +88,11 @@ + return uri in uris; + } + ++ public bool foreach (Gee.ForallFunc<Match> func) ++ { ++ return matches.keys.foreach (func); ++ } ++ + public Gee.List<Match> get_sorted_list () + { + var l = new Gee.ArrayList<Gee.Map.Entry<Match, int>> (); +diff -Naur synapse-0.2.10.orig/src/plugins/Makefile.am synapse-0.2.10/src/plugins/Makefile.am +--- synapse-0.2.10.orig/src/plugins/Makefile.am 2012-03-18 20:04:17.000000000 +0100 ++++ synapse-0.2.10/src/plugins/Makefile.am 2014-08-12 02:53:26.878288046 +0200 +@@ -8,7 +8,7 @@ + + libplugins_la_VALAFLAGS = \ + --pkg gtk+-2.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --pkg json-glib-1.0 \ + --pkg dbus-glib-1 \ + --pkg gio-unix-2.0 \ +diff -Naur synapse-0.2.10.orig/src/ui/keybindings.vala synapse-0.2.10/src/ui/keybindings.vala +--- synapse-0.2.10.orig/src/ui/keybindings.vala 2012-03-18 20:02:41.000000000 +0100 ++++ synapse-0.2.10/src/ui/keybindings.vala 2014-08-12 02:52:44.463910433 +0200 +@@ -82,9 +82,9 @@ + this.cmd = cmd; + this.mods = mods; + } +- public static int compare (void* a, void* b) ++ public static int compare (ModCmd a, ModCmd b) + { +- return (int)(((ModCmd)a).mods) - (int)(((ModCmd)b).mods); ++ return (int)(a.mods) - (int)(b.mods); + } + } + +diff -Naur synapse-0.2.10.orig/src/ui/Makefile.am synapse-0.2.10/src/ui/Makefile.am +--- synapse-0.2.10.orig/src/ui/Makefile.am 2012-03-18 20:05:19.000000000 +0100 ++++ synapse-0.2.10/src/ui/Makefile.am 2014-08-12 02:53:46.262098738 +0200 +@@ -12,7 +12,7 @@ + --pkg gio-2.0 \ + --pkg gio-unix-2.0 \ + --pkg zeitgeist-1.0 \ +- --pkg gee-1.0 \ ++ --pkg gee-0.8 \ + --pkg json-glib-1.0 \ + --pkg unique-1.0 \ + --pkg libnotify \
