- release 6 to upgrade from RA

[packages/WindowMaker.git] / WindowMaker-wmconfig.patch

diff --git a/WindowMaker-wmconfig.patch b/WindowMaker-wmconfig.patch
index e216788dfcee28afb54a46f277e05f39e5798ff4..152fa27411d95cd96ad176262827e3ecf697c6d0 100644 (file)
--- a/WindowMaker-wmconfig.patch
+++ b/WindowMaker-wmconfig.patch
@@ -1,17 +1,17 @@
-diff -urN WindowMaker-0.50.2.old/WindowMaker/menu WindowMaker-0.50.2/WindowMaker/menu
---- WindowMaker-0.50.2.old/WindowMaker/menu    Tue Jan 12 13:48:53 1999
-+++ WindowMaker-0.50.2/WindowMaker/menu        Mon Jan 18 16:36:38 1999
-@@ -111,48 +109,10 @@
+diff -Nur WindowMaker-0.80.1.orig/WindowMaker/menu WindowMaker-0.80.1/WindowMaker/menu
+--- WindowMaker-0.80.1.orig/WindowMaker/menu   Tue Jul  2 02:30:25 2002
++++ WindowMaker-0.80.1/WindowMaker/menu        Mon Jul 15 19:51:47 2002
+@@ -116,49 +116,10 @@
                "Process List" EXEC xterm -e top
                "Manual Browser" EXEC xman
        "Info" END
--      "Run..." EXEC %a(Run,Type command to run:)
+-      "Run..." SHEXEC %a(Run,Type command to run:)
        "XTerm" EXEC xterm -sb 
        "Rxvt" EXEC rxvt -bg black -fg white -fn fixed
        "Workspaces" WORKSPACE_MENU
 -      "Applications" MENU
 -              "Graphics" MENU
--                      "Gimp" EXEC gimp >/dev/null
+-                      "Gimp" SHEXEC gimp >/dev/null
 -                      "XV" EXEC xv
 -                      "XPaint" EXEC xpaint
 -                      "XFig" EXEC xfig
@@ -26,20 +26,21 @@ diff -urN WindowMaker-0.50.2.old/WindowMaker/menu WindowMaker-0.50.2/WindowMaker
 -      "Applications" END
 -      "Editors" MENU
 -              "XFte" EXEC xfte
--              "XEmacs" EXEC xemacs || emacs
+-              "XEmacs" EXEC xemacs
+-              "Emacs" EXEC emacs
 -              "XJed" EXEC xjed 
 -              "NEdit" EXEC nedit
 -              "Xedit" EXEC xedit
 -              "VI" EXEC xterm -e vi
 -      "Editors" END
 -      "Miscellaneous" MENU
--              "Xmcd" EXEC xmcd 2> /dev/null
+-              "Xmcd" SHEXEC xmcd 2> /dev/null
 -              "Xplaycd" EXEC xplaycd
 -              "Xmixer" EXEC xmixer
 -      "Miscellaneous" END
 -      "Utils" MENU
 -              "Calculator" EXEC xcalc
--              "Window Properties" EXEC xprop | xmessage -center -title 'xprop' -file -
+-              "Window Properties" SHEXEC xprop | xmessage -center -title 'xprop' -file -
 -              "Font Chooser" EXEC xfontsel
 -              "Terminal Emulator" EXEC xminicom
 -              "Magnify" EXEC xmag
@@ -47,20 +48,20 @@ diff -urN WindowMaker-0.50.2.old/WindowMaker/menu WindowMaker-0.50.2/WindowMaker
 -              "XKill" EXEC xkill
 -              "Clipboard" EXEC xclipboard
 -      "Utils" END
-+      "Applications" OPEN_MENU | wmconfig --rootmenu=Applications --output=wmaker
++      "Applications" OPEN_MENU | wmconfig --output wmaker --rootmenu Applications 2>/dev/null
  
        "Selection" MENU
-               "Copy" EXEC echo '%s' | wxcopy
-diff -urN WindowMaker-0.50.2.old/WindowMaker/plmenu WindowMaker-0.50.2/WindowMaker/plmenu
---- WindowMaker-0.50.2.old/WindowMaker/plmenu  Tue Jan 12 13:48:53 1999
-+++ WindowMaker-0.50.2/WindowMaker/plmenu      Mon Jan 18 19:51:05 1999
-@@ -11,45 +11,7 @@
+               "Copy" SHEXEC echo '%s' | wxcopy
+diff -Nur WindowMaker-0.80.1.orig/WindowMaker/plmenu WindowMaker-0.80.1/WindowMaker/plmenu
+--- WindowMaker-0.80.1.orig/WindowMaker/plmenu Tue Jul  2 02:30:25 2002
++++ WindowMaker-0.80.1/WindowMaker/plmenu      Mon Jul 15 19:52:58 2002
+@@ -11,46 +11,7 @@
   ("XTerm", EXEC, "xterm -sb"),
   ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
   ("Workspaces", WORKSPACE_MENU),
 - ("Applications",
 -  ("Graphics",
--   ("Gimp", EXEC, "gimp >/dev/null"),
+-   ("Gimp", SHEXEC, "gimp >/dev/null"),
 -   ("XV", EXEC, "xv"),
 -   ("XPaint", EXEC, "xpaint"),
 -   ("XFig", EXEC, "xfig")
@@ -75,20 +76,21 @@ diff -urN WindowMaker-0.50.2.old/WindowMaker/plmenu WindowMaker-0.50.2/WindowMak
 -  ),
 - ("Editors",
 -  ("XFte", EXEC, "xfte"),
--  ("XEmacs", EXEC, "xemacs || emacs"),
+-  ("XEmacs", EXEC, "xemacs"),
+-  ("Emacs", EXEC, "emacs"),
 -  ("XJed", EXEC, "xjed"),
 -  ("NEdit", EXEC, "nedit"),
 -  ("Xedit", EXEC, "xedit"),
 -  ("VI", EXEC, "xterm -e vi")
 -  ),
 - ("Miscellaneous",
--  ("Xmcd", EXEC, "xmcd 2> /dev/null"),
+-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
 -  ("Xplaycd", EXEC, "xplaycd"),
 -  ("Xmixer", EXEC, "xmixer")
 -  ),
 - ("Utils",
 -  ("Calculator", EXEC, "xcalc"),
--  ("Window Properties", EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
 -  ("Font Chooser", EXEC, "xfontsel"),
 -  ("Terminal Emulator", EXEC, "xminicom"),
 -  ("Magnify", EXEC, "xmag"),
@@ -97,7 +99,7 @@ diff -urN WindowMaker-0.50.2.old/WindowMaker/plmenu WindowMaker-0.50.2/WindowMak
 -  ("ASClock", EXEC, "asclock -shape"),
 -  ("Clipboard", EXEC, "xclipboard")
 -  ),
-+ ("Applications", OPEN_MENU, "| wmconfig --rootmenu=Applications --output=wmaker"),
++ ("Applications", OPEN_MENU, "| wmconfig --output wmaker --rootmenu Applications 2>/dev/null "),
   ("Selection",
-   ("Copy", EXEC, "echo '%s' | wxcopy"),
+   ("Copy", SHEXEC, "echo '%s' | wxcopy"),
    ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),