Fix patch

svn path=/sunrise/; revision=5494

diff --git a/x11-misc/marchfluxmenu/Manifest b/x11-misc/marchfluxmenu/Manifest
index e063b85859e13dc61ba7a227a5491b7dcc57f8c8..3dc3f1c645b0a8b2dc7d3076878d6d6491e15de9 100644 (file)
--- a/x11-misc/marchfluxmenu/Manifest
+++ b/x11-misc/marchfluxmenu/Manifest
@@ -1,4 +1,4 @@
-AUX marchfluxmenu-1.2-gentoo.patch 6595 RMD160 81be2db6466b055beecee509a37999c7c9682320 SHA1 4f923bbe5152947fc9ac15385848f9cbb4efcb00 SHA256 4e88d828ee8272768fe3a5c5377b416e8d2adb021a73025f9319273c6ef5e405
+AUX marchfluxmenu-1.2-gentoo.patch 6483 RMD160 5861b277fb61b84101d0098d8d6d62847d51086c SHA1 0d35c971e7e7fe78d3e784afbe2c2e697be61f34 SHA256 8368d3625cb876729ce7c8b8bb879de01a00e450c3810bd573411838111fde8b
 DIST mfm-1.2.tar.gz 53853 RMD160 6110e2ed7e97b06010f3c4381dcca9cf6fe0e198 SHA1 6b2cfefaa69a339f4d90922c42f18e8135477734 SHA256 ede215386471fda416fed99a5cc45b345fa39af36bf39ba40c01df8ae1e20874
 EBUILD marchfluxmenu-1.2.ebuild 1387 RMD160 1f79f22904ece13e506bbcfc4b482d5804a6500c SHA1 f95b5d8e9cd343c92e2889d5655a3e372e091d58 SHA256 180f1ec3cf013c29bb3b833a1271309ddde76144123f548736d60bb40a09c87e
 MISC ChangeLog 278 RMD160 774ec55cee85312a49ea3c38828f0432ee406cb7 SHA1 49878370198da45df44bdbfcc4e29743fe14c218 SHA256 1527a1bb53253bfa63f0977cccb5c41d8db306c99e8d558bc136fde54e61c04f

diff --git a/x11-misc/marchfluxmenu/files/marchfluxmenu-1.2-gentoo.patch b/x11-misc/marchfluxmenu/files/marchfluxmenu-1.2-gentoo.patch
index 1372e7348a29c30ad6255c957ad2551dcf8489f2..38cdbb887d21e04837682769f238f95747cecf17 100644 (file)
--- a/x11-misc/marchfluxmenu/files/marchfluxmenu-1.2-gentoo.patch
+++ b/x11-misc/marchfluxmenu/files/marchfluxmenu-1.2-gentoo.patch
@@ -65,30 +65,6 @@
                
                
                start_count=$count
---- mfm_generate.py.orig       2007-11-11 19:58:01.000000000 +0100
-+++ mfm_generate.py    2008-01-22 10:34:11.000000000 +0100
-@@ -24,7 +24,7 @@
- string += ExecMenuItem('Web Browser', 'firefox', IconFind('firefox.png'), '').GenerateMenuLine()
- string += ExecMenuItem('Terminal', 'xterm', IconFind('term.png'), '').GenerateMenuLine()
- string +='''    [separator] (--------)
-- [submenu] (Settings) {settings} <~/.marchfluxmenu/icons/preferences-system.png>
-+ [submenu] (Settings) {settings} </usr/share/marchfluxmenu/icons/preferences-system.png>
-               [config] (Fluxbox Menu)
-               [reconfig] (Reload Config)
-               [restart] (Restart Fluxbox)
-@@ -39,10 +39,10 @@
-               string += m.body
-               string += '\n'
- 
--string += '[separator] (tag end)\n' + '[exit] (Exit) <~/.marchfluxmenu/icons/exit.png>\n'+ '[end]\n'
-+string += '[separator] (tag end)\n' + '[exit] (Exit) </usr/share/marchfluxmenu/icons/exit.png>\n'+ '[end]\n'
- 
- #print string
--filename = os.path.expanduser('~/.fluxbox/menu')
-+filename = os.path.expanduser('/usr/share/fluxbox/menu')
- f = file(filename,'w')
- f.write(string)
- f.close()
 --- installer.orig     2007-11-11 20:16:35.000000000 +0100
 +++ installer  2008-01-22 10:43:57.000000000 +0100
 @@ -17,33 +17,20 @@
@@ -150,3 +126,23 @@
 +              mfmdaemon &
  at the appropriate place of ~/.fluxbox/startup
  
+--- mfm_generate.py.orig       2007-11-11 19:58:01.000000000 +0100
++++ mfm_generate.py    2008-01-22 11:42:21.000000000 +0100
+@@ -24,7 +24,7 @@
+ string += ExecMenuItem('Web Browser', 'firefox', IconFind('firefox.png'), '').GenerateMenuLine()
+ string += ExecMenuItem('Terminal', 'xterm', IconFind('term.png'), '').GenerateMenuLine()
+ string +='''    [separator] (--------)
+- [submenu] (Settings) {settings} <~/.marchfluxmenu/icons/preferences-system.png>
++ [submenu] (Settings) {settings} </usr/share/marchfluxmenu/icons/preferences-system.png>
+               [config] (Fluxbox Menu)
+               [reconfig] (Reload Config)
+               [restart] (Restart Fluxbox)
+@@ -39,7 +39,7 @@
+               string += m.body
+               string += '\n'
+ 
+-string += '[separator] (tag end)\n' + '[exit] (Exit) <~/.marchfluxmenu/icons/exit.png>\n'+ '[end]\n'
++string += '[separator] (tag end)\n' + '[exit] (Exit) </usr/share/marchfluxmenu/icons/exit.png>\n'+ '[end]\n'
+ 
+ #print string
+ filename = os.path.expanduser('~/.fluxbox/menu')