[gentoo-commits] repo/gentoo:master commit in: gnome-extra/synapse/files/, gnome-extra/synapse/

[Justin Lecher]

commit:     893406be39adc5460aa3babf68822b91f1980f96
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  4 07:14:32 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov  4 08:42:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893406be

gnome-extra/synapse: Drop old

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 gnome-extra/synapse/Manifest                       |  1 -
 .../files/synapse-0.2.10-check-null-exec.patch     | 16 ----
 .../files/synapse-0.2.10-fix-border-painting.patch | 74 ------------------
 .../files/synapse-0.2.10-fix-check-desktop.patch   | 30 --------
 .../synapse/files/synapse-0.2.10-gnome-3.10.patch  | 75 -------------------
 .../synapse/files/synapse-0.2.10-libgee-0.8.patch  | 87 ----------------------
 .../synapse/files/synapse-0.2.10-zeitgeist.patch   | 12 ---
 .../files/synapse-0.2.8.2-underlinking.patch       | 12 ---
 .../synapse/files/synapse-0.2.8.2-zeitgeist.patch  | 12 ---
 gnome-extra/synapse/synapse-0.2.10-r1.ebuild       | 81 --------------------
 10 files changed, 400 deletions(-)

diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
index f6a41c6..0e26b16 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -1,2 +1 @@
-DIST synapse-0.2.10.tar.gz 625327 SHA256 d94f724be51f20e2085ead203495d398c5fece24071ffed7e805108be2219540 SHA512 e21e30b7b180642d3102aa17b5135917f2380a6a656e304ec4077f19021d65750f73c49a0c837e2761d4acb9ecad49db97e02f4d2a82a9f255af61efe4b0adc6 WHIRLPOOL 5ecf09168ec04f4bc7ebb0f955bd7490c10b053d5c0ab1cd1662ccb21f773fb72369682edcb0c7c0ff95a680885eb23b4361f08fe36af71f29734ba371ccbe68
 DIST synapse-0.2.99.1.tar.xz 427128 SHA256 846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220 SHA512 7f91588759afd950d264b068eb11cd6971b86161f198735897405051a85c6d408d29ca2914c4546899a858673c6830290d63a26bc5e8060df1c821305af3eb92 WHIRLPOOL 1c077eb15c1d5710ccd9066bcc7a51170a4d8cca28d7d50245cbba1e944bb83e60764812de70e5b9f4801fc99d6100cbb2011aa708075f0eea0074fd69154344

diff --git a/gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch b/gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch
deleted file mode 100644
index 77820ec..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch
+++ /dev/null
@@ -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") &&

diff --git a/gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch b/gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch
deleted file mode 100644
index 38dc6ed..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: synapse-0.2.10/src/ui/widgets.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/widgets.vala
-+++ synapse-0.2.10/src/ui/widgets.vala
-@@ -232,7 +232,7 @@ namespace Synapse.Gui
-         real_size = real_size - 1;
-         a.value = this.size_to_scale[real_size];
-         layout.context_changed ();
--        requistion_for_size (out req, null, real_size, true);
-+        requisition_for_size (out req, null, real_size, true);
- 
-         if (allocation.width >= req.width)
-         {
-@@ -306,10 +306,9 @@ namespace Synapse.Gui
-       return true;
-     }
- 
--    protected void requistion_for_size (out Requisition req, out int char_width, Size s, bool return_only_width = false)
-+    protected void requisition_for_size (out Requisition req, out int char_width, Size s, bool return_only_width = false)
-     {
--      req.width = this.xpad * 2;
--      req.height = this.ypad * 2;
-+      req = { this.xpad * 2, this.ypad * 2 };
- 
-       Pango.Rectangle logical_rect;
-       layout.set_width (-1);
-@@ -334,7 +333,7 @@ namespace Synapse.Gui
-     {
-       layout.set_markup ("<span size=\"%s\">%s</span>".printf (size_to_string[_size], this.text), -1);
-       int char_width;
--      this.requistion_for_size (out req, out char_width, this._size);
-+      this.requisition_for_size (out req, out char_width, this._size);
-       last_req.width = req.width;
-       last_req.height = req.height;
-       if (!this.natural_requisition && (this.ellipsize != Pango.EllipsizeMode.NONE || animate))
-@@ -755,6 +754,10 @@ namespace Synapse.Gui
-         ctx.set_operator (Cairo.Operator.OVER);
-         ctx.set_line_width (1.25);
- 
-+        Gdk.cairo_rectangle (ctx, event.area);
-+        ctx.clip ();
-+        ctx.save ();
-+
-         double x = this.allocation.x + this.left_padding,
-                y = this.allocation.y + this.top_padding,
-                w = this.allocation.width - this.left_padding - this.right_padding - 3.0,
-@@ -764,16 +767,13 @@ namespace Synapse.Gui
-           ch.set_source_rgba (ctx, input_alpha, ch.StyleType.BG, StateType.NORMAL, ch.Mod.DARKER);
-         else
-           ch.set_source_rgba (ctx, input_alpha, ch.StyleType.FG, StateType.NORMAL, ch.Mod.INVERTED);
--        Cairo.Path path = ctx.copy_path ();
--        ctx.save ();
--        ctx.clip ();
--        ctx.paint ();
-+        ctx.fill_preserve ();
-         var pat = new Cairo.Pattern.linear (0, y, 0, y + shadow_height);
-         ch.add_color_stop_rgba (pat, 0, 0.6 * input_alpha, ch.StyleType.FG, StateType.NORMAL);
-         ch.add_color_stop_rgba (pat, 0.3, 0.25 * input_alpha, ch.StyleType.FG, StateType.NORMAL);
-         ch.add_color_stop_rgba (pat, 1.0, 0, ch.StyleType.FG, StateType.NORMAL);
-         ctx.set_source (pat);
--        ctx.paint ();
-+        ctx.fill ();
-         if (_focus_widget != null)
-         {
-           /*
-@@ -818,7 +818,7 @@ namespace Synapse.Gui
-           ctx.paint ();
-         }
-         ctx.restore ();
--        ctx.append_path (path);
-+        Utils.cairo_rounded_rect (ctx, x, y, w, h, border_radius);
-         ch.set_source_rgba (ctx, 0.6 * input_alpha, ch.StyleType.FG, StateType.NORMAL);
-         ctx.stroke ();
-       }

diff --git a/gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch b/gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch
deleted file mode 100644
index 16e039b..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch
+++ /dev/null
@@ -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";

diff --git a/gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch b/gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch
deleted file mode 100644
index b7ad5ed..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: synapse-0.2.10/src/ui/inspector.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/inspector.vala
-+++ synapse-0.2.10/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 ()
-Index: synapse-0.2.10/src/ui/widgets-matchlistview.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/widgets-matchlistview.vala
-+++ synapse-0.2.10/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;
-Index: synapse-0.2.10/src/ui/widgets.vala
-===================================================================
---- synapse-0.2.10.orig/src/ui/widgets.vala
-+++ synapse-0.2.10/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 ();
-           });
-       });

diff --git a/gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch b/gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch
deleted file mode 100644
index 28bdf1a..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch
+++ /dev/null
@@ -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 \

diff --git a/gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch
deleted file mode 100644
index 0311ddf..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/ui/Makefile.am'
---- src/ui/Makefile.am	2012-03-18 19:11:23 +0000
-+++ src/ui/Makefile.am	2012-03-18 19:55:48 +0000
-@@ -11,7 +11,6 @@
- 	--pkg gdk-x11-2.0 \
- 	--pkg gio-2.0 \
- 	--pkg gio-unix-2.0 \
--	--pkg zeitgeist-1.0 \
- 	--pkg gee-0.8 \
- 	--pkg json-glib-1.0 \
- 	--pkg unique-1.0 \
-

diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
deleted file mode 100644
index dc16a09..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/ui/Makefile.am'
---- src/ui/Makefile.am	2012-03-18 19:55:48 +0000
-+++ src/ui/Makefile.am	2012-03-18 19:57:30 +0000
-@@ -40,6 +40,7 @@
- 	$(top_builddir)/src/core/libsynapsecore.la \
- 	$(top_builddir)/src/plugins/libplugins.la \
- 	$(top_builddir)/src/tile-view/libtileview.la \
-+	-lm
- 	$(NULL)
- 
- if HAVE_INDICATOR
-

diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
deleted file mode 100644
index 22ce699..0000000
--- a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/ui/Makefile.am'
---- src/ui/Makefile.am	2012-03-18 19:11:23 +0000
-+++ src/ui/Makefile.am	2012-03-18 19:55:48 +0000
-@@ -11,7 +11,6 @@
- 	--pkg gdk-x11-2.0 \
- 	--pkg gio-2.0 \
- 	--pkg gio-unix-2.0 \
--	--pkg zeitgeist-1.0 \
- 	--pkg gee-1.0 \
- 	--pkg json-glib-1.0 \
- 	--pkg unique-1.0 \
-

diff --git a/gnome-extra/synapse/synapse-0.2.10-r1.ebuild b/gnome-extra/synapse/synapse-0.2.10-r1.ebuild
deleted file mode 100644
index b727e58..0000000
--- a/gnome-extra/synapse/synapse-0.2.10-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no" # gnome2_src_configure is not being used
-AUTOTOOLS_AUTORECONF=true
-VALA_MAX_API_VERSION=0.26
-
-inherit gnome2 autotools-utils vala
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
-IUSE="plugins +zeitgeist"
-
-RDEPEND="
-	dev-libs/libgee:0.8
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libunique:1
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtkhotkey
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/gnome-icon-theme
-	plugins? ( net-libs/rest )
-	zeitgeist? (
-		dev-libs/libzeitgeist
-		gnome-extra/zeitgeist[fts]
-		)"
-	#ayatana? ( dev-libs/libappindicator )
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.8.2-underlinking.patch
-
-	# Don't crash on empty string (from Arch)
-	"${FILESDIR}"/${PN}-0.2.10-check-null-exec.patch
-
-	# XDG_CURRENT_DESKTOP fix (from Arch)
-	"${FILESDIR}"/${PN}-0.2.10-fix-check-desktop.patch
-
-	# Fix newer gnome support (from OpenSuSE)
-	"${FILESDIR}"/${PN}-0.2.10-gnome-3.10.patch
-
-	# Port to gee-0.8 (from Arch)
-	"${FILESDIR}"/${PN}-0.2.10-libgee-0.8.patch
-
-	# Fix border painting (from OpenSuSE)
-	"${FILESDIR}"/${PN}-0.2.10-fix-border-painting.patch
-
-	"${FILESDIR}"/${PN}-0.2.10-zeitgeist.patch
-)
-
-src_prepare() {
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-indicator=no
-		$(use_enable plugins librest yes)
-		$(use_enable zeitgeist)
-		)
-	autotools-utils_src_configure
-}