From 5e5af02189590e713becee70331c23940d5897ae Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 18 Apr 2020 14:41:50 +0200 Subject: [PATCH 1/3] update to version 2.6.0 --- .gitignore | 1 + f3676a5.patch | 62 ++++++++++++++++++++++++++++++++ sources | 2 +- wingpanel-applications-menu.spec | 13 +++++-- 4 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 f3676a5.patch diff --git a/.gitignore b/.gitignore index 83c10f1..97f1ac0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /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 7194416..9de18ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-applications-menu-2.5.0.tar.gz) = 040fb9402b72f01261ab495ef33f03c55c55344c88d7ff4ae4a8f9ace942c7a64e435632d9cb9db1035d5394dc364d857a2b4e7ddd59edc0ef74b8c67a7865dd +SHA512 (wingpanel-applications-menu-2.6.0.tar.gz) = 28a1d9fb50a8edfbaed60faee1cdbe33e3db646c0431d1543b0ed003ab38281376f54df0c21a95309cb006a599e5cd5f687703e1dad3159b9646c47a0ded4427 diff --git a/wingpanel-applications-menu.spec b/wingpanel-applications-menu.spec index acc1d22..48363f0 100644 --- a/wingpanel-applications-menu.spec +++ b/wingpanel-applications-menu.spec @@ -1,17 +1,20 @@ -%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$ - %global srcname 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.5.0 +Version: 2.6.0 Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# upstream patch to fix libdir subdirectory name +Patch0: %{url}/commit/f3676a5.patch + BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson @@ -72,6 +75,7 @@ appstream-util validate-relax --nonet \ %config(noreplace) %{_sysconfdir}/xdg/menus/pantheon-applications.menu +%{_libdir}/%{appname}/ %{_libdir}/wingpanel/libslingshot.so %{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.applications-menu.gschema.xml @@ -79,6 +83,9 @@ appstream-util validate-relax --nonet \ %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. From 90b05cc1d002df27d4343d2f2e810fe1fcfd6fbc Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 9 May 2020 14:32:06 +0200 Subject: [PATCH 2/3] update to version 2.7.0 --- .gitignore | 1 + f3676a5.patch | 62 -------------------------------- sources | 2 +- wingpanel-applications-menu.spec | 11 +++--- 4 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 f3676a5.patch diff --git a/.gitignore b/.gitignore index 97f1ac0..20c5ba1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /wingpanel-applications-menu-2.4.4.tar.gz /wingpanel-applications-menu-2.5.0.tar.gz /wingpanel-applications-menu-2.6.0.tar.gz +/applications-menu-2.7.0.tar.gz diff --git a/f3676a5.patch b/f3676a5.patch deleted file mode 100644 index b4c68dd..0000000 --- a/f3676a5.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 9de18ca..5d37066 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wingpanel-applications-menu-2.6.0.tar.gz) = 28a1d9fb50a8edfbaed60faee1cdbe33e3db646c0431d1543b0ed003ab38281376f54df0c21a95309cb006a599e5cd5f687703e1dad3159b9646c47a0ded4427 +SHA512 (applications-menu-2.7.0.tar.gz) = bbe66218c27256bfdd0b89f210a2a800dad8d06d34a410cf71ff01f4492e02d6cd0b5ebe2322220e8ded35814253c3e517fdbaad36a44cbe001e8390b00ca0d4 diff --git a/wingpanel-applications-menu.spec b/wingpanel-applications-menu.spec index 48363f0..6726959 100644 --- a/wingpanel-applications-menu.spec +++ b/wingpanel-applications-menu.spec @@ -5,15 +5,12 @@ Name: wingpanel-applications-menu Summary: Lightweight and stylish app launcher -Version: 2.6.0 +Version: 2.7.0 Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{srcname} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz - -# upstream patch to fix libdir subdirectory name -Patch0: %{url}/commit/f3676a5.patch +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz BuildRequires: gettext BuildRequires: libappstream-glib @@ -29,6 +26,7 @@ BuildRequires: pkgconfig(granite) >= 0.5 BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libgnome-menu-3.0) +BuildRequires: pkgconfig(libhandy-0.0) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(plank) >= 0.10.9 BuildRequires: pkgconfig(switchboard-2.0) @@ -83,6 +81,9 @@ appstream-util validate-relax --nonet \ %changelog +* Sat May 09 2020 Fabio Valentini - 2.7.0-1 +- Update to version 2.7.0. + * Sat Apr 18 2020 Fabio Valentini - 2.6.0-1 - Update to version 2.6.0. From 1669fe37296b30b58a53039cc76bbae0aba95711 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Fri, 29 May 2020 00:50:27 +0200 Subject: [PATCH 3/3] update to version 2.7.1 --- .gitignore | 1 + 00-drop-broken-meson-deps.patch | 44 ++++++++++++++++++++++++++++++++ sources | 2 +- wingpanel-applications-menu.spec | 15 ++++++++--- 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 00-drop-broken-meson-deps.patch diff --git a/.gitignore b/.gitignore index 20c5ba1..3bdf088 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /wingpanel-applications-menu-2.5.0.tar.gz /wingpanel-applications-menu-2.6.0.tar.gz /applications-menu-2.7.0.tar.gz +/applications-menu-2.7.1.tar.gz diff --git a/00-drop-broken-meson-deps.patch b/00-drop-broken-meson-deps.patch new file mode 100644 index 0000000..7fbb6de --- /dev/null +++ b/00-drop-broken-meson-deps.patch @@ -0,0 +1,44 @@ +diff --git a/meson.build b/meson.build +index 927731f..6089994 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,20 +43,12 @@ libsoup_dep = dependency('libsoup-2.4') + appstream_dep = dependency('appstream') + gio_unix_dep = dependency('gio-unix-2.0') + json_glib_dep = dependency('json-glib-1.0') +-zeitgeist_dep = dependency('zeitgeist-2.0') + switchboard_dep = dependency('switchboard-2.0') + libgnome_menu_dep = dependency('libgnome-menu-3.0') + libhandy_dep = dependency('libhandy-0.0') + wingpanel_dep = dependency('wingpanel-2.0', version: '>=2.1.0') + posix_dep = meson.get_compiler('vala').find_library('posix') + +-unity_dep = [] +- +-if get_option('with-unity') +- unity_dep = dependency('unity', version: '>=4.0.0') +- add_project_arguments('--define=HAVE_UNITY', language: 'vala') +-endif +- + plank_dep = dependency('plank', required: false) + if plank_dep.version().version_compare('>=0.10.9') + add_project_arguments('--define=HAS_PLANK', language: 'vala') +diff --git a/meson_options.txt b/meson_options.txt +index f970ad3..9e825c1 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,2 +1 @@ +-option('with-unity', type : 'boolean', value : 'true', description : 'Add Unity launcher support') + option('with-zeitgeist', type : 'boolean', value : 'true', description : 'Add Zeitgeist support') +diff --git a/src/meson.build b/src/meson.build +index 30e194b..09cfd10 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -78,7 +78,6 @@ dependencies = [ + libsoup_dep, + appstream_dep, + plank_dep, +- unity_dep, + wingpanel_dep, + libhandy_dep, + posix_dep, diff --git a/sources b/sources index 5d37066..5a93eeb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (applications-menu-2.7.0.tar.gz) = bbe66218c27256bfdd0b89f210a2a800dad8d06d34a410cf71ff01f4492e02d6cd0b5ebe2322220e8ded35814253c3e517fdbaad36a44cbe001e8390b00ca0d4 +SHA512 (applications-menu-2.7.1.tar.gz) = 3ba9b7d6491d0cb50edaa72ea04900deba71c6e1706ff0b81278e4b1462581e6ad379a59e7e0283aab19b71c3587ab872f241aae0505f2b4a857cf6da95a3bdb diff --git a/wingpanel-applications-menu.spec b/wingpanel-applications-menu.spec index 6726959..8638a9b 100644 --- a/wingpanel-applications-menu.spec +++ b/wingpanel-applications-menu.spec @@ -5,13 +5,18 @@ Name: wingpanel-applications-menu Summary: Lightweight and stylish app launcher -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} License: GPLv3+ URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz +# - drop unity dependency from meson entirely +# - allow disabling "optional" zeitgeist dependency +# https://github.com/elementary/applications-menu/pull/392 +Patch0: 00-drop-broken-meson-deps.patch + BuildRequires: gettext BuildRequires: libappstream-glib BuildRequires: meson @@ -30,9 +35,7 @@ BuildRequires: pkgconfig(libhandy-0.0) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(plank) >= 0.10.9 BuildRequires: pkgconfig(switchboard-2.0) -BuildRequires: pkgconfig(unity) >= 4.0.0 BuildRequires: pkgconfig(wingpanel-2.0) >= 2.1.0 -BuildRequires: pkgconfig(zeitgeist-2.0) Requires: redhat-menus @@ -52,7 +55,7 @@ The lightweight and stylish app launcher from elementary. %build -%meson +%meson -Dwith-zeitgeist=false %meson_build @@ -81,6 +84,10 @@ appstream-util validate-relax --nonet \ %changelog +* Thu May 28 2020 Fabio Valentini - 2.7.1-1 +- Update to version 2.7.1. +- Drop useless unity and zeitgeist dependencies. + * Sat May 09 2020 Fabio Valentini - 2.7.0-1 - Update to version 2.7.0.