commit bc647f18bb825da7eaec6061505522b721a4a741
Author: Jan Palus <[email protected]>
Date: Tue Mar 19 00:00:31 2019 +0100
up to 1.22.0
mate-panel.spec | 13 ++++++-------
no-xdg-menu-prefix.patch | 37 ++++++++++++++++++++-----------------
2 files changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index ddc1754..37aa4c0 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -5,12 +5,12 @@
Summary: MATE Desktop panel applets
Summary(pl.UTF-8): Aplety panelu dla środowiska MATE Desktop
Name: mate-panel
-Version: 1.20.5
+Version: 1.22.0
Release: 1
License: LGPL v2+ (library), GPL v2+ (applets)
Group: X11/Applications
-Source0:
http://pub.mate-desktop.org/releases/1.20/%{name}-%{version}.tar.xz
-# Source0-md5: 5c14a2870f4858257c57dd889922124d
+Source0:
http://pub.mate-desktop.org/releases/1.22/%{name}-%{version}.tar.xz
+# Source0-md5: 82f99551476bff08dca6140e52de10c2
Patch0: no-xdg-menu-prefix.patch
URL: http://wiki.mate-desktop.org/mate-panel
BuildRequires: NetworkManager-devel >= 0.6
@@ -18,7 +18,6 @@ BuildRequires: autoconf >= 2.53
BuildRequires: automake >= 1:1.9
BuildRequires: cairo-devel >= 1.0.0
BuildRequires: dbus-devel >= 1.1.2
-BuildRequires: dbus-glib-devel >= 0.80
BuildRequires: dconf-devel >= 0.13.4
BuildRequires: desktop-file-utils
BuildRequires: docbook-dtd412-xml
@@ -36,13 +35,14 @@ BuildRequires: libtool >= 1:1.4.3
BuildRequires: libwnck-devel >= 3.4.6
BuildRequires: mate-common
BuildRequires: mate-desktop-devel >= 1.17.0
-BuildRequires: mate-menus-devel >= 1.10.0
+BuildRequires: mate-menus-devel >= 1.21.0
BuildRequires: pango-devel >= 1:1.15.4
BuildRequires: pkgconfig
BuildRequires: python >= 2
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(find_lang) >= 1.36
BuildRequires: tar >= 1:1.22
+BuildRequires: wayland-devel
BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libSM-devel
BuildRequires: xorg-lib-libX11-devel
@@ -52,7 +52,6 @@ BuildRequires: xz
BuildRequires: yelp-tools
Requires: %{name}-libs = %{version}-%{release}
Requires: dbus >= 1.1.2
-Requires: dbus-glib >= 0.80
Requires: dconf >= 0.13.4
Requires: desktop-file-utils
Requires: gsettings-desktop-schemas
@@ -62,7 +61,7 @@ Requires: librsvg >= 2.36.2
Requires: libwnck >= 3.4.6
Requires: marco
Requires: mate-desktop >= 1.17.0
-Requires: mate-menus >= 1.10.0
+Requires: mate-menus >= 1.21.0
Suggests: mate-settings-daemon
# for fish
Requires: fortune-mod
diff --git a/no-xdg-menu-prefix.patch b/no-xdg-menu-prefix.patch
index 1d60afd..b5fa89c 100644
--- a/no-xdg-menu-prefix.patch
+++ b/no-xdg-menu-prefix.patch
@@ -31,31 +31,34 @@
{SETTINGS_MENU, "mate-settings", "mate-settings.menu"}
};
---- mate-panel-1.5.3/./mate-panel/panel-addto.c~ 2012-12-20
00:48:50.000000000 +0200
-+++ mate-panel-1.5.3/./mate-panel/panel-addto.c 2013-01-16
12:08:31.741369388 +0200
-@@ -692,12 +692,12 @@
+--- mate-panel-1.22.0/mate-panel/panel-addto.c.orig 2019-03-18
23:53:11.196726003 +0100
++++ mate-panel-1.22.0/mate-panel/panel-addto.c 2019-03-18 23:54:51.086061909
+0100
+@@ -677,7 +677,7 @@
- store = gtk_tree_store_new(NUMBER_COLUMNS, GDK_TYPE_PIXBUF,
G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
+ store = gtk_tree_store_new(NUMBER_COLUMNS, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
-- tree = matemenu_tree_lookup("mate-applications.menu",
MATEMENU_TREE_FLAGS_NONE);
-+ tree = matemenu_tree_lookup("applications.menu",
MATEMENU_TREE_FLAGS_NONE);
- matemenu_tree_set_sort_key(tree, MATEMENU_TREE_SORT_DISPLAY_NAME);
+- tree = matemenu_tree_new ("mate-applications.menu",
MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = matemenu_tree_new ("applications.menu",
MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+ if (! matemenu_tree_load_sync (tree, &error)) {
+ g_warning("Applications menu tree loading got error:%s\n",
error->message);
+ g_error_free(error);
+@@ -686,7 +686,7 @@
- if ((root = matemenu_tree_get_root_directory (tree)))
+ if ((root = matemenu_tree_get_root_directory (tree)) != NULL )
{
- panel_addto_make_application_list(&dialog->application_list,
root, "mate-applications.menu");
+ panel_addto_make_application_list(&dialog->application_list,
root, "applications.menu");
panel_addto_populate_application_model(store, NULL,
dialog->application_list);
matemenu_tree_item_unref(root);
---- mate-panel-1.5.3/./mate-panel/panel-run-dialog.c~ 2012-12-20
00:48:50.000000000 +0200
-+++ mate-panel-1.5.3/./mate-panel/panel-run-dialog.c 2013-01-16
12:08:41.471818295 +0200
-@@ -857,7 +857,7 @@
- MateMenuTreeDirectory* root;
+--- mate-panel-1.22.0/mate-panel/panel-run-dialog.c.orig 2019-03-18
23:53:11.196726003 +0100
++++ mate-panel-1.22.0/mate-panel/panel-run-dialog.c 2019-03-18
23:55:51.322327695 +0100
+@@ -836,7 +836,7 @@
+ GError *error = NULL;
GSList* retval;
-- tree = matemenu_tree_lookup("mate-applications.menu",
MATEMENU_TREE_FLAGS_NONE);
-+ tree = matemenu_tree_lookup("applications.menu",
MATEMENU_TREE_FLAGS_NONE);
- matemenu_tree_set_sort_key(tree, MATEMENU_TREE_SORT_DISPLAY_NAME);
-
- root = matemenu_tree_get_root_directory(tree);
+- tree = matemenu_tree_new ("mate-applications.menu",
MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = matemenu_tree_new ("applications.menu",
MATEMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+ if (!matemenu_tree_load_sync (tree, &error)) {
+ g_printerr ("Failed to load tree: %s\n", error->message);
+ g_error_free(error);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-panel.git/commitdiff/bc647f18bb825da7eaec6061505522b721a4a741
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
