[arch-commits] Commit in synapse/repos/community-x86_64 (3 files)

[Balló György]

    Date: Tuesday, January 30, 2018 @ 20:38:22
  Author: bgyorgy
Revision: 288338

archrelease: copy trunk to community-x86_64

Added:
  synapse/repos/community-x86_64/PKGBUILD
    (from rev 288337, synapse/trunk/PKGBUILD)
  synapse/repos/community-x86_64/fix-build.patch
    (from rev 288337, synapse/trunk/fix-build.patch)
Deleted:
  synapse/repos/community-x86_64/PKGBUILD

-----------------+
 PKGBUILD        |   86 ++++++++++++++++++++++++++++--------------------------
 fix-build.patch |   52 ++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-30 20:38:15 UTC (rev 288337)
+++ PKGBUILD	2018-01-30 20:38:22 UTC (rev 288338)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=synapse
-pkgver=0.2.99.2
-pkgrel=2
-pkgdesc="A semantic file launcher"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/synapse-project"
-license=('GPL3')
-depends=('libkeybinder3' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \
-         'zeitgeist' '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')
-source=("https://launchpad.net/$pkgname-project/0.3/$pkgver/+download/$pkgname-$pkgver.tar.xz")
-sha1sums=('6720537a239419833fc5b4e521b25935e30a3274')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./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 288337, synapse/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-30 20:38:22 UTC (rev 288338)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Alessio Sergi <asergi at archlinux dot us>
+
+pkgname=synapse
+pkgver=0.2.99.2
+pkgrel=3
+pkgdesc="A semantic file launcher"
+arch=('x86_64')
+url="https://launchpad.net/synapse-project"
+license=('GPL3')
+depends=('libkeybinder3' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \
+         'zeitgeist' 'rest' 'xdg-utils')
+makedepends=('intltool' 'vala')
+optdepends=('bc: calculator plugin'
+            'devhelp: documentation plugin'
+            'gnome-dictionary: dictionary plugin'
+            'openssh: ssh plugin'
+            'pastebinit: pastebin plugin'
+            'rhythmbox: rhythmbox plugin'
+            'xnoise: xnoise plugin')
+source=("https://launchpad.net/$pkgname-project/0.3/$pkgver/+download/$pkgname-$pkgver.tar.xz"
+        fix-build.patch)
+sha1sums=('6720537a239419833fc5b4e521b25935e30a3274'
+          '0ddb104dd7ec2d8de663c48f9d4f3614d17ee824')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i ../fix-build.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./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/fix-build.patch (from rev 288337, synapse/trunk/fix-build.patch)
===================================================================
--- fix-build.patch	                        (rev 0)
+++ fix-build.patch	2018-01-30 20:38:22 UTC (rev 288338)
@@ -0,0 +1,52 @@
+From: Tomasz Buchert <tomasz at debian.org>
+Date: Tue, 19 Sep 2017 01:00:01 +0200
+Subject: revisions-652-and-653
+
+Fixes build problems on vala 0.36.
+---
+ src/core/result-set.vala              | 2 +-
+ src/plugins/desktop-file-plugin.vala  | 4 ++--
+ src/plugins/hybrid-search-plugin.vala | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/result-set.vala b/src/core/result-set.vala
+index 6c4059d..10f9f92 100644
+--- a/src/core/result-set.vala
++++ b/src/core/result-set.vala
+@@ -57,7 +57,7 @@ namespace Synapse
+       owned get { return matches.entries; }
+     }
+ 
+-    public Gee.Iterator<Gee.Map.Entry <Match, int>?> iterator ()
++    public Gee.Iterator<Gee.Map.Entry <Match, int>> iterator ()
+     {
+       return matches.iterator ();
+     }
+diff --git a/src/plugins/desktop-file-plugin.vala b/src/plugins/desktop-file-plugin.vala
+index 346ae40..e18725c 100644
+--- a/src/plugins/desktop-file-plugin.vala
++++ b/src/plugins/desktop-file-plugin.vala
+@@ -83,8 +83,8 @@ namespace Synapse
+     construct
+     {
+       desktop_files = new Gee.ArrayList<DesktopFileMatch> ();
+-      mimetype_map = new Gee.HashMap<string, OpenWithAction> ();
+-      actions_map = new Gee.HashMap<string, OpenAppAction> ();
++      mimetype_map = new Gee.HashMap<string, Gee.List<OpenWithAction>> ();
++      actions_map = new Gee.HashMap<string, Gee.List<OpenAppAction>> ();
+ 
+       var dfs = DesktopFileService.get_default ();
+       dfs.reload_started.connect (() => {
+diff --git a/src/plugins/hybrid-search-plugin.vala b/src/plugins/hybrid-search-plugin.vala
+index dfdb614..c9e1010 100644
+--- a/src/plugins/hybrid-search-plugin.vala
++++ b/src/plugins/hybrid-search-plugin.vala
+@@ -74,7 +74,7 @@ namespace Synapse
+     construct
+     {
+       directory_hits = new Gee.HashMap<string, int> ();
+-      directory_contents = new Gee.HashMap<string, Utils.FileInfo?> ();
++      directory_contents = new Gee.HashMap<string, DirectoryInfo> ();
+ 
+       analyze_recent_documents.begin ();
+     }