[arch-commits] Commit in synapse/trunk (4 files)
Felix Yan
fyan at archlinux.org
Tue May 26 07:08:41 UTC 2015
Date: Tuesday, May 26, 2015 @ 09:08:40
Author: fyan
Revision: 134145
upgpkg: synapse 0.2.99.1-1
Modified:
synapse/trunk/PKGBUILD
Deleted:
synapse/trunk/check-null-exec.patch
synapse/trunk/fix-check-desktop.patch
synapse/trunk/gee-0.8.patch
-------------------------+
PKGBUILD | 42 +++-------------------
check-null-exec.patch | 16 --------
fix-check-desktop.patch | 30 ---------------
gee-0.8.patch | 87 ----------------------------------------------
4 files changed, 7 insertions(+), 168 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-26 06:49:41 UTC (rev 134144)
+++ PKGBUILD 2015-05-26 07:08:40 UTC (rev 134145)
@@ -1,16 +1,16 @@
# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
# Contributor: Alessio Sergi <asergi at archlinux dot us>
pkgname=synapse
-pkgver=0.2.10
-pkgrel=7
+pkgver=0.2.99.1
+pkgrel=1
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')
+depends=('libkeybinder3' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \
+ 'zeitgeist' 'rest' 'xdg-utils')
makedepends=('intltool' 'vala')
optdepends=('banshee: banshee plugin'
'bc: calculator plugin'
@@ -22,40 +22,12 @@
'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')
+source=("https://launchpad.net/$pkgname-project/0.3/$pkgver/+download/$pkgname-$pkgver.tar.xz")
+sha1sums=('c0b660b3376598c9ce5e13b9f3da13d660beb63d')
-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
}
Deleted: check-null-exec.patch
===================================================================
--- check-null-exec.patch 2015-05-26 06:49:41 UTC (rev 134144)
+++ check-null-exec.patch 2015-05-26 07:08:40 UTC (rev 134145)
@@ -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") &&
Deleted: fix-check-desktop.patch
===================================================================
--- fix-check-desktop.patch 2015-05-26 06:49:41 UTC (rev 134144)
+++ fix-check-desktop.patch 2015-05-26 07:08:40 UTC (rev 134145)
@@ -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";
Deleted: gee-0.8.patch
===================================================================
--- gee-0.8.patch 2015-05-26 06:49:41 UTC (rev 134144)
+++ gee-0.8.patch 2015-05-26 07:08:40 UTC (rev 134145)
@@ -1,87 +0,0 @@
-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 \
More information about the arch-commits
mailing list