[packages/mate-mintmenu] up to 5.9.7
atler
atler at pld-linux.org
Sat Jul 27 12:38:09 CEST 2019
commit 0265626ae22a27cc4a32ac6b0dee1d54be4c46f6
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Jul 27 12:37:25 2019 +0200
up to 5.9.7
mate-menus-1.22.patch | 156 -----------------------------------------------
mate-mintmenu-icon.patch | 2 +-
mate-mintmenu.spec | 25 ++++----
3 files changed, 12 insertions(+), 171 deletions(-)
---
diff --git a/mate-mintmenu.spec b/mate-mintmenu.spec
index b8e6e0a..2f61278 100644
--- a/mate-mintmenu.spec
+++ b/mate-mintmenu.spec
@@ -1,15 +1,14 @@
Summary: Advanced MATE menu
Summary(pl.UTF-8): Zaawansowane menu dla MATE
Name: mate-mintmenu
-Version: 5.9.1
-Release: 2
+Version: 5.9.7
+Release: 1
License: GPL v2
Group: X11/Applications
Source0: http://packages.linuxmint.com/pool/main/m/mintmenu/mintmenu_%{version}.tar.xz
-# Source0-md5: 514377f50ec415bb4d1d6db9672ba070
+# Source0-md5: 620b5a719a8b9d2787500a3a9eeb0387
Patch0: %{name}-icon.patch
Patch1: %{name}-disable-apt.patch
-Patch2: mate-menus-1.22.patch
URL: https://github.com/linuxmint/mintmenu
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
@@ -27,6 +26,8 @@ Requires: python-modules
Requires: python-pygobject3
Requires: python-pyxdg
Requires: python-setproctitle
+Requires: python-xapp
+Requires: python-xapps-overrides
Requires: xdg-utils
Suggests: python-pyinotify
BuildArch: noarch
@@ -42,22 +43,20 @@ Zaawansowane menu dla MATE.
%setup -qc
%patch0 -p1
%patch1 -p1
-%patch2 -p1
mv mintmenu/* .
-%{__sed} -i 's,version = commands.getoutput("/usr/lib/linuxmint/common/version.py mintmenu"),version = "%{version}",' usr/lib/linuxmint/mintMenu/mintMenu.py
-grep -rl '%{_prefix}/lib/linuxmint/mintMenu' usr | xargs %{__sed} -i 's,%{_prefix}/lib/linuxmint/mintMenu,%{_datadir}/%{name},g'
+%{__sed} -i 's,__DEB_VERSION__,%{version},' usr/lib/linuxmint/mintMenu/mintMenu.py
+grep -rl 'usr/lib/linuxmint/mintMenu' usr | xargs %{__sed} -i 's,usr/lib/linuxmint/mintMenu,%{_datadir}/%{name},g'
+grep -rl 'usr/share/linuxmint/mintmenu' usr | xargs %{__sed} -i 's,usr/share/linuxmint/mintmenu,%{_datadir}/%{name},g'
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}}
cp -pr usr/lib/linuxmint/mintMenu $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr usr/share/linuxmint/mintmenu/*.ui $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr usr/share/{dbus-1,glib-2.0,man,mate-panel,pixmaps} $RPM_BUILD_ROOT%{_datadir}
install -p usr/bin/mintmenu $RPM_BUILD_ROOT%{_bindir}
-# (build time) to compile *.py
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/compile.py
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -73,18 +72,16 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/applications.list
%{_datadir}/%{name}/keybinding.py
-%{_datadir}/%{name}/mintMenuConfig.glade
-%attr(755,root,root) %{_datadir}/%{name}/mintMenuConfig.py
-%{_datadir}/%{name}/mintMenu.glade
%attr(755,root,root) %{_datadir}/%{name}/mintMenu.py
+%attr(755,root,root) %{_datadir}/%{name}/preferences.py
%dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/plugins/*.glade
%{_datadir}/%{name}/plugins/*.py
%{_datadir}/%{name}/pointerMonitor.py
%{_datadir}/%{name}/popup.xml
%{_datadir}/%{name}/search_engines
%{_datadir}/%{name}/*.png
%{_datadir}/%{name}/*.svg
+%{_datadir}/%{name}/*.ui
%{_datadir}/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service
%{_datadir}/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
%{_mandir}/man1/mintmenu.1*
diff --git a/mate-menus-1.22.patch b/mate-menus-1.22.patch
deleted file mode 100644
index 1bf50e6..0000000
--- a/mate-menus-1.22.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- mate-mintmenu-5.9.1.orig/mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2019-03-19 23:11:55.748303593 +0100
-+++ mate-mintmenu-5.9.1/mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2019-03-20 00:04:22.751620910 +0100
-@@ -2,8 +2,9 @@
-
- import gi
- gi.require_version("Gtk", "3.0")
-+gi.require_version("MateMenu", "2.0")
-
--from gi.repository import Gtk, Pango, Gdk, Gio, GLib
-+from gi.repository import Gtk, Pango, Gdk, Gio, GLib, MateMenu
-
- import os
- import time
-@@ -20,8 +21,6 @@
- import recentHelper as RecentHelper
- import pipes
-
--import matemenu
--
- from user import home
-
- # i18n
-@@ -86,7 +85,8 @@
-
- class Menu:
- def __init__( self, MenuToLookup ):
-- self.tree = matemenu.lookup_tree( MenuToLookup )
-+ self.tree = MateMenu.Tree.new( MenuToLookup, MateMenu.TreeFlags.NONE )
-+ self.tree.load_sync()
- self.directory = self.tree.get_root_directory()
-
- def getMenus( self, parent=None ):
-@@ -94,19 +94,29 @@
- #gives top-level "Applications" item
- yield self.tree.root
- else:
-- for menu in parent.get_contents():
-- if menu.get_type() == matemenu.TYPE_DIRECTORY and self.__isVisible( menu ):
-- yield menu
-+ item_iter = parent.iter()
-+ item_type = item_iter.next()
-+ while item_type != MateMenu.TreeItemType.INVALID:
-+ if item_type == MateMenu.TreeItemType.DIRECTORY:
-+ item = item_iter.get_directory()
-+ if self.__isVisible( item ):
-+ yield item
-+ item_type = item_iter.next()
-
- def getItems( self, menu ):
-- for item in menu.get_contents():
-- if item.get_type() == matemenu.TYPE_ENTRY and item.get_desktop_file_id()[-19:] != '-usercustom.desktop' and self.__isVisible( item ):
-- yield item
-+ item_iter = menu.iter()
-+ item_type = item_iter.next()
-+ while item_type != MateMenu.TreeItemType.INVALID:
-+ if item_type == MateMenu.TreeItemType.ENTRY:
-+ item = item_iter.get_entry()
-+ if item.get_desktop_file_id()[-19:] != '-usercustom.desktop' and self.__isVisible( item ):
-+ yield item
-
- def __isVisible( self, item ):
-- if item.get_type() == matemenu.TYPE_ENTRY:
-- return not ( item.get_is_excluded() or item.get_is_nodisplay() )
-- if item.get_type() == matemenu.TYPE_DIRECTORY and len( item.get_contents() ):
-+ if isinstance(item, MateMenu.TreeEntry):
-+ app_info = item.get_app_info()
-+ return not ( item.get_is_excluded() or app_info.get_nodisplay() )
-+ if isinstance(item, MateMenu.TreeDirectory) and item.iter().next() != MateMenu.TreeItemType.INVALID:
- return True
-
-
-@@ -271,7 +281,7 @@
-
- for mainitems in [ "mate-applications.menu", "mate-settings.menu" ]:
- mymenu = Menu( mainitems )
-- mymenu.tree.add_monitor( self.menuChanged, None )
-+ mymenu.tree.connect( "changed", self.menuChanged )
-
- self.refresh_apt_cache()
- self.suggestions = []
-@@ -1726,13 +1736,14 @@
- num = 1
-
- for menu in self.menuFiles:
-- for child in menu.directory.get_contents():
-- if child.get_type() == matemenu.TYPE_DIRECTORY:
-- icon = str(child.icon)
-- #if (icon == "preferences-system"):
-- # self.adminMenu = child.name
-- #if (icon != "applications-system" and icon != "applications-other"):
-- newCategoryList.append( { "name": child.name, "icon": child.icon, "tooltip": child.name, "filter": child.name, "index": num } )
-+ item_iter = menu.directory.iter()
-+ item_type = item_iter.next()
-+ while item_type != MateMenu.TreeItemType.INVALID:
-+ if item_type == MateMenu.TreeItemType.DIRECTORY:
-+ child = item_iter.get_directory()
-+ icon = child.get_icon().get_names()[0]
-+ newCategoryList.append( { "name": child.get_name(), "icon": icon, "tooltip": child.get_name(), "filter": child.get_name(), "index": num } )
-+ item_type = item_iter.next()
- num += 1
-
- return newCategoryList
-@@ -1743,29 +1754,34 @@
- newApplicationsList = []
-
- def find_applications_recursively(app_list, directory, catName):
-- for item in directory.get_contents():
-- if item.get_type() == matemenu.TYPE_ENTRY:
-+ item_iter = directory.iter()
-+ item_type = item_iter.next()
-+ while item_type != MateMenu.TreeItemType.INVALID:
-+ if item_type == MateMenu.TreeItemType.ENTRY:
-+ item = item_iter.get_entry()
- app_list.append( { "entry": item, "category": catName } )
-- elif item.get_type() == matemenu.TYPE_DIRECTORY:
-+ elif item_type == MateMenu.TreeItemType.DIRECTORY:
-+ item = item_iter.get_directory()
- find_applications_recursively(app_list, item, catName)
-+ item_type = item_iter.next()
-
- for menu in self.menuFiles:
- directory = menu.directory
-- for entry in directory.get_contents():
-- if entry.get_type() == matemenu.TYPE_DIRECTORY and len(entry.get_contents()):
-- #Entry is a top-level category
-- #catName = entry.name
-- #icon = str(entry.icon)
-- #if (icon == "applications-system" or icon == "applications-other"):
-- # catName = self.adminMenu
-- for item in entry.get_contents():
-- if item.get_type() == matemenu.TYPE_DIRECTORY:
-- find_applications_recursively(newApplicationsList, item, entry.name)
-- elif item.get_type() == matemenu.TYPE_ENTRY:
-- newApplicationsList.append( { "entry": item, "category": entry.name } )
-- #elif entry.get_type() == matemenu.TYPE_ENTRY:
-- # if not (entry.get_is_excluded() or entry.get_is_nodisplay()):
-- # print "=======>>> " + item.name + " = top level"
-- # newApplicationsList.append( { "entry": item, "category": "" } )
-+ entry_iter = directory.iter()
-+ entry_type = entry_iter.next()
-+ while entry_type != MateMenu.TreeItemType.INVALID:
-+ if entry_type == MateMenu.TreeItemType.DIRECTORY:
-+ entry = entry_iter.get_directory()
-+ item_iter = entry.iter()
-+ item_type = item_iter.next()
-+ while item_type != MateMenu.TreeItemType.INVALID:
-+ if item_type == MateMenu.TreeItemType.ENTRY:
-+ item = item_iter.get_entry()
-+ newApplicationsList.append( { "entry": item, "category": entry.get_name() } )
-+ elif item_type == MateMenu.TreeItemType.DIRECTORY:
-+ item = item_iter.get_directory()
-+ find_applications_recursively(newApplicationsList, item, entry.get_name())
-+ item_type = item_iter.next()
-+ entry_type = entry_iter.next()
-
- return newApplicationsList
diff --git a/mate-mintmenu-icon.patch b/mate-mintmenu-icon.patch
index e731828..11f478d 100644
--- a/mate-mintmenu-icon.patch
+++ b/mate-mintmenu-icon.patch
@@ -6,7 +6,7 @@ diff -ru mate-mintmenu-5.9.1/mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.m
<key type="s" name="applet-icon">
- <default>"/usr/share/icons/hicolor/scalable/apps/linuxmint-logo-5.svg"</default>
-+ <default>"/usr/share/mate-mintmenu/mintMenu.png"</default>
++ <default>"/usr/share/pixmaps/mintmenu.svg"</default>
<summary></summary>
<description></description>
</key>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-mintmenu.git/commitdiff/0265626ae22a27cc4a32ac6b0dee1d54be4c46f6
More information about the pld-cvs-commit
mailing list