[arch-commits] Commit in synapse/repos (22 files)
Balló György
bgyorgy at archlinux.org
Tue Aug 12 01:20:12 UTC 2014
Date: Tuesday, August 12, 2014 @ 03:20:12
Author: bgyorgy
Revision: 117225
archrelease: copy trunk to community-i686, community-x86_64
Added:
synapse/repos/community-i686/PKGBUILD
(from rev 117224, synapse/trunk/PKGBUILD)
synapse/repos/community-i686/check-null-exec.patch
(from rev 117224, synapse/trunk/check-null-exec.patch)
synapse/repos/community-i686/concrete-gtk-timeout.patch
(from rev 117224, synapse/trunk/concrete-gtk-timeout.patch)
synapse/repos/community-i686/fix-check-desktop.patch
(from rev 117224, synapse/trunk/fix-check-desktop.patch)
synapse/repos/community-i686/gee-0.8.patch
(from rev 117224, synapse/trunk/gee-0.8.patch)
synapse/repos/community-i686/synapse.install
(from rev 117224, synapse/trunk/synapse.install)
synapse/repos/community-x86_64/PKGBUILD
(from rev 117224, synapse/trunk/PKGBUILD)
synapse/repos/community-x86_64/check-null-exec.patch
(from rev 117224, synapse/trunk/check-null-exec.patch)
synapse/repos/community-x86_64/concrete-gtk-timeout.patch
(from rev 117224, synapse/trunk/concrete-gtk-timeout.patch)
synapse/repos/community-x86_64/fix-check-desktop.patch
(from rev 117224, synapse/trunk/fix-check-desktop.patch)
synapse/repos/community-x86_64/gee-0.8.patch
(from rev 117224, synapse/trunk/gee-0.8.patch)
synapse/repos/community-x86_64/synapse.install
(from rev 117224, synapse/trunk/synapse.install)
Deleted:
synapse/repos/community-i686/PKGBUILD
synapse/repos/community-i686/check-null-exec.patch
synapse/repos/community-i686/concrete-gtk-timeout.patch
synapse/repos/community-i686/fix-check-desktop.patch
synapse/repos/community-i686/synapse.install
synapse/repos/community-x86_64/PKGBUILD
synapse/repos/community-x86_64/check-null-exec.patch
synapse/repos/community-x86_64/concrete-gtk-timeout.patch
synapse/repos/community-x86_64/fix-check-desktop.patch
synapse/repos/community-x86_64/synapse.install
---------------------------------------------+
/PKGBUILD | 138 +++++++++++++++++++++++
/check-null-exec.patch | 32 +++++
/concrete-gtk-timeout.patch | 150 ++++++++++++++++++++++++++
/fix-check-desktop.patch | 60 ++++++++++
/synapse.install | 26 ++++
community-i686/PKGBUILD | 59 ----------
community-i686/check-null-exec.patch | 16 --
community-i686/concrete-gtk-timeout.patch | 75 -------------
community-i686/fix-check-desktop.patch | 30 -----
community-i686/gee-0.8.patch | 87 +++++++++++++++
community-i686/synapse.install | 13 --
community-x86_64/PKGBUILD | 59 ----------
community-x86_64/check-null-exec.patch | 16 --
community-x86_64/concrete-gtk-timeout.patch | 75 -------------
community-x86_64/fix-check-desktop.patch | 30 -----
community-x86_64/gee-0.8.patch | 87 +++++++++++++++
community-x86_64/synapse.install | 13 --
17 files changed, 580 insertions(+), 386 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-i686/PKGBUILD 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=synapse
-pkgver=0.2.10
-pkgrel=6
-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' \
- 'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
-makedepends=('intltool' 'vala')
-optdepends=('banshee: banshee plugin'
- 'bc: calculator plugin'
- 'devhelp: documentation plugin'
- 'gnome-screensaver: screensaver plugin'
- 'gnome-dictionary: dictionary plugin'
- 'openssh: ssh plugin'
- 'pastebinit: pastebin plugin'
- 'rhythmbox: rhythmbox plugin'
- 'xnoise: xnoise plugin')
-install=$pkgname.install
-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")
-sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff'
- 'b64fa4efc4efd01f77f84d19a7a63c10186d0211'
- 'f494e5b36a77421114ce04b7085369abe5c00d68'
- '6ab8b30bb23fb143d641da62dec7caa61fcd4e28')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # XDG_CURRENT_DESKTOP fix
- patch -Np1 -i "$srcdir"/fix-check-desktop.patch
-
- # don't crash on empty Exec field
- patch -Np1 -i "$srcdir"/check-null-exec.patch
-
- # Namely use Gtk.Timeout:
- patch -Np1 -i "$srcdir"/concrete-gtk-timeout.patch
-
- # DSO fix
- export LDFLAGS="$LDFLAGS -lm"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: synapse/repos/community-i686/PKGBUILD (from rev 117224, synapse/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=synapse
+pkgver=0.2.10
+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' 'libgee' 'libnotify' \
+ 'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
+makedepends=('intltool' 'vala')
+optdepends=('banshee: banshee plugin'
+ 'bc: calculator plugin'
+ 'devhelp: documentation plugin'
+ 'gnome-screensaver: screensaver plugin'
+ 'gnome-dictionary: dictionary plugin'
+ 'openssh: ssh plugin'
+ 'pastebinit: pastebin plugin'
+ 'rhythmbox: rhythmbox plugin'
+ 'xnoise: xnoise plugin')
+install=$pkgname.install
+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"
+ "gee-0.8.patch")
+sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff'
+ 'b64fa4efc4efd01f77f84d19a7a63c10186d0211'
+ 'f494e5b36a77421114ce04b7085369abe5c00d68'
+ '6ab8b30bb23fb143d641da62dec7caa61fcd4e28'
+ '3e3e9359ff8b56fc7fbed405e5936dd97ab99047')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # XDG_CURRENT_DESKTOP fix
+ patch -Np1 -i "$srcdir"/fix-check-desktop.patch
+
+ # don't crash on empty Exec field
+ patch -Np1 -i "$srcdir"/check-null-exec.patch
+
+ # 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
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/check-null-exec.patch
===================================================================
--- community-i686/check-null-exec.patch 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-i686/check-null-exec.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,16 +0,0 @@
-diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
---- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-12-26 18:07:55.962276823 +0100
-@@ -125,7 +125,11 @@
- }
-
- name = app_info.get_name ();
-- exec = app_info.get_executable ();
-+ exec = app_info.get_commandline ();
-+ if (exec == null)
-+ {
-+ throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
-+ }
-
- // check for hidden desktop files
- if (keyfile.has_key (GROUP, "Hidden") &&
Copied: synapse/repos/community-i686/check-null-exec.patch (from rev 117224, synapse/trunk/check-null-exec.patch)
===================================================================
--- community-i686/check-null-exec.patch (rev 0)
+++ community-i686/check-null-exec.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,16 @@
+diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
+--- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
++++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-12-26 18:07:55.962276823 +0100
+@@ -125,7 +125,11 @@
+ }
+
+ name = app_info.get_name ();
+- exec = app_info.get_executable ();
++ exec = app_info.get_commandline ();
++ if (exec == null)
++ {
++ throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
++ }
+
+ // check for hidden desktop files
+ if (keyfile.has_key (GROUP, "Hidden") &&
Deleted: community-i686/concrete-gtk-timeout.patch
===================================================================
--- community-i686/concrete-gtk-timeout.patch 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-i686/concrete-gtk-timeout.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,75 +0,0 @@
-diff --git a/src/ui/inspector.vala b/src/ui/inspector.vala
-index b5ec8be..b608a2f 100644
---- a/src/ui/inspector.vala
-+++ b/src/ui/inspector.vala
-@@ -28,7 +28,7 @@ namespace UI
-
- public Inspector ()
- {
-- timer_id = Timeout.add (500, this.check_window_at_pointer);
-+ timer_id = Gtk.Timeout.add (500, this.check_window_at_pointer);
- }
-
- ~Inspector ()
-diff --git a/src/ui/widgets-matchlistview.vala b/src/ui/widgets-matchlistview.vala
-index 2c7b1a7..8a77d74 100644
---- a/src/ui/widgets-matchlistview.vala
-+++ b/src/ui/widgets-matchlistview.vala
-@@ -551,7 +551,7 @@ namespace Synapse.Gui
- }
- if (needs_animation)
- {
-- if (tid == 0) tid = Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
-+ if (tid == 0) tid = Gtk.Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
- this.queue_draw ();
- return true;
- }
-@@ -734,7 +734,7 @@ namespace Synapse.Gui
- this.inhibit_move = true;
- this.set_indexes (this.dragdrop_target_item, this.dragdrop_target_item);
- this.selected_index_changed (this.select_index);
-- Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
-+ Gtk.Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
- if (inhibit_move)
- {
- inhibit_move = false;
-diff --git a/src/ui/widgets.vala b/src/ui/widgets.vala
-index 2dd8f16..3acf736 100644
---- a/src/ui/widgets.vala
-+++ b/src/ui/widgets.vala
-@@ -185,7 +185,7 @@ namespace Synapse.Gui
- {
- if (tid != 0) return;
-
-- tid = Timeout.add (40, ()=>{
-+ tid = Gtk.Timeout.add (40, ()=>{
- offset = (offset - 1) % (_anim_width);
- queue_draw ();
- return true;
-@@ -245,7 +245,7 @@ namespace Synapse.Gui
- {
- if (tid == 0)
- {
-- tid = Timeout.add (INITIAL_TIMEOUT, ()=>{
-+ tid = Gtk.Timeout.add (INITIAL_TIMEOUT, ()=>{
- tid = 0;
- start_animation ();
- return false;
-@@ -1085,7 +1085,7 @@ namespace Synapse.Gui
- }
- if (tid == 0)
- {
-- tid = Timeout.add (30, ()=>{
-+ tid = Gtk.Timeout.add (30, ()=>{
- return update_current_offset ();
- });
- }
-@@ -1121,7 +1121,7 @@ namespace Synapse.Gui
- });
- this.size_allocate.connect (()=>{
- if (tid == 0)
-- tid = Timeout.add (30, ()=>{
-+ tid = Gtk.Timeout.add (30, ()=>{
- return update_current_offset ();
- });
- });
Copied: synapse/repos/community-i686/concrete-gtk-timeout.patch (from rev 117224, synapse/trunk/concrete-gtk-timeout.patch)
===================================================================
--- community-i686/concrete-gtk-timeout.patch (rev 0)
+++ community-i686/concrete-gtk-timeout.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,75 @@
+diff --git a/src/ui/inspector.vala b/src/ui/inspector.vala
+index b5ec8be..b608a2f 100644
+--- a/src/ui/inspector.vala
++++ b/src/ui/inspector.vala
+@@ -28,7 +28,7 @@ namespace UI
+
+ public Inspector ()
+ {
+- timer_id = Timeout.add (500, this.check_window_at_pointer);
++ timer_id = Gtk.Timeout.add (500, this.check_window_at_pointer);
+ }
+
+ ~Inspector ()
+diff --git a/src/ui/widgets-matchlistview.vala b/src/ui/widgets-matchlistview.vala
+index 2c7b1a7..8a77d74 100644
+--- a/src/ui/widgets-matchlistview.vala
++++ b/src/ui/widgets-matchlistview.vala
+@@ -551,7 +551,7 @@ namespace Synapse.Gui
+ }
+ if (needs_animation)
+ {
+- if (tid == 0) tid = Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
++ if (tid == 0) tid = Gtk.Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
+ this.queue_draw ();
+ return true;
+ }
+@@ -734,7 +734,7 @@ namespace Synapse.Gui
+ this.inhibit_move = true;
+ this.set_indexes (this.dragdrop_target_item, this.dragdrop_target_item);
+ this.selected_index_changed (this.select_index);
+- Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
++ Gtk.Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
+ if (inhibit_move)
+ {
+ inhibit_move = false;
+diff --git a/src/ui/widgets.vala b/src/ui/widgets.vala
+index 2dd8f16..3acf736 100644
+--- a/src/ui/widgets.vala
++++ b/src/ui/widgets.vala
+@@ -185,7 +185,7 @@ namespace Synapse.Gui
+ {
+ if (tid != 0) return;
+
+- tid = Timeout.add (40, ()=>{
++ tid = Gtk.Timeout.add (40, ()=>{
+ offset = (offset - 1) % (_anim_width);
+ queue_draw ();
+ return true;
+@@ -245,7 +245,7 @@ namespace Synapse.Gui
+ {
+ if (tid == 0)
+ {
+- tid = Timeout.add (INITIAL_TIMEOUT, ()=>{
++ tid = Gtk.Timeout.add (INITIAL_TIMEOUT, ()=>{
+ tid = 0;
+ start_animation ();
+ return false;
+@@ -1085,7 +1085,7 @@ namespace Synapse.Gui
+ }
+ if (tid == 0)
+ {
+- tid = Timeout.add (30, ()=>{
++ tid = Gtk.Timeout.add (30, ()=>{
+ return update_current_offset ();
+ });
+ }
+@@ -1121,7 +1121,7 @@ namespace Synapse.Gui
+ });
+ this.size_allocate.connect (()=>{
+ if (tid == 0)
+- tid = Timeout.add (30, ()=>{
++ tid = Gtk.Timeout.add (30, ()=>{
+ return update_current_offset ();
+ });
+ });
Deleted: community-i686/fix-check-desktop.patch
===================================================================
--- community-i686/fix-check-desktop.patch 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-i686/fix-check-desktop.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,30 +0,0 @@
-diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
---- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-03-19 12:06:43.080443401 +0100
-@@ -248,13 +248,23 @@
-
- private void get_environment_type ()
- {
-- unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION");
--
-+ unowned string? session_var;
-+ session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
-+ if (session_var == null)
-+ {
-+ session_var = Environment.get_variable ("DESKTOP_SESSION");
-+ }
-+
- if (session_var == null) return;
-
- string session = session_var.down ();
-
-- if (session.has_prefix ("kde"))
-+ if (session.has_prefix ("unity"))
-+ {
-+ session_type = DesktopFileInfo.EnvironmentType.UNITY;
-+ session_type_str = "Unity";
-+ }
-+ else if (session.has_prefix ("kde"))
- {
- session_type = DesktopFileInfo.EnvironmentType.KDE;
- session_type_str = "KDE";
Copied: synapse/repos/community-i686/fix-check-desktop.patch (from rev 117224, synapse/trunk/fix-check-desktop.patch)
===================================================================
--- community-i686/fix-check-desktop.patch (rev 0)
+++ community-i686/fix-check-desktop.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,30 @@
+diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
+--- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
++++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-03-19 12:06:43.080443401 +0100
+@@ -248,13 +248,23 @@
+
+ private void get_environment_type ()
+ {
+- unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION");
+-
++ unowned string? session_var;
++ session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
++ if (session_var == null)
++ {
++ session_var = Environment.get_variable ("DESKTOP_SESSION");
++ }
++
+ if (session_var == null) return;
+
+ string session = session_var.down ();
+
+- if (session.has_prefix ("kde"))
++ if (session.has_prefix ("unity"))
++ {
++ session_type = DesktopFileInfo.EnvironmentType.UNITY;
++ session_type_str = "Unity";
++ }
++ else if (session.has_prefix ("kde"))
+ {
+ session_type = DesktopFileInfo.EnvironmentType.KDE;
+ session_type_str = "KDE";
Copied: synapse/repos/community-i686/gee-0.8.patch (from rev 117224, synapse/trunk/gee-0.8.patch)
===================================================================
--- community-i686/gee-0.8.patch (rev 0)
+++ community-i686/gee-0.8.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -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 \
Deleted: community-i686/synapse.install
===================================================================
--- community-i686/synapse.install 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-i686/synapse.install 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-}
-
-post_upgrade() {
- post_install "$1"
-}
-
-post_remove() {
- post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: synapse/repos/community-i686/synapse.install (from rev 117224, synapse/trunk/synapse.install)
===================================================================
--- community-i686/synapse.install (rev 0)
+++ community-i686/synapse.install 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+post_remove() {
+ post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-x86_64/PKGBUILD 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=synapse
-pkgver=0.2.10
-pkgrel=6
-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' \
- 'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
-makedepends=('intltool' 'vala')
-optdepends=('banshee: banshee plugin'
- 'bc: calculator plugin'
- 'devhelp: documentation plugin'
- 'gnome-screensaver: screensaver plugin'
- 'gnome-dictionary: dictionary plugin'
- 'openssh: ssh plugin'
- 'pastebinit: pastebin plugin'
- 'rhythmbox: rhythmbox plugin'
- 'xnoise: xnoise plugin')
-install=$pkgname.install
-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")
-sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff'
- 'b64fa4efc4efd01f77f84d19a7a63c10186d0211'
- 'f494e5b36a77421114ce04b7085369abe5c00d68'
- '6ab8b30bb23fb143d641da62dec7caa61fcd4e28')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # XDG_CURRENT_DESKTOP fix
- patch -Np1 -i "$srcdir"/fix-check-desktop.patch
-
- # don't crash on empty Exec field
- patch -Np1 -i "$srcdir"/check-null-exec.patch
-
- # Namely use Gtk.Timeout:
- patch -Np1 -i "$srcdir"/concrete-gtk-timeout.patch
-
- # DSO fix
- export LDFLAGS="$LDFLAGS -lm"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: synapse/repos/community-x86_64/PKGBUILD (from rev 117224, synapse/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,69 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=synapse
+pkgver=0.2.10
+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' 'libgee' 'libnotify' \
+ 'libunique' 'libzeitgeist' 'rest' 'xdg-utils')
+makedepends=('intltool' 'vala')
+optdepends=('banshee: banshee plugin'
+ 'bc: calculator plugin'
+ 'devhelp: documentation plugin'
+ 'gnome-screensaver: screensaver plugin'
+ 'gnome-dictionary: dictionary plugin'
+ 'openssh: ssh plugin'
+ 'pastebinit: pastebin plugin'
+ 'rhythmbox: rhythmbox plugin'
+ 'xnoise: xnoise plugin')
+install=$pkgname.install
+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"
+ "gee-0.8.patch")
+sha1sums=('6e8a800bdbdded4e167734c8e49d95a9e44998ff'
+ 'b64fa4efc4efd01f77f84d19a7a63c10186d0211'
+ 'f494e5b36a77421114ce04b7085369abe5c00d68'
+ '6ab8b30bb23fb143d641da62dec7caa61fcd4e28'
+ '3e3e9359ff8b56fc7fbed405e5936dd97ab99047')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # XDG_CURRENT_DESKTOP fix
+ patch -Np1 -i "$srcdir"/fix-check-desktop.patch
+
+ # don't crash on empty Exec field
+ patch -Np1 -i "$srcdir"/check-null-exec.patch
+
+ # 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
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/check-null-exec.patch
===================================================================
--- community-x86_64/check-null-exec.patch 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-x86_64/check-null-exec.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,16 +0,0 @@
-diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
---- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-12-26 18:07:55.962276823 +0100
-@@ -125,7 +125,11 @@
- }
-
- name = app_info.get_name ();
-- exec = app_info.get_executable ();
-+ exec = app_info.get_commandline ();
-+ if (exec == null)
-+ {
-+ throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
-+ }
-
- // check for hidden desktop files
- if (keyfile.has_key (GROUP, "Hidden") &&
Copied: synapse/repos/community-x86_64/check-null-exec.patch (from rev 117224, synapse/trunk/check-null-exec.patch)
===================================================================
--- community-x86_64/check-null-exec.patch (rev 0)
+++ community-x86_64/check-null-exec.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,16 @@
+diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
+--- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
++++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-12-26 18:07:55.962276823 +0100
+@@ -125,7 +125,11 @@
+ }
+
+ name = app_info.get_name ();
+- exec = app_info.get_executable ();
++ exec = app_info.get_commandline ();
++ if (exec == null)
++ {
++ throw new DesktopFileError.UNINTERESTING_ENTRY ("Unable to get exec for %s".printf (name));
++ }
+
+ // check for hidden desktop files
+ if (keyfile.has_key (GROUP, "Hidden") &&
Deleted: community-x86_64/concrete-gtk-timeout.patch
===================================================================
--- community-x86_64/concrete-gtk-timeout.patch 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-x86_64/concrete-gtk-timeout.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,75 +0,0 @@
-diff --git a/src/ui/inspector.vala b/src/ui/inspector.vala
-index b5ec8be..b608a2f 100644
---- a/src/ui/inspector.vala
-+++ b/src/ui/inspector.vala
-@@ -28,7 +28,7 @@ namespace UI
-
- public Inspector ()
- {
-- timer_id = Timeout.add (500, this.check_window_at_pointer);
-+ timer_id = Gtk.Timeout.add (500, this.check_window_at_pointer);
- }
-
- ~Inspector ()
-diff --git a/src/ui/widgets-matchlistview.vala b/src/ui/widgets-matchlistview.vala
-index 2c7b1a7..8a77d74 100644
---- a/src/ui/widgets-matchlistview.vala
-+++ b/src/ui/widgets-matchlistview.vala
-@@ -551,7 +551,7 @@ namespace Synapse.Gui
- }
- if (needs_animation)
- {
-- if (tid == 0) tid = Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
-+ if (tid == 0) tid = Gtk.Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
- this.queue_draw ();
- return true;
- }
-@@ -734,7 +734,7 @@ namespace Synapse.Gui
- this.inhibit_move = true;
- this.set_indexes (this.dragdrop_target_item, this.dragdrop_target_item);
- this.selected_index_changed (this.select_index);
-- Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
-+ Gtk.Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
- if (inhibit_move)
- {
- inhibit_move = false;
-diff --git a/src/ui/widgets.vala b/src/ui/widgets.vala
-index 2dd8f16..3acf736 100644
---- a/src/ui/widgets.vala
-+++ b/src/ui/widgets.vala
-@@ -185,7 +185,7 @@ namespace Synapse.Gui
- {
- if (tid != 0) return;
-
-- tid = Timeout.add (40, ()=>{
-+ tid = Gtk.Timeout.add (40, ()=>{
- offset = (offset - 1) % (_anim_width);
- queue_draw ();
- return true;
-@@ -245,7 +245,7 @@ namespace Synapse.Gui
- {
- if (tid == 0)
- {
-- tid = Timeout.add (INITIAL_TIMEOUT, ()=>{
-+ tid = Gtk.Timeout.add (INITIAL_TIMEOUT, ()=>{
- tid = 0;
- start_animation ();
- return false;
-@@ -1085,7 +1085,7 @@ namespace Synapse.Gui
- }
- if (tid == 0)
- {
-- tid = Timeout.add (30, ()=>{
-+ tid = Gtk.Timeout.add (30, ()=>{
- return update_current_offset ();
- });
- }
-@@ -1121,7 +1121,7 @@ namespace Synapse.Gui
- });
- this.size_allocate.connect (()=>{
- if (tid == 0)
-- tid = Timeout.add (30, ()=>{
-+ tid = Gtk.Timeout.add (30, ()=>{
- return update_current_offset ();
- });
- });
Copied: synapse/repos/community-x86_64/concrete-gtk-timeout.patch (from rev 117224, synapse/trunk/concrete-gtk-timeout.patch)
===================================================================
--- community-x86_64/concrete-gtk-timeout.patch (rev 0)
+++ community-x86_64/concrete-gtk-timeout.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,75 @@
+diff --git a/src/ui/inspector.vala b/src/ui/inspector.vala
+index b5ec8be..b608a2f 100644
+--- a/src/ui/inspector.vala
++++ b/src/ui/inspector.vala
+@@ -28,7 +28,7 @@ namespace UI
+
+ public Inspector ()
+ {
+- timer_id = Timeout.add (500, this.check_window_at_pointer);
++ timer_id = Gtk.Timeout.add (500, this.check_window_at_pointer);
+ }
+
+ ~Inspector ()
+diff --git a/src/ui/widgets-matchlistview.vala b/src/ui/widgets-matchlistview.vala
+index 2c7b1a7..8a77d74 100644
+--- a/src/ui/widgets-matchlistview.vala
++++ b/src/ui/widgets-matchlistview.vala
+@@ -551,7 +551,7 @@ namespace Synapse.Gui
+ }
+ if (needs_animation)
+ {
+- if (tid == 0) tid = Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
++ if (tid == 0) tid = Gtk.Timeout.add (ANIM_TIMEOUT, this.update_current_offsets);
+ this.queue_draw ();
+ return true;
+ }
+@@ -734,7 +734,7 @@ namespace Synapse.Gui
+ this.inhibit_move = true;
+ this.set_indexes (this.dragdrop_target_item, this.dragdrop_target_item);
+ this.selected_index_changed (this.select_index);
+- Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
++ Gtk.Timeout.add (Gtk.Settings.get_default ().gtk_double_click_time ,()=>{
+ if (inhibit_move)
+ {
+ inhibit_move = false;
+diff --git a/src/ui/widgets.vala b/src/ui/widgets.vala
+index 2dd8f16..3acf736 100644
+--- a/src/ui/widgets.vala
++++ b/src/ui/widgets.vala
+@@ -185,7 +185,7 @@ namespace Synapse.Gui
+ {
+ if (tid != 0) return;
+
+- tid = Timeout.add (40, ()=>{
++ tid = Gtk.Timeout.add (40, ()=>{
+ offset = (offset - 1) % (_anim_width);
+ queue_draw ();
+ return true;
+@@ -245,7 +245,7 @@ namespace Synapse.Gui
+ {
+ if (tid == 0)
+ {
+- tid = Timeout.add (INITIAL_TIMEOUT, ()=>{
++ tid = Gtk.Timeout.add (INITIAL_TIMEOUT, ()=>{
+ tid = 0;
+ start_animation ();
+ return false;
+@@ -1085,7 +1085,7 @@ namespace Synapse.Gui
+ }
+ if (tid == 0)
+ {
+- tid = Timeout.add (30, ()=>{
++ tid = Gtk.Timeout.add (30, ()=>{
+ return update_current_offset ();
+ });
+ }
+@@ -1121,7 +1121,7 @@ namespace Synapse.Gui
+ });
+ this.size_allocate.connect (()=>{
+ if (tid == 0)
+- tid = Timeout.add (30, ()=>{
++ tid = Gtk.Timeout.add (30, ()=>{
+ return update_current_offset ();
+ });
+ });
Deleted: community-x86_64/fix-check-desktop.patch
===================================================================
--- community-x86_64/fix-check-desktop.patch 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-x86_64/fix-check-desktop.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,30 +0,0 @@
-diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
---- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
-+++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-03-19 12:06:43.080443401 +0100
-@@ -248,13 +248,23 @@
-
- private void get_environment_type ()
- {
-- unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION");
--
-+ unowned string? session_var;
-+ session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
-+ if (session_var == null)
-+ {
-+ session_var = Environment.get_variable ("DESKTOP_SESSION");
-+ }
-+
- if (session_var == null) return;
-
- string session = session_var.down ();
-
-- if (session.has_prefix ("kde"))
-+ if (session.has_prefix ("unity"))
-+ {
-+ session_type = DesktopFileInfo.EnvironmentType.UNITY;
-+ session_type_str = "Unity";
-+ }
-+ else if (session.has_prefix ("kde"))
- {
- session_type = DesktopFileInfo.EnvironmentType.KDE;
- session_type_str = "KDE";
Copied: synapse/repos/community-x86_64/fix-check-desktop.patch (from rev 117224, synapse/trunk/fix-check-desktop.patch)
===================================================================
--- community-x86_64/fix-check-desktop.patch (rev 0)
+++ community-x86_64/fix-check-desktop.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,30 @@
+diff -Naur synapse-0.2.10.orig/src/core/desktop-file-service.vala synapse-0.2.10/src/core/desktop-file-service.vala
+--- synapse-0.2.10.orig/src/core/desktop-file-service.vala 2012-03-18 20:02:41.000000000 +0100
++++ synapse-0.2.10/src/core/desktop-file-service.vala 2012-03-19 12:06:43.080443401 +0100
+@@ -248,13 +248,23 @@
+
+ private void get_environment_type ()
+ {
+- unowned string? session_var = Environment.get_variable ("DESKTOP_SESSION");
+-
++ unowned string? session_var;
++ session_var = Environment.get_variable ("XDG_CURRENT_DESKTOP");
++ if (session_var == null)
++ {
++ session_var = Environment.get_variable ("DESKTOP_SESSION");
++ }
++
+ if (session_var == null) return;
+
+ string session = session_var.down ();
+
+- if (session.has_prefix ("kde"))
++ if (session.has_prefix ("unity"))
++ {
++ session_type = DesktopFileInfo.EnvironmentType.UNITY;
++ session_type_str = "Unity";
++ }
++ else if (session.has_prefix ("kde"))
+ {
+ session_type = DesktopFileInfo.EnvironmentType.KDE;
+ session_type_str = "KDE";
Copied: synapse/repos/community-x86_64/gee-0.8.patch (from rev 117224, synapse/trunk/gee-0.8.patch)
===================================================================
--- community-x86_64/gee-0.8.patch (rev 0)
+++ community-x86_64/gee-0.8.patch 2014-08-12 01:20:12 UTC (rev 117225)
@@ -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 \
Deleted: community-x86_64/synapse.install
===================================================================
--- community-x86_64/synapse.install 2014-08-12 01:19:58 UTC (rev 117224)
+++ community-x86_64/synapse.install 2014-08-12 01:20:12 UTC (rev 117225)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-}
-
-post_upgrade() {
- post_install "$1"
-}
-
-post_remove() {
- post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: synapse/repos/community-x86_64/synapse.install (from rev 117224, synapse/trunk/synapse.install)
===================================================================
--- community-x86_64/synapse.install (rev 0)
+++ community-x86_64/synapse.install 2014-08-12 01:20:12 UTC (rev 117225)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+post_remove() {
+ post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list