diff --git a/.gitignore b/.gitignore index 094bd88..97f1ac0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ /wingpanel-applications-menu-2.4.1.tar.gz /wingpanel-applications-menu-2.4.2.tar.gz /wingpanel-applications-menu-2.4.3.tar.gz +/wingpanel-applications-menu-2.4.4.tar.gz +/wingpanel-applications-menu-2.5.0.tar.gz +/wingpanel-applications-menu-2.6.0.tar.gz diff --git a/f3676a5.patch b/f3676a5.patch new file mode 100644 index 0000000..b4c68dd --- /dev/null +++ b/f3676a5.patch @@ -0,0 +1,62 @@ +From f3676a5f478fd511a7e21b5343a40411c93e494a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= +Date: Mon, 13 Apr 2020 21:57:21 +0200 +Subject: [PATCH] switchboard-plugin: Rename the plugins directory and fix type + in Applications Menu name (#363) + +--- + meson.build | 2 +- + src/synapse-plugins/switchboard-plugin.vala | 4 ++-- + src/synapse-plugins/switchboard-plugin/plugin.vala | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 36531343..e8703a2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -27,7 +27,7 @@ add_project_arguments( + language: 'c' + ) + +-pluginsdir = join_paths(prefix, get_option('libdir'), 'io.elementary.application-menu') ++pluginsdir = join_paths(prefix, get_option('libdir'), 'io.elementary.wingpanel.applications-menu') + add_project_arguments( + '-DPLUGINSDIR="@0@"'.format(pluginsdir), + language: 'c' +diff --git a/src/synapse-plugins/switchboard-plugin.vala b/src/synapse-plugins/switchboard-plugin.vala +index df2968ce..0c2d5512 100644 +--- a/src/synapse-plugins/switchboard-plugin.vala ++++ b/src/synapse-plugins/switchboard-plugin.vala +@@ -26,7 +26,7 @@ public struct Synapse.PlugInfo { + public string[] path; + } + +-[DBus (name = "io.elementary.ApplicationMenu.Switchboard")] ++[DBus (name = "io.elementary.ApplicationsMenu.Switchboard")] + public class Synapse.SwitchboardExecutablePlugin : Object { + private Synapse.PlugInfo[] plugs; + +@@ -86,7 +86,7 @@ public class Synapse.SwitchboardPlugin : Object, Activatable, ItemProvider { + worker_link = new Synapse.WorkerLink (); + worker_link.on_connection_accepted.connect ((connection) => { + try { +- connection.register_object ("/io/elementary/applicationmenu", executable_plugin); ++ connection.register_object ("/io/elementary/applicationsmenu", executable_plugin); + } catch (Error e) { + critical ("%s", e.message); + } +diff --git a/src/synapse-plugins/switchboard-plugin/plugin.vala b/src/synapse-plugins/switchboard-plugin/plugin.vala +index 07e45f91..e67c78a3 100644 +--- a/src/synapse-plugins/switchboard-plugin/plugin.vala ++++ b/src/synapse-plugins/switchboard-plugin/plugin.vala +@@ -37,8 +37,8 @@ public class SwitchboardPlugin : GLib.Object { + private GLib.MainLoop main_loop; + private GLib.DBusConnection connection; + +- const string DBUS_INTERFACE = "io.elementary.ApplicationMenu.Switchboard"; +- const string DBUS_PATH = "/io/elementary/applicationmenu"; ++ const string DBUS_INTERFACE = "io.elementary.ApplicationsMenu.Switchboard"; ++ const string DBUS_PATH = "/io/elementary/applicationsmenu"; + + construct { + main_loop = new GLib.MainLoop (); diff --git a/sources b/sources index de11ea7..9de18ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-applications-menu-2.4.3.tar.gz) = 03d9e4cb379a4d1d53352f05f1d84c8dde4eb256cde30729ee05cb4722333607c3e7d9f9d5a22bf060cd6324c6a33bad6e965d8e944d9babecc7a12cb37a848d +SHA512 (wingpanel-applications-menu-2.6.0.tar.gz) = 28a1d9fb50a8edfbaed60faee1cdbe33e3db646c0431d1543b0ed003ab38281376f54df0c21a95309cb006a599e5cd5f687703e1dad3159b9646c47a0ded4427 diff --git a/wingpanel-applications-menu.spec b/wingpanel-applications-menu.spec index 8ba177e..44dfb81 100644 --- a/wingpanel-applications-menu.spec +++ b/wingpanel-applications-menu.spec @@ -1,21 +1,23 @@ -%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ - %global srcname applications-menu -%global appname io.elementary.desktop.wingpanel.applications-menu +%global appname io.elementary.wingpanel.applications-menu + +%global __provides_exclude_from ^%{_libdir}/(wingpanel|%{appname})/.*\\.so$ Name: wingpanel-applications-menu Summary: Lightweight and stylish app launcher -Version: 2.4.3 +Version: 2.6.0 Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ +# upstream patch to fix libdir subdirectory name +Patch0: %{url}/commit/f3676a5.patch + BuildRequires: gettext +BuildRequires: libappstream-glib +BuildRequires: meson BuildRequires: vala >= 0.32.1 BuildRequires: appstream-vala @@ -52,32 +54,45 @@ The lightweight and stylish app launcher from elementary. %build -mkdir build && pushd build -%cmake .. -%make_build -popd +%meson +%meson_build %install -pushd build -%make_install -popd +%meson_install %find_lang slingshot +%check +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + + %files -f slingshot.lang %doc README.md %license COPYING %config(noreplace) %{_sysconfdir}/xdg/menus/pantheon-applications.menu +%{_libdir}/%{appname}/ %{_libdir}/wingpanel/libslingshot.so -%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml +%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.applications-menu.gschema.xml +%{_datadir}/metainfo/%{appname}.appdata.xml %changelog +* Sat Apr 18 2020 Fabio Valentini - 2.6.0-1 +- Update to version 2.6.0. + +* Mon Nov 25 2019 Fabio Valentini - 2.5.0-1 +- Update to version 2.5.0. +- Switch to meson build system. + +* Fri Aug 23 2019 Fabio Valentini - 2.4.4-1 +- Update to version 2.4.4. + * Fri May 17 2019 Fabio Valentini - 2.4.3-1 - Update to version 2.4.3.