[packages/synapse/DEVEL] - development snapshot built against gtk+3 - timeout patch no longer needed - adjust mate patch - up
atler
atler at pld-linux.org
Sun Jul 13 12:39:27 CEST 2014
commit 9027cc73e7f2ee75f02845644c12768d78b03b66
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Jul 13 12:37:27 2014 +0200
- development snapshot built against gtk+3
- timeout patch no longer needed
- adjust mate patch
- update BRs
synapse-gtk_timeout.patch | 75 -------------------------------------
synapse-mate.patch | 94 +++++++++--------------------------------------
synapse.spec | 41 ++++++++++++---------
3 files changed, 42 insertions(+), 168 deletions(-)
---
diff --git a/synapse.spec b/synapse.spec
index 7f7c501..52586e2 100644
--- a/synapse.spec
+++ b/synapse.spec
@@ -1,26 +1,31 @@
+%define rev 594
+#
Summary: Application launcher
Name: synapse
-Version: 0.2.10
-Release: 2
+Version: 0.2.99
+Release: 0.%{rev}.1
License: GPL v3+
Group: X11/Applications
-Source0: https://launchpad.net/synapse-project/0.2/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: ac1c075c01f1c179f32fd6651bd184f8
+Source0: %{name}-%{version}-r%{rev}.tar.gz
+# Source0-md5: 3fcd00e82bc89cd55a9eb3c75f9ce7c7
Patch0: %{name}-mate.patch
-Patch1: %{name}-gtk_timeout.patch
URL: http://synapse.zeitgeist-project.com/
-BuildRequires: glib2-devel >= 1:2.26.0
-BuildRequires: gtk+2-devel >= 2:2.20.0
-BuildRequires: gtkhotkey-devel >= 0.2.1
+BuildRequires: autoconf >= 2.65
+BuildRequires: automake >= 1:1.11
+BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: gtk+3-devel
+BuildRequires: intltool >= 0.35.0
BuildRequires: json-glib-devel >= 0.10.0
-BuildRequires: libgee0.6-devel >= 0.5.2
+BuildRequires: keybinder3-devel
+BuildRequires: libgee-devel >= 0.5.2
BuildRequires: libnotify-devel
-BuildRequires: libunique-devel >= 1.0
-BuildRequires: libzeitgeist-devel >= 0.3.18
-BuildRequires: rest-devel
-BuildRequires: vala >= 0.14.0
-BuildRequires: vala-libgee0.6 >= 0.6.4
-BuildRequires: vala-zeitgeist1 >= 0.3.18
+BuildRequires: libtool
+BuildRequires: pkgconfig >= 1:0.21
+BuildRequires: rest-devel >= 0.7
+BuildRequires: vala >= 0.16.0
+BuildRequires: vala-libgee >= 0.6.4
+BuildRequires: vala-zeitgeist >= 0.9.14
+BuildRequires: zeitgeist-devel >= 0.9.14
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -31,10 +36,12 @@ files by making use of the Zeitgeist engine.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+%{__mkdir} m4
%build
-%{__aclocal} -I m4
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
diff --git a/synapse-gtk_timeout.patch b/synapse-gtk_timeout.patch
deleted file mode 100644
index a9014eb..0000000
--- a/synapse-gtk_timeout.patch
+++ /dev/null
@@ -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 ();
- });
- });
diff --git a/synapse-mate.patch b/synapse-mate.patch
index 86ede94..78d9556 100644
--- a/synapse-mate.patch
+++ b/synapse-mate.patch
@@ -1,37 +1,3 @@
-diff -urN 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 2013-08-18 18:33:35.710536590 +0200
-+++ synapse-0.2.10/src/core/desktop-file-service.vala 2013-08-18 18:33:55.187202928 +0200
-@@ -39,8 +39,9 @@
- XFCE = 1 << 4,
- OLD = 1 << 5,
- UNITY = 1 << 6,
-+ MATE = 1 << 7,
-
-- ALL = 0x7F
-+ ALL = 0xFF
- }
-
- public string desktop_id { get; construct set; }
-@@ -92,6 +93,7 @@
- case "ROX": result |= EnvironmentType.ROX; break;
- case "OLD": result |= EnvironmentType.OLD; break;
- case "UNITY": result |= EnvironmentType.UNITY; break;
-+ case "MATE": result |= EnvironmentType.MATE; break;
- default: warning ("%s is not understood", env); break;
- }
- }
-@@ -284,6 +286,11 @@
- session_type = DesktopFileInfo.EnvironmentType.ROX;
- session_type_str = "ROX";
- }
-+ else if (session.has_prefix ("mate"))
-+ {
-+ session_type = DesktopFileInfo.EnvironmentType.MATE;
-+ session_type_str = "MATE";
-+ }
- else
- {
- warning ("Desktop session type is not recognized, assuming GNOME.");
diff -urN 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 2013-08-18 18:33:35.710536590 +0200
+++ synapse-0.2.10/src/plugins/Makefile.am 2013-08-18 18:33:44.427203171 +0200
@@ -46,7 +12,7 @@ diff -urN synapse-0.2.10.orig/src/plugins/Makefile.am synapse-0.2.10/src/plugins
diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.10/src/plugins/mate-session-plugin.vala
--- synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala 1970-01-01 01:00:00.000000000 +0100
+++ synapse-0.2.10/src/plugins/mate-session-plugin.vala 2013-08-18 18:33:44.427203171 +0200
-@@ -0,0 +1,220 @@
+@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2010 Michal Hruby <michal.mhr at gmail.com>
+ *
@@ -96,24 +62,16 @@ diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.1
+
+ }
+
-+ private class ShutDownAction: Object, Match
++ private class ShutDownAction: ActionMatch
+ {
-+ // for Match interface
-+ public string title { get; construct set; }
-+ public string description { get; set; default = ""; }
-+ public string icon_name { get; construct set; default = ""; }
-+ public bool has_thumbnail { get; construct set; default = false; }
-+ public string thumbnail_path { get; construct set; }
-+ public MatchType match_type { get; construct set; }
-+
+ public ShutDownAction ()
+ {
-+ Object (match_type: MatchType.ACTION, title: _ ("Shut Down"),
-+ description: _ ("Turn your computer off"),
++ Object (title: _("Shut Down"),
++ description: _("Turn your computer off"),
+ icon_name: "system-shutdown", has_thumbnail: false);
+ }
+
-+ public void execute (Match? match)
++ public override void do_action ()
+ {
+ try
+ {
@@ -130,24 +88,16 @@ diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.1
+ }
+ }
+
-+ private class RebootAction: Object, Match
++ private class RebootAction: ActionMatch
+ {
-+ // for Match interface
-+ public string title { get; construct set; }
-+ public string description { get; set; default = ""; }
-+ public string icon_name { get; construct set; default = ""; }
-+ public bool has_thumbnail { get; construct set; default = false; }
-+ public string thumbnail_path { get; construct set; }
-+ public MatchType match_type { get; construct set; }
-+
+ public RebootAction ()
+ {
-+ Object (match_type: MatchType.ACTION, title: _ ("Restart"),
-+ description: _ ("Restart your computer"),
-+ icon_name: "system-shutdown", has_thumbnail: false);
++ Object (title: _("Restart"),
++ description: _("Restart your computer"),
++ icon_name: "gnome-session-reboot", has_thumbnail: false);
+ }
+
-+ public void execute (Match? match)
++ public override void do_action ()
+ {
+ try
+ {
@@ -164,24 +114,16 @@ diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.1
+ }
+ }
+
-+ private class LogOutAction: Object, Match
++ private class LogOutAction: ActionMatch
+ {
-+ // for Match interface
-+ public string title { get; construct set; }
-+ public string description { get; set; default = ""; }
-+ public string icon_name { get; construct set; default = ""; }
-+ public bool has_thumbnail { get; construct set; default = false; }
-+ public string thumbnail_path { get; construct set; }
-+ public MatchType match_type { get; construct set; }
-+
+ public LogOutAction ()
+ {
-+ Object (match_type: MatchType.ACTION, title: _ ("Log Out"),
-+ description: _ ("Close your session and return to the login screen"),
-+ icon_name: "system-log-out", has_thumbnail: false);
++ Object (title: _("Log Out"),
++ description: _("Close your session and return to the login screen"),
++ icon_name: "gnome-session-logout", has_thumbnail: false);
+ }
+
-+ public void execute (Match? match)
++ public override void do_action ()
+ {
+ try
+ {
@@ -205,7 +147,7 @@ diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.1
+
+ static void register_plugin ()
+ {
-+ DataSink.PluginRegistry.get_default ().register_plugin (
++ PluginRegistry.get_default ().register_plugin (
+ typeof (MateSessionPlugin),
+ "MATE Session",
+ _ ("Log out from your session."),
@@ -228,7 +170,7 @@ diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.1
+ {
+ var cache = DBusService.get_default ();
+ session_manager_available = cache.name_has_owner (MateSessionManager.UNIQUE_NAME);
-+ Utils.Logger.log (this, "%s %s available", MateSessionManager.UNIQUE_NAME,
++ message ("%s %s available", MateSessionManager.UNIQUE_NAME,
+ session_manager_available ? "is" : "isn't");
+
+ actions = new Gee.LinkedList<Match> ();
@@ -255,7 +197,7 @@ diff -urN synapse-0.2.10.orig/src/plugins/mate-session-plugin.vala synapse-0.2.1
+ {
+ if (matcher.key.match (action.title))
+ {
-+ result.add (action, matcher.value - Match.Score.INCREMENT_SMALL);
++ result.add (action, matcher.value - MatchScore.INCREMENT_SMALL);
+ break;
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/synapse.git/commitdiff/9027cc73e7f2ee75f02845644c12768d78b03b66
More information about the pld-cvs-commit
mailing list