[mintmenu] update patches for 5.5.0 release
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Sat Nov 30 11:17:39 UTC 2013
commit ba8d923f24bed42f3f991d67607a9b8bb4ec6908
Author: raveit65 <chat-to-me at raveit.de>
Date: Sat Nov 30 12:17:17 2013 +0100
update patches for 5.5.0 release
...enu_new_datadir.patch => mintmenu_datadir.patch | 56 ++++++++++----------
...execute_fix.patch => mintmenu_execute-fix.patch | 10 ++--
..._to_beesu.patch => mintmenu_gksu-to-beesu.patch | 8 ++--
...eruser.patch => mintmenu_run-as-superuser.patch | 12 ++--
4 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/mintmenu_new_datadir.patch b/mintmenu_datadir.patch
similarity index 90%
rename from mintmenu_new_datadir.patch
rename to mintmenu_datadir.patch
index a80d496..13990f6 100644
--- a/mintmenu_new_datadir.patch
+++ b/mintmenu_datadir.patch
@@ -1,6 +1,6 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-05-22 11:56:29.280556000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-05-22 12:00:08.594772496 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-11-30 10:55:54.434730000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py 2013-11-30 10:59:00.864609047 +0100
@@ -40,7 +40,7 @@ class mintMenuConfig( object ):
#i18n
@@ -10,7 +10,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
-@@ -415,7 +415,7 @@ class mintMenuConfig( object ):
+@@ -416,7 +416,7 @@ class mintMenuConfig( object ):
newPlaceDialog = self.builder.get_object( "editPlaceDialog" )
folderChooserDialog = self.builder.get_object( "fileChooserDialog" )
newPlaceDialog.set_transient_for(self.mainWindow)
@@ -19,7 +19,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
newPlaceDialog.set_title(self.newPlaceDialogTitle)
folderChooserDialog.set_title(self.folderChooserDialogTitle)
newPlaceDialog.set_default_response(Gtk.ResponseType.OK)
-@@ -446,7 +446,7 @@ class mintMenuConfig( object ):
+@@ -447,7 +447,7 @@ class mintMenuConfig( object ):
editPlaceDialog = self.builder.get_object( "editPlaceDialog" )
folderChooserDialog = self.builder.get_object( "fileChooserDialog" )
editPlaceDialog.set_transient_for(self.mainWindow)
@@ -29,8 +29,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenuConfig.py mintmenu/us
folderChooserDialog.set_title(self.folderChooserDialogTitle)
editPlaceDialog.set_default_response(Gtk.ResponseType.OK)
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-05-21 22:21:41.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-05-22 12:00:50.166192592 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-11-25 14:50:18.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py 2013-11-30 10:59:53.562139715 +0100
@@ -72,7 +72,7 @@ class MainWindow( object ):
self.detect_desktop_environment()
@@ -59,8 +59,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintMenu.py mintmenu/usr/lib/
about.show()
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintRemove.py mintmenu/usr/lib/linuxmint/mintMenu/mintRemove.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintRemove.py 2013-03-10 03:02:01.000000000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/mintRemove.py 2013-05-22 12:01:38.377679788 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/mintRemove.py 2013-08-16 03:21:05.000000000 +0200
++++ mintmenu/usr/lib/linuxmint/mintMenu/mintRemove.py 2013-11-30 11:00:41.288620169 +0100
@@ -61,8 +61,8 @@ class mintRemoveWindow:
@@ -73,8 +73,8 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/mintRemove.py mintmenu/usr/li
self.builder.get_object("main_window").connect("destroy", self.giveUp)
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-05-22 11:56:29.276556000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-05-22 12:03:50.794017906 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-11-30 10:55:54.430730000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py 2013-11-30 11:03:32.948345999 +0100
@@ -346,7 +346,7 @@ class pluginclass( object ):
# def refresh_apt_cache(self):
# if self.useAPT:
@@ -110,7 +110,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
self.applicationsBox.add(suggestionButton)
self.suggestions.append(suggestionButton)
-@@ -828,7 +828,7 @@ class pluginclass( object ):
+@@ -830,7 +830,7 @@ class pluginclass( object ):
else:
shownList.append(i)
showns = True
@@ -119,7 +119,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
if len(text) >= 3:
if self.current_suggestion is not None and self.current_suggestion in text:
# We're restricting our search...
-@@ -1041,14 +1041,14 @@ class pluginclass( object ):
+@@ -1045,14 +1045,14 @@ class pluginclass( object ):
menuItem = Gtk.ImageMenuItem(_("Search Google"))
img = Gtk.Image()
@@ -136,7 +136,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
menuItem.set_image(img)
menuItem.connect("activate", self.search_wikipedia)
menu.append(menuItem)
-@@ -1058,7 +1058,7 @@ class pluginclass( object ):
+@@ -1062,7 +1062,7 @@ class pluginclass( object ):
menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
img = Gtk.Image()
@@ -145,7 +145,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
menuItem.set_image(img)
menuItem.connect("activate", self.search_dictionary)
menu.append(menuItem)
-@@ -1075,35 +1075,35 @@ class pluginclass( object ):
+@@ -1079,35 +1079,35 @@ class pluginclass( object ):
menuItem = Gtk.ImageMenuItem(_("Find Software"))
img = Gtk.Image()
@@ -186,7 +186,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
menuItem.set_image(img)
menuItem.connect("activate", self.search_mint_users)
menu.append(menuItem)
-@@ -1177,7 +1177,7 @@ class pluginclass( object ):
+@@ -1182,7 +1182,7 @@ class pluginclass( object ):
try:
# Determine where the Desktop folder is (could be localized)
import sys, commands
@@ -195,7 +195,7 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
from configobj import ConfigObj
config = ConfigObj(home + "/.config/user-dirs.dirs")
desktopDir = home + "/Desktop"
-@@ -1417,7 +1417,7 @@ class pluginclass( object ):
+@@ -1422,7 +1422,7 @@ class pluginclass( object ):
from user import home
if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")):
os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications")
@@ -205,10 +205,10 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/applications.py mintm
applicationsFile = open ( os.path.join( os.path.expanduser( "~" ), ".linuxmint", "mintMenu", "applications.list" ), "r" )
applicationsList = applicationsFile.readlines()
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-05-21 22:23:11.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-05-22 12:04:21.598329196 +0200
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-25 16:59:08.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-30 11:04:11.507733488 +0100
@@ -389,7 +389,7 @@ class ApplicationLauncher( easyButton ):
- Execute(self.appExec)
+ Execute(self.appExec, self.appPath)
def uninstall (self, *args ):
- Execute("gksu /usr/lib/linuxmint/mintMenu/mintRemove.py " + self.desktopFile)
@@ -217,9 +217,9 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py mintme
# IconTheme changed, setup new icons for button and drag 'n drop
def iconChanged( self ):
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-05-21 11:11:36.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-05-22 12:04:58.227699350 +0200
-@@ -178,7 +178,7 @@ class pluginclass( object ):
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-11-25 13:42:43.000000000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/places.py 2013-11-30 11:04:44.568065714 +0100
+@@ -177,7 +177,7 @@ class pluginclass( object ):
desktopDir = home + "/Desktop"
try:
import sys
@@ -229,16 +229,16 @@ diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/places.py mintmenu/us
config = ConfigObj(home + "/.config/user-dirs.dirs")
tmpdesktopDir = config['XDG_DESKTOP_DIR']
diff -upr mintmenu-orig/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service
---- mintmenu-orig/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-03-04 13:53:09.000000000 +0100
-+++ mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-05-22 12:05:35.731078337 +0200
+--- mintmenu-orig/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-08-16 03:21:05.000000000 +0200
++++ mintmenu/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service 2013-11-30 11:05:35.835580905 +0100
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.MintMenuAppletFactory
-Exec=/usr/lib/linuxmint/mintMenu/mintMenu.py
+Exec=/usr/share/linuxmint/mintMenu/mintMenu.py
diff -upr mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
---- mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-05-22 11:56:29.280556000 +0200
-+++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-05-22 11:58:38.539862456 +0200
+--- mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-11-30 10:55:54.434730000 +0100
++++ mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml 2013-11-30 11:06:08.189906033 +0100
@@ -69,7 +69,7 @@
</key>
@@ -249,8 +249,8 @@ diff -upr mintmenu-orig/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschem
<description></description>
</key>
diff -upr mintmenu-orig/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet
---- mintmenu-orig/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-03-04 13:53:09.000000000 +0100
-+++ mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-05-22 12:06:19.663522290 +0200
+--- mintmenu-orig/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-08-16 03:21:05.000000000 +0200
++++ mintmenu/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet 2013-11-30 11:06:55.240378841 +0100
@@ -1,13 +1,13 @@
[Applet Factory]
Id=MintMenuAppletFactory
diff --git a/mintmenu_execute_fix.patch b/mintmenu_execute-fix.patch
similarity index 55%
rename from mintmenu_execute_fix.patch
rename to mintmenu_execute-fix.patch
index 2be954d..f6bf727 100644
--- a/mintmenu_execute_fix.patch
+++ b/mintmenu_execute-fix.patch
@@ -1,12 +1,12 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/execute.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/execute.py 2012-05-09 14:40:53.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py 2012-10-28 01:35:13.047798982 +0200
-@@ -20,7 +20,7 @@ def Execute( cmd ):
- print "running manually..."
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/execute.py 2013-11-30 11:19:18.565861000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py 2013-11-30 11:26:49.359379116 +0100
+@@ -29,7 +29,7 @@ def Execute( cmd , commandCwd=None):
+ os.chdir(cwd)
os.system(cmd + " &")
return True
- cmd = cmd.split()
+ cmd = cmd.split()
cmd = RemoveArgs(cmd)
+
try:
- os.chdir( os.path.expanduser( "~" ) )
diff --git a/mintmenu_new_gksu_to_beesu.patch b/mintmenu_gksu-to-beesu.patch
similarity index 75%
rename from mintmenu_new_gksu_to_beesu.patch
rename to mintmenu_gksu-to-beesu.patch
index 261cab3..a5d94fa 100644
--- a/mintmenu_new_gksu_to_beesu.patch
+++ b/mintmenu_gksu-to-beesu.patch
@@ -1,8 +1,8 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-05-07 13:53:24.000000000 +0200
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-05-08 18:46:28.302142437 +0200
-@@ -388,7 +388,7 @@ class ApplicationLauncher( easyButton ):
- Execute(self.appExec)
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-30 11:30:46.893203000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py 2013-11-30 11:33:02.218355582 +0100
+@@ -389,7 +389,7 @@ class ApplicationLauncher( easyButton ):
+ Execute(self.appExec, self.appPath)
def uninstall (self, *args ):
- Execute("gksu /usr/share/linuxmint/mintMenu/mintRemove.py " + self.desktopFile)
diff --git a/mintmenu-new_run_as_superuser.patch b/mintmenu_run-as-superuser.patch
similarity index 75%
rename from mintmenu-new_run_as_superuser.patch
rename to mintmenu_run-as-superuser.patch
index 5761b9b..80b1ce1 100644
--- a/mintmenu-new_run_as_superuser.patch
+++ b/mintmenu_run-as-superuser.patch
@@ -1,12 +1,12 @@
diff -upr mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/execute.py mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py
---- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/execute.py 2013-03-04 13:53:09.000000000 +0100
-+++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py 2013-03-18 17:33:58.825871757 +0100
-@@ -15,7 +15,7 @@ def RemoveArgs(Execline):
- # Actually execute the command
- def Execute( cmd ):
+--- mintmenu-orig/usr/lib/linuxmint/mintMenu/plugins/execute.py 2013-11-30 11:13:56.258615000 +0100
++++ mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py 2013-11-30 11:15:31.670576869 +0100
+@@ -24,7 +24,7 @@ def Execute( cmd , commandCwd=None):
+ cwd = tmpCwd
+
if isinstance( cmd, str ) or isinstance( cmd, unicode):
- if (cmd.find("/home/") >= 0) or (cmd.find("su-to-root") >= 0) or (cmd.find("\"") >= 0):
+ if (cmd.find("/home/") >= 0) or (cmd.find("beesu") >= 0) or (cmd.find("\"") >= 0):
print "running manually..."
+ os.chdir(cwd)
os.system(cmd + " &")
- return True
More information about the scm-commits
mailing list