sysutils/menulibre: completely remove patch now that we have a working psutil
discussed with sthen@
This commit is contained in:
parent
9ae3bd6773
commit
8ea209b8a9
|
@ -1,7 +1,7 @@
|
|||
COMMENT = fd.o-compliant menu editor
|
||||
|
||||
MODPY_EGG_VERSION = 2.3.0
|
||||
REVISION = 1
|
||||
REVISION = 2
|
||||
DISTNAME = menulibre-${MODPY_EGG_VERSION}
|
||||
GH_ACCOUNT = bluesabre
|
||||
GH_PROJECT = menulibre
|
||||
|
|
|
@ -1,43 +0,0 @@
|
|||
Index: menulibre/util.py
|
||||
--- menulibre/util.py.orig
|
||||
+++ menulibre/util.py
|
||||
@@ -195,38 +195,7 @@ def getDefaultMenuName():
|
||||
|
||||
def getDefaultMenuPrefix(): # noqa
|
||||
"""Return the default menu prefix."""
|
||||
- prefix = os.environ.get('XDG_MENU_PREFIX', '')
|
||||
-
|
||||
- # Cinnamon and MATE don't set this variable
|
||||
- if prefix == "":
|
||||
- if 'cinnamon' in os.environ.get('DESKTOP_SESSION', ''):
|
||||
- prefix = 'cinnamon-'
|
||||
- elif 'mate' in os.environ.get('DESKTOP_SESSION', ''):
|
||||
- prefix = 'mate-'
|
||||
- # Somehow the XDG_MENU_PREFIX isn't exposed in Ubuntu Unity
|
||||
- elif 'unity' in os.environ.get('DESKTOP_SESSION', ''):
|
||||
- prefix = 'gnome-'
|
||||
-
|
||||
- if prefix == "":
|
||||
- desktop = getCurrentDesktop()
|
||||
- if desktop == 'plasma':
|
||||
- prefix = 'kf5-'
|
||||
- elif desktop == 'kde':
|
||||
- prefix = 'kde4-'
|
||||
-
|
||||
- if prefix == "":
|
||||
- processes = getProcessList()
|
||||
- if 'xfce4-panel' in processes:
|
||||
- prefix = 'xfce-'
|
||||
- elif 'mate-panel' in processes:
|
||||
- prefix = 'mate-'
|
||||
-
|
||||
- if len(prefix) == 0:
|
||||
- logger.warning("No menu prefix found, MenuLibre will not function "
|
||||
- "properly.")
|
||||
-
|
||||
- return prefix
|
||||
-
|
||||
+ return os.environ.get('XDG_MENU_PREFIX', '')
|
||||
|
||||
def getMenuDiagnostics():
|
||||
diagnostics = {}
|
Loading…
Reference in New Issue