From c355f800a7e07a2d92873a1f8a4a4de0d34cdb3ad586adac24a8766939629ba2 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Sat, 18 Feb 2012 06:38:52 +0000 Subject: [PATCH] Accepting request 105760 from home:computersalat:devel:X11wm update to 0.95.2, wow, latest stable from 2005 :) OBS-URL: https://build.opensuse.org/request/show/105760 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=15 --- Window-Maker-5a2507602c48.tar.bz2 | 3 - WindowMaker-0.92.0-printf.diff | 31 - WindowMaker-0.95.2.tar.bz2 | 3 + WindowMaker-MAX_WORKSPACENAME_WIDTH.patch | 11 - WindowMaker-asm.patch | 141 ---- WindowMaker-composite.patch | 20 - ...ker-config.dif => WindowMaker-config.patch | 36 +- WindowMaker-crash.patch | 11 - WindowMaker-de_translation.patch | 11 - WindowMaker-dir-specification.patch | 11 - WindowMaker-event.patch | 48 -- WindowMaker-fonts.patch | 34 - WindowMaker-menu.patch | 791 ++++++++++-------- WindowMaker-nb-locale.patch | 22 - WindowMaker-null.patch | 11 - WindowMaker-png_check_sig.patch | 11 - WindowMaker-rpmlintrc | 3 +- WindowMaker-warnings.patch | 110 --- WindowMaker-wmspec.c-findBestIcon.patch | 11 - WindowMaker.changes | 14 + WindowMaker.spec | 188 +++-- wm-linking.patch | 10 - 22 files changed, 571 insertions(+), 960 deletions(-) delete mode 100644 Window-Maker-5a2507602c48.tar.bz2 delete mode 100644 WindowMaker-0.92.0-printf.diff create mode 100644 WindowMaker-0.95.2.tar.bz2 delete mode 100644 WindowMaker-MAX_WORKSPACENAME_WIDTH.patch delete mode 100644 WindowMaker-asm.patch delete mode 100644 WindowMaker-composite.patch rename WindowMaker-config.dif => WindowMaker-config.patch (93%) delete mode 100644 WindowMaker-crash.patch delete mode 100644 WindowMaker-de_translation.patch delete mode 100644 WindowMaker-dir-specification.patch delete mode 100644 WindowMaker-event.patch delete mode 100644 WindowMaker-fonts.patch delete mode 100644 WindowMaker-nb-locale.patch delete mode 100644 WindowMaker-null.patch delete mode 100644 WindowMaker-png_check_sig.patch delete mode 100644 WindowMaker-warnings.patch delete mode 100644 WindowMaker-wmspec.c-findBestIcon.patch delete mode 100644 wm-linking.patch diff --git a/Window-Maker-5a2507602c48.tar.bz2 b/Window-Maker-5a2507602c48.tar.bz2 deleted file mode 100644 index 7ca7f5e..0000000 --- a/Window-Maker-5a2507602c48.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6235dc97d30ee43c9acfe6408645156030b0c33574371e2fb7bff2884edb371e -size 2024584 diff --git a/WindowMaker-0.92.0-printf.diff b/WindowMaker-0.92.0-printf.diff deleted file mode 100644 index 210838b..0000000 --- a/WindowMaker-0.92.0-printf.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- src/misc.c -+++ src/misc.c -@@ -696,7 +696,7 @@ - olen = len+1; - out = malloc(olen); - if (!out) { -- wwarning(_("out of memory during expansion of \"%s\"")); -+ wwarning(_("out of memory during expansion of \"%s\""), cmdline); - return NULL; - } - *out = 0; -@@ -785,7 +785,8 @@ - olen += slen; - nout = realloc(out,olen); - if (!nout) { -- wwarning(_("out of memory during expansion of \"%a\"")); -+ wwarning(_("out of memory during expansion of \"%a\""), -+ user_input); - goto error; - } - out = nout; -@@ -835,7 +836,8 @@ - olen += slen; - nout = realloc(out,olen); - if (!nout) { -- wwarning(_("out of memory during expansion of \"%s\"")); -+ wwarning(_("out of memory during expansion of \"%s\""), -+ selection); - goto error; - } - out = nout; diff --git a/WindowMaker-0.95.2.tar.bz2 b/WindowMaker-0.95.2.tar.bz2 new file mode 100644 index 0000000..fb9b3d4 --- /dev/null +++ b/WindowMaker-0.95.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65b5dee5d87103292fd6afc039a81ed3287e4a545d149a33a50b303a9a9cc94b +size 2190825 diff --git a/WindowMaker-MAX_WORKSPACENAME_WIDTH.patch b/WindowMaker-MAX_WORKSPACENAME_WIDTH.patch deleted file mode 100644 index a44a312..0000000 --- a/WindowMaker-MAX_WORKSPACENAME_WIDTH.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/wconfig.h.in -+++ src/wconfig.h.in -@@ -453,7 +453,7 @@ - - #define HRESIZE_THRESHOLD 3 - --#define MAX_WORKSPACENAME_WIDTH 32 -+#define MAX_WORKSPACENAME_WIDTH 64 - #define MAX_WINDOWLIST_WIDTH 160 /* max width of window title in - * window list */ - diff --git a/WindowMaker-asm.patch b/WindowMaker-asm.patch deleted file mode 100644 index dd4f660..0000000 --- a/WindowMaker-asm.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -197,7 +197,7 @@ - - AC_CACHE_CHECK(whether gcc supports x86 inline asm, - ac_cv_c_inline_asm, -- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n":: -+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal":: - "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x), - "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}], - ac_cv_c_inline_asm=yes, ---- wrlib/x86_specific.c -+++ wrlib/x86_specific.c -@@ -98,15 +98,23 @@ - int height, - int line_offset) - { -- long long rrggbbaa; -- long long pixel; -+ union { -+ long long rrggbbaa; -+ struct {short int rr, gg, bb, aa;} words; -+ } rrggbbaa; -+ -+ union { -+ long long pixel; -+ struct {short int rr, gg, bb, aa;} words; -+ } pixel; -+ - short *tmp_err; - short *tmp_nerr; - int x; - - asm volatile - ( -- "pushal \n\t" -+ "pushl %%ebx \n\t" - - // pack dr, dg and db into mm6 - "movl %7, %%eax \n\t" -@@ -290,7 +298,7 @@ - - ".Enda: \n\t" // THE END - "emms \n\t" -- "popal \n\t" -+ "popl %%ebx \n\t" - : - : - "m" (image), // %0 -@@ -309,17 +317,18 @@ - "m" (width), // %13 - "m" (height), // %14 - "m" (line_offset), // %15 -- "m" (rrggbbaa), // %16 (access to rr) -- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) -- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) -- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) -- "m" (pixel), // %20 (access to pixel.r) -- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) -- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) -- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) -+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr) -+ "m" (rrggbbaa.words.gg), // %17 (access to gg) -+ "m" (rrggbbaa.words.bb), // %18 (access to bb) -+ "m" (rrggbbaa.words.aa), // %19 (access to aa) -+ "m" (pixel.pixel), // %20 (access to pixel.r) -+ "m" (pixel.words.gg), // %21 (access to pixel.g) -+ "m" (pixel.words.bb), // %22 (access to pixel.b) -+ "m" (pixel.words.aa), // %23 (access to pixel.a) - "m" (tmp_err), // %24 - "m" (tmp_nerr), // %25 - "m" (x) // %26 -+ : "eax", "ecx", "edx", "esi", "edi" - ); - } - -@@ -342,8 +351,15 @@ - int height, - int line_offset) - { -- long long rrggbbaa; -- long long pixel; -+ union { -+ long long rrggbbaa; -+ struct {short int rr, gg, bb, aa;} words; -+ } rrggbbaa; -+ -+ union { -+ long long pixel; -+ struct {short int rr, gg, bb, aa;} words; -+ } pixel; - - short *tmp_err; - short *tmp_nerr; -@@ -354,7 +370,7 @@ - - asm volatile - ( -- "pushal \n\t" -+ "pushl %%ebx \n\t" - - "movl %13, %%eax \n\t" // eax = width - "movl %%eax, %%ebx \n\t" -@@ -424,7 +440,7 @@ - - ".Endc: \n\t" // THE END - "emms \n\t" -- "popal \n\t" -+ "popl %%ebx \n\t" - : - : - "m" (image), // %0 -@@ -443,19 +459,20 @@ - "m" (width), // %13 - "m" (height), // %14 - "m" (line_offset), // %15 -- "m" (rrggbbaa), // %16 (access to rr) -- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) -- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) -- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) -- "m" (pixel), // %20 (access to pixel.r) -- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) -- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) -- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) -+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr) -+ "m" (rrggbbaa.words.gg), // %17 (access to gg) -+ "m" (rrggbbaa.words.bb), // %18 (access to bb) -+ "m" (rrggbbaa.words.aa), // %19 (access to aa) -+ "m" (pixel.pixel), // %20 (access to pixel.r) -+ "m" (pixel.words.gg), // %21 (access to pixel.g) -+ "m" (pixel.words.bb), // %22 (access to pixel.b) -+ "m" (pixel.words.aa), // %23 (access to pixel.a) - "m" (tmp_err), // %24 - "m" (tmp_nerr), // %25 - "m" (x), // %26 - "m" (w1), // %27 - "m" (w2) // %28 -+ : "eax", "ecx", "edx", "esi", "edi" - ); - } - diff --git a/WindowMaker-composite.patch b/WindowMaker-composite.patch deleted file mode 100644 index 9ecdc7b..0000000 --- a/WindowMaker-composite.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/main.c -+++ src/main.c -@@ -747,6 +747,17 @@ - exit(1); - } - -+ if (wVisualID < 0) -+ /* -+ * If unspecified, use default visual instead of waiting -+ * for wrlib/context.c:bestContext() that may end up choosing -+ * the "fake" 24 bits added by the Composite extension. -+ * This is required to avoid all sort of corruptions when -+ * composite is enabled, and at a depth other than 24. -+ */ -+ wVisualID = (int)DefaultVisual(dpy, DefaultScreen(dpy))->visualid; -+ -+ - /* check if the user specified a complete display name (with screen). - * If so, only manage the specified screen */ - if (DisplayName) diff --git a/WindowMaker-config.dif b/WindowMaker-config.patch similarity index 93% rename from WindowMaker-config.dif rename to WindowMaker-config.patch index f581079..ae46dfe 100644 --- a/WindowMaker-config.dif +++ b/WindowMaker-config.patch @@ -1,4 +1,6 @@ ---- WindowMaker/Defaults/WindowMaker.in +Index: WindowMaker/Defaults/WindowMaker.in +=================================================================== +--- WindowMaker/Defaults/WindowMaker.in.orig +++ WindowMaker/Defaults/WindowMaker.in @@ -1,5 +1,6 @@ { @@ -34,7 +36,9 @@ MouseMiddleButtonAction = OpenWindowListMenu; MouseRightButtonAction = OpenApplicationsMenu; MouseWheelAction = None; ---- dockit +Index: dockit +=================================================================== +--- /dev/null +++ dockit @@ -0,0 +1,247 @@ +#!/bin/sh @@ -284,35 +288,36 @@ + close $m1 +} + ---- util/wmaker.inst.in +Index: util/wmaker.inst.in +=================================================================== +--- util/wmaker.inst.in.orig +++ util/wmaker.inst.in -@@ -312,42 +312,43 @@ +@@ -281,41 +281,41 @@ fi } wmaker_found=0 -for xinit in .xinitrc .Xclients .xsession; do - test ! -f "$HOME/$xinit" && continue -- res="`grep wmaker $HOME/$xinit`" +- res="$(grep wmaker "$HOME/$xinit")" - if test "x$res" != x; then - wmaker_found=1 - break - fi -done --if test $wmaker_found = 1; then +-if test "$wmaker_found" = 1; then - echo "Found Window Maker to already be your default window manager." - show_end_message - exit 0 -fi +#for xinit in .xinitrc .Xclients .xsession; do +# test ! -f "$HOME/$xinit" && continue -+# res="`grep wmaker $HOME/$xinit`" ++# res="$(grep wmaker "$HOME/$xinit")" +# if test "x$res" != x; then +# wmaker_found=1 +# break +# fi +#done -+ -+#if test $wmaker_found = 1; then ++#if test "$wmaker_found" = 1; then +# echo "Found Window Maker to already be your default window manager." +# show_end_message +# exit 0 @@ -335,8 +340,8 @@ - file=.xinitrc -fi - --if [ -f $USERDIR/$file ]; then -- mv $USERDIR/$file $USERDIR/$file.old.$DATE +-if [ -f "$USERDIR/$file" ]; then +- mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" -fi +#echo +#echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that" @@ -352,12 +357,11 @@ +# file=.xinitrc +#fi + -+#if [ -f $USERDIR/$file ]; then -+# mv $USERDIR/$file $USERDIR/$file.old.$DATE ++#if [ -f "$USERDIR/$file" ]; then ++# mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" +#fi --make_script $USERDIR/$file -+# make_script $USERDIR/$file +-make_script "$USERDIR/$file" ++#make_script "$USERDIR/$file" show_end_message - diff --git a/WindowMaker-crash.patch b/WindowMaker-crash.patch deleted file mode 100644 index 0b2fd31..0000000 --- a/WindowMaker-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/misc.c -+++ src/misc.c -@@ -1105,7 +1105,7 @@ - - len = (msg ? strlen(msg) : 0) + (workspace >=0 ? 4 : 0) + 1 ; - buffer = wmalloc(len+5); -- snprintf(buf, len, "%4i", len); -+ snprintf(buf, sizeof(buf), "%4i", len); - memcpy(buffer, buf, 4); - buffer[4] = type; - i = 5; diff --git a/WindowMaker-de_translation.patch b/WindowMaker-de_translation.patch deleted file mode 100644 index 8d19e48..0000000 --- a/WindowMaker-de_translation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- po/de.po -+++ po/de.po -@@ -76,7 +76,7 @@ - #: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248 - #: ../src/rootmenu.c:264 ../src/winmenu.c:508 - msgid "Kill" --msgstr "Töten" -+msgstr "Beenden" - - #: ../src/appicon.c:508 ../src/dock.c:3511 - msgid "Unhide" diff --git a/WindowMaker-dir-specification.patch b/WindowMaker-dir-specification.patch deleted file mode 100644 index c2f8e66..0000000 --- a/WindowMaker-dir-specification.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- WINGs/wtext.c -+++ WINGs/wtext.c -@@ -656,7 +656,7 @@ - TextBlock *tb; - WMFont *font; - char *text; -- int len, y, c, s, done=False, prev_y=-23, dir /* 1 = down */; -+ int len, y, c, s, done=False, prev_y=-23, dir=1 /* 1 = down */; - WMScreen *scr = tPtr->view->screen; - Display *dpy = tPtr->view->screen->display; - Window win = tPtr->view->window; diff --git a/WindowMaker-event.patch b/WindowMaker-event.patch deleted file mode 100644 index 4492b43..0000000 --- a/WindowMaker-event.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- src/event.c -+++ src/event.c -@@ -107,27 +107,27 @@ - - - static void saveTimestamp(XEvent *event); --static void handleColormapNotify(); --static void handleMapNotify(); --static void handleUnmapNotify(); --static void handleButtonPress(); --static void handleExpose(); --static void handleDestroyNotify(); --static void handleConfigureRequest(); --static void handleMapRequest(); --static void handlePropertyNotify(); --static void handleEnterNotify(); --static void handleLeaveNotify(); --static void handleExtensions(); --static void handleClientMessage(); --static void handleKeyPress(); --static void handleFocusIn(); --static void handleMotionNotify(); --static void handleVisibilityNotify(); -+static void handleColormapNotify(XEvent *event); -+static void handleMapNotify(XEvent *event); -+static void handleUnmapNotify(XEvent *event); -+static void handleButtonPress(XEvent *event); -+static void handleExpose(XEvent *event); -+static void handleDestroyNotify(XEvent *event); -+static void handleConfigureRequest(XEvent *event); -+static void handleMapRequest(XEvent *event); -+static void handlePropertyNotify(XEvent *event); -+static void handleEnterNotify(XEvent *event); -+static void handleLeaveNotify(XEvent *event); -+static void handleExtensions(XEvent *event); -+static void handleClientMessage(XEvent *event); -+static void handleKeyPress(XEvent *event); -+static void handleFocusIn(XEvent *event); -+static void handleMotionNotify(XEvent *event); -+static void handleVisibilityNotify(XEvent *event); - - - #ifdef SHAPE --static void handleShapeNotify(); -+static void handleShapeNotify(XEvent *event); - #endif - - /* called from the signal handler */ diff --git a/WindowMaker-fonts.patch b/WindowMaker-fonts.patch deleted file mode 100644 index a819ee8..0000000 --- a/WindowMaker-fonts.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- WindowMaker/Defaults/WMGLOBAL -+++ WindowMaker/Defaults/WMGLOBAL -@@ -1,6 +1,6 @@ - { -- SystemFont = "Trebuchet MS,Luxi Sans"; -- BoldSystemFont = "Trebuchet MS,Luxi Sans:bold"; -+ SystemFont = "Sans"; -+ BoldSystemFont = "Sans:bold"; - DefaultFontSize = 11; - AntialiasedText = Yes; - FloppyPath = "/floppy"; ---- WindowMaker/Defaults/WindowMaker.in -+++ WindowMaker/Defaults/WindowMaker.in -@@ -109,13 +109,13 @@ - ConstrainWindowSize = NO; - ClipRaiseLowerKey = None; - TitleJustify = center; -- WindowTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12"; -- MenuTitleFont = "Trebuchet MS,Luxi Sans:bold:pixelsize=12"; -- MenuTextFont = "Trebuchet MS,Luxi Sans:pixelsize=12"; -- IconTitleFont = "Arial,Luxi Sans:pixelsize=9"; -- ClipTitleFont = "Verdana:bold:pixelsize=10"; -- DisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=12"; -- LargeDisplayFont = "Trebuchet MS,Luxi Sans:pixelsize=24"; -+ WindowTitleFont = "Sans:bold:pixelsize=12"; -+ MenuTitleFont = "Sans:bold:pixelsize=12"; -+ MenuTextFont = "Sans:pixelsize=12"; -+ IconTitleFont = "Sans:pixelsize=9"; -+ ClipTitleFont = "Sans:bold:pixelsize=10"; -+ DisplayFont = "Sans:pixelsize=12"; -+ LargeDisplayFont = "Sans:pixelsize=24"; - HighlightColor = white; - HighlightTextColor = black; - ClipTitleColor = black; diff --git a/WindowMaker-menu.patch b/WindowMaker-menu.patch index cc1ae0f..bac5de0 100644 --- a/WindowMaker-menu.patch +++ b/WindowMaker-menu.patch @@ -1,4 +1,6 @@ ---- WindowMaker/menu +Index: WindowMaker/menu +=================================================================== +--- WindowMaker/menu.orig +++ WindowMaker/menu @@ -111,72 +111,18 @@ "Info" MENU @@ -9,7 +11,7 @@ - "Process List" EXEC xterm -e top - "Manual Browser" EXEC xman "Info" END - "Run..." SHEXEC %A(Run,Type command to run:) + "Run..." SHEXEC %a(Run,Type command to run:) "XTerm" EXEC xterm -sb - "Mozilla Firefox" EXEC firefox "Workspaces" WORKSPACE_MENU @@ -135,9 +137,11 @@ "Applications" END ---- WindowMaker/menu.bg +Index: WindowMaker/menu.bg +=================================================================== +--- WindowMaker/menu.bg.orig +++ WindowMaker/menu.bg -@@ -115,61 +115,10 @@ +@@ -115,60 +115,10 @@ "Инфо" MENU "Информационен панел..." INFO_PANEL "Лицензионен панел..." LEGAL_PANEL @@ -146,9 +150,8 @@ - "Списък процеси" EXEC xterm -e top - "Ръководства" EXEC xman "Инфо" END -- "Стартирай..." SHEXEC %A(Run,Въведете команда, която да се стартира:) -+ "Стартирай..." SHEXEC %a(Run,Въведете команда, която да се стартира:) - "XTerm" EXEC xterm -sb + "Стартирай..." SHEXEC %a(Run,Въведете команда, която да се стартира:) + "XTerm" EXEC xterm -sb - "Rxvt" EXEC rxvt -bg black -fg white -fn fixed "Работни места" WORKSPACE_MENU - "Приложения" MENU @@ -161,15 +164,15 @@ - "X File Manager" EXEC xfm - "OffiX Files" EXEC files - "LyX" EXEC lyx -- "Netscape" EXEC netscape -- "Ghostview" EXEC ghostview %a(GhostView,Enter file to view) +- "Netscape" EXEC netscape +- "Ghostview" EXEC ghostview %a(GhostView,Enter file to view) - "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view) -- "TkDesk" EXEC tkdesk +- "TkDesk" EXEC tkdesk - "Приложения" END - "Редактори" MENU - "XFte" EXEC xfte - "XEmacs" SHEXEC xemacs || emacs -- "XJed" EXEC xjed +- "XJed" EXEC xjed - "NEdit" EXEC nedit - "Xedit" EXEC xedit - "VI" EXEC xterm -e vi @@ -196,11 +199,10 @@ - "Navigate" EXEC netscape %s - "Search in Manual" SHEXEC MANUAL_SEARCH(%s) - "Избор" END -- + "Работно място" MENU "Скрий другите" HIDE_OTHERS - "Покажи всички" SHOW_ALL -@@ -209,14 +158,12 @@ +@@ -209,14 +159,12 @@ "Фон" END "Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)" "Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)" @@ -208,8 +210,8 @@ + "Пособие за настройки" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Изглед" END - -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Изход" MENU "Рестартиране" RESTART - "Стартирай BlackBox" RESTART blackbox @@ -217,10 +219,10 @@ - "Стартирай IceWM" RESTART icewm "Изход..." EXIT "Изход" END --"Приложения" END -+"Приложения" END -\ No newline at end of file ---- WindowMaker/menu.ca + "Приложения" END +Index: WindowMaker/menu.ca +=================================================================== +--- WindowMaker/menu.ca.orig +++ WindowMaker/menu.ca @@ -110,60 +110,9 @@ "Informació" MENU @@ -300,7 +302,9 @@ "Sortir" END "Aplicacions" END ---- WindowMaker/menu.cs +Index: WindowMaker/menu.cs +=================================================================== +--- /dev/null +++ WindowMaker/menu.cs @@ -0,0 +1,85 @@ +// Text bellow is in czech, encoding ISO8829-2. @@ -314,7 +318,7 @@ +// je jakýkoli řetěz znaků. Pokud obsahuje mezery musí být +// uzavřen do uvozovek (") +// -+// může být jeden z následujících: ++// může být jeden z následujících: +// MENU - definice nové (sub)menu +// END - konec definice nového menu +// EXEC - provede se program @@ -329,15 +333,15 @@ +// bylo naposledy zaměřeno) +// +// je program, který bude proveden. -+// -+// Každý příkaz MENU musí mít odpovídající END. ++// ++// Každý příkaz MENU musí mít odpovídající END. +// následující text je česky, kódován ISO8859-2. +#include + +"Hlavní menu" MENU + "Info" MENU + "Info Panel..." INFO_PANEL -+ "Legal" LEGAL_PANEL ++ "Legal" LEGAL_PANEL + "Info" END + "XTerm" EXEC xterm -sb + "Pracovní plochy" WORKSPACE_MENU @@ -388,7 +392,9 @@ + "Ukončit..." EXIT + "Konec" END +"Hlavní menu" END ---- WindowMaker/menu.da +Index: WindowMaker/menu.da +=================================================================== +--- WindowMaker/menu.da.orig +++ WindowMaker/menu.da @@ -103,62 +103,10 @@ "Info" MENU @@ -468,7 +474,9 @@ "Afslut..." EXIT "Afslut" END "Applikationer" END ---- WindowMaker/menu.de +Index: WindowMaker/menu.de +=================================================================== +--- WindowMaker/menu.de.orig +++ WindowMaker/menu.de @@ -44,55 +44,9 @@ "Info" MENU @@ -548,7 +556,9 @@ - "Sitzung beenden..." SHUTDOWN "Beenden" END "Anwendungen" END ---- WindowMaker/menu.el +Index: WindowMaker/menu.el +=================================================================== +--- WindowMaker/menu.el.orig +++ WindowMaker/menu.el @@ -118,62 +118,10 @@ "Πληροφορίες" MENU @@ -630,7 +640,9 @@ "Έξοδος..." EXIT "Έξοδος" END "Μενού" END ---- WindowMaker/menu.es +Index: WindowMaker/menu.es +=================================================================== +--- WindowMaker/menu.es.orig +++ WindowMaker/menu.es @@ -43,62 +43,9 @@ "Informacion ..." MENU @@ -722,7 +734,9 @@ - "Salir de la sesion" SHUTDOWN "Salir ..." END "Menu Principal" END ---- WindowMaker/menu.fi +Index: WindowMaker/menu.fi +=================================================================== +--- WindowMaker/menu.fi.orig +++ WindowMaker/menu.fi @@ -108,61 +108,10 @@ "Tietoja" MENU @@ -804,7 +818,9 @@ "Lopeta" EXIT "Lopeta" END "Sovellukset" END ---- WindowMaker/menu.fr +Index: WindowMaker/menu.fr +=================================================================== +--- WindowMaker/menu.fr.orig +++ WindowMaker/menu.fr @@ -154,61 +154,10 @@ "Informations" MENU @@ -884,7 +900,9 @@ - "Tuer la session..." SHUTDOWN "Quitter" END "Applications" END ---- WindowMaker/menu.gl +Index: WindowMaker/menu.gl +=================================================================== +--- WindowMaker/menu.gl.orig +++ WindowMaker/menu.gl @@ -45,56 +45,9 @@ "Información" MENU @@ -953,8 +971,8 @@ "Area Traballo" END - + "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Sair" MENU "Reinicializar" RESTART - "Iniciar AfterStep" RESTART afterstep @@ -962,7 +980,9 @@ - "Sair da sesión..." SHUTDOWN "Sair" END "Aplicacións" END ---- WindowMaker/menu.he +Index: WindowMaker/menu.he +=================================================================== +--- WindowMaker/menu.he.orig +++ WindowMaker/menu.he @@ -97,60 +97,9 @@ "עדימ" MENU @@ -1042,7 +1062,9 @@ "האיצי" END "םימושי" END ---- WindowMaker/menu.hr +Index: WindowMaker/menu.hr +=================================================================== +--- WindowMaker/menu.hr.orig +++ WindowMaker/menu.hr @@ -97,62 +97,9 @@ "Informacije" MENU @@ -1116,7 +1138,7 @@ + "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs + "Izgled" END + "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Izlaz" MENU "Ponovo startaj" RESTART - "Startaj AfterStep" RESTART afterstep @@ -1124,7 +1146,9 @@ - "Izlaz iz sessiona..." SHUTDOWN "Izlaz" END "Programi" END ---- WindowMaker/menu.hu +Index: WindowMaker/menu.hu +=================================================================== +--- WindowMaker/menu.hu.orig +++ WindowMaker/menu.hu @@ -111,62 +111,10 @@ "Infó" MENU @@ -1198,7 +1222,7 @@ "Megjelenés" END - + "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Kilépés" MENU "Újraindítás" RESTART - "BlackBox indítása" RESTART blackbox @@ -1207,7 +1231,9 @@ "Kilépés..." EXIT "Kilépés" END "Alkalmazások" END ---- WindowMaker/menu.it +Index: WindowMaker/menu.it +=================================================================== +--- WindowMaker/menu.it.orig +++ WindowMaker/menu.it @@ -45,58 +45,9 @@ "Informazioni" MENU @@ -1285,7 +1311,9 @@ - "Uscire dalla sessione..." SHUTDOWN "Uscire" END "Applicazioni" END ---- WindowMaker/menu.ja +Index: WindowMaker/menu.ja +=================================================================== +--- WindowMaker/menu.ja.orig +++ WindowMaker/menu.ja @@ -103,61 +103,8 @@ "情報" MENU @@ -1366,7 +1394,9 @@ "終了" END "アプリケーション" END ---- WindowMaker/menu.ko +Index: WindowMaker/menu.ko +=================================================================== +--- WindowMaker/menu.ko.orig +++ WindowMaker/menu.ko @@ -102,57 +102,7 @@ "정 보" MENU @@ -1467,7 +1497,9 @@ - "세션종료" SHUTDOWN "종 료" END "윈도우메이커" END ---- WindowMaker/menu.nl +Index: WindowMaker/menu.nl +=================================================================== +--- WindowMaker/menu.nl.orig +++ WindowMaker/menu.nl @@ -35,48 +35,9 @@ "Info" MENU @@ -1525,7 +1557,7 @@ - "Opslaan werkplaats" EXEC SAVE_WORKSPACE + "Opslaan werkplaats" SAVE_SESSION "Werkplaats" END -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps + "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Exit" MENU "Herstart" RESTART @@ -1534,7 +1566,9 @@ - "Afsluiten sessie..." SHUTDOWN "Exit" END "Applicaties" END ---- WindowMaker/menu.no +Index: WindowMaker/menu.no +=================================================================== +--- WindowMaker/menu.no.orig +++ WindowMaker/menu.no @@ -100,58 +100,9 @@ "Info" MENU @@ -1599,10 +1633,10 @@ "Bakgrunn" END "Lagre Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)" "Lagre Ikonsett" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)" -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Utseende" END - -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps + "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Avslutt" MENU "Restart" RESTART @@ -1611,7 +1645,9 @@ - "Avslutt X11..." SHUTDOWN "Avslutt" END "Applikasjoner" END ---- WindowMaker/menu.pl +Index: WindowMaker/menu.pl +=================================================================== +--- WindowMaker/menu.pl.orig +++ WindowMaker/menu.pl @@ -104,125 +104,12 @@ "Informacja" MENU @@ -1744,11 +1780,11 @@ "Tło" END "Zaoamiętanie Tematu" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Nazwa tematu,Wpisz nazwe pliku:)" "Zapamiętanie Ustawień Ikon" EXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ustawienia ikon,wpisz nazwe pliku:)" -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Wygląd" END - -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Wyjście" MENU "Przeładowanie" RESTART - "Start BlackBox" RESTART blackbox @@ -1758,7 +1794,9 @@ - "Zabicie sesji..." SHUTDOWN "Wyjście" END "WindowMaker" END ---- WindowMaker/menu.pt +Index: WindowMaker/menu.pt +=================================================================== +--- WindowMaker/menu.pt.orig +++ WindowMaker/menu.pt @@ -106,61 +106,9 @@ "Informações" MENU @@ -1826,10 +1864,10 @@ "Papéis de Parede" END "Salvar Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Nome do Tema)" "Salvar Configuração de Ícones" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Nome do Conjunto de Ícones)" -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Appearance" END -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Sair" MENU "Reiniciar" RESTART @@ -1839,7 +1877,9 @@ "Sair" END "Aplicações" END ---- WindowMaker/menu.ro +Index: WindowMaker/menu.ro +=================================================================== +--- WindowMaker/menu.ro.orig +++ WindowMaker/menu.ro @@ -108,61 +108,10 @@ "Informaţii" MENU @@ -1914,8 +1954,8 @@ + "Utilitar de Configurare" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Configurare" END - -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Ieşire" MENU "Repornire" RESTART - "Porneşte BlackBox" RESTART blackbox @@ -1924,7 +1964,9 @@ "Ieşi" EXIT "Ieşire" END "Aplicaţii" END ---- WindowMaker/menu.ru +Index: WindowMaker/menu.ru +=================================================================== +--- WindowMaker/menu.ru.orig +++ WindowMaker/menu.ru @@ -57,70 +57,19 @@ "Информация" MENU @@ -2002,10 +2044,10 @@ "Градиент" END "Фон" END "Стили" OPEN_MENU styles.menu -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Внешний вид" END -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Выход" MENU "Перезапустить" RESTART @@ -2014,7 +2056,9 @@ - "Завершить сессию..." SHUTDOWN "Выход" END "Приложения" END ---- WindowMaker/menu.sk +Index: WindowMaker/menu.sk +=================================================================== +--- WindowMaker/menu.sk.orig +++ WindowMaker/menu.sk @@ -122,61 +122,10 @@ "Informácie" MENU @@ -2085,8 +2129,8 @@ - "Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs + "Konfiguračný nástroj" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Vzhľad" END -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Koniec" MENU "Reštartovať" RESTART @@ -2096,7 +2140,9 @@ "Koniec" EXIT "Koniec" END "Aplikácie" END ---- WindowMaker/menu.sl +Index: WindowMaker/menu.sl +=================================================================== +--- WindowMaker/menu.sl.orig +++ WindowMaker/menu.sl @@ -105,61 +105,9 @@ "Informacije" MENU @@ -2164,10 +2210,10 @@ "Odzadje" END "Shrani temo" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)" "Shrani zbirko ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)" -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Izgled" END -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Izhod" MENU "Ponovno zaženi" RESTART @@ -2176,7 +2222,9 @@ - "Izhod iz session..." SHUTDOWN "Izhod" END "Aplikacije" END ---- WindowMaker/menu.tr +Index: WindowMaker/menu.tr +=================================================================== +--- WindowMaker/menu.tr.orig +++ WindowMaker/menu.tr @@ -91,61 +91,9 @@ "Bilgi" MENU @@ -2244,11 +2292,11 @@ "Arkaplan" END "Tema Sakla" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)" "Simge Kümesi Sakla" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)" -+ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs ++ "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs + "Görünüm" END -+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps -+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" ++ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps ++ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8" "Çıkış" MENU "Yeniden Başlat" RESTART @@ -2258,236 +2306,9 @@ "Çıkış" END "Ana Menü" END ---- WindowMaker/plmenu -+++ WindowMaker/plmenu -@@ -1,106 +1,55 @@ - ("Applications", - ("Info", - ("Info Panel", INFO_PANEL), -- ("Legal", LEGAL_PANEL), -- ("System Console", EXEC, "xconsole"), -- ("System Load", SHEXEC, "xosview || xload"), -- ("Process List", EXEC, "xterm -e top"), -- ("Manual Browser", EXEC, "xman") -- ), -- ("Run...", SHEXEC, "%A(Run,Type command to run:)"), -+ ("Legal", LEGAL_PANEL) -+ ), -+ ("Run...", SHEXEC, "%a(Run,Type command to run:)"), - ("XTerm", EXEC, "xterm -sb"), -- ("Mozilla Firefox", EXEC, "firefox"), - ("Workspaces", WORKSPACE_MENU), -- ("Applications", -- ("Gimp", SHEXEC, "gimp >/dev/null"), -- ("Ghostview", EXEC, "ghostview %a(Enter file to view)"), -- ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"), -- ("Abiword", EXEC, "abiword"), -- ("Dia", EXEC, "dia"), -- ("OpenOffice.org", -- ("OpenOffice.org", EXEC, "ooffice"), -- ("Writer", EXEC, "oowriter"), -- ("Spreadsheet", EXEC, "oocalc"), -- ("Draw", EXEC, "oodraw"), -- ("Impress", EXEC, "ooimpress") -- ), -- ("Editors", -- ("XEmacs", EXEC, "xemacs"), -- ("Emacs", EXEC, "emacs"), -- ("XJed", EXEC, "xjed"), -- ("VI", EXEC, "xterm -e vi"), -- ("GVIM", EXEC, "gvim"), -- ("NEdit", EXEC, "nedit"), -- ("Xedit", EXEC, "xedit") -- ), -- ("Multimedia", -- ("XMMS", -- ("XMMS", EXEC, "xmms"), -- ("XMMS play/pause", EXEC, "xmms -t"), -- ("XMMS stop", EXEC, "xmms -s") -- ), -- ("Xine video player", EXEC, "xine"), -- ("MPlayer", EXEC, "mplayer") -- ) -- ), -- ("Utils", -- ("Calculator", EXEC, "xcalc"), -- ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"), -- ("Font Chooser", EXEC, "xfontsel"), -- ("Magnify", EXEC, "wmagnify"), -- ("Colormap", EXEC, "xcmap"), -- ("Kill X Application", EXEC, "xkill") -- ), -- ("Selection", -- ("Copy", SHEXEC, "echo '%s' | wxcopy"), -- ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"), -- ("Navigate", EXEC, "mozilla %s"), -- ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)") -- ), - ("Commands", - ("Hide Others", HIDE_OTHERS), - ("Show All", SHOW_ALL), - ("Arrange Icons", ARRANGE_ICONS), - ("Refresh", REFRESH), -- ("Lock", EXEC, "xlock -allowroot -usefirst") -- ), -+ ("Lock", EXEC, "xlock -allowroot -usefirst"), -+ ("Save Session", SAVE_SESSION), -+ ("Clear Session", CLEAR_SESSION) -+ ), - ("Appearance", - ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"), - ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"), - ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"), - ("Background", - ("Solid", -- ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), -- ("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"), -- ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"), -- ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"), -- ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"), -- ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"), -- ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"), -- ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'") -- ), -+ ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), -+ ("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"), -+ ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"), -+ ("Bleumarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"), -+ ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"), -+ ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"), -+ ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"), -+ ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'") -+ ), - ("Gradient", -- ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"), -- ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"), -- ("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"), -- ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"), -- ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"), -- ("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"), -- ("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), -- ("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") -- ), -+ ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"), -+ ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"), -+ ("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"), -+ ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"), -+ ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"), -+ ("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"), -+ ("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), -+ ("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") -+ ), - ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") - ), -- ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), -- ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), -- ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") -- ), -- ("Session", -- ("Save Session", SAVE_SESSION), -- ("Clear Session", CLEAR_SESSION), -- ("Restart Window Maker", RESTART), -- ("Start BlackBox", RESTART, blackbox), -- ("Start IceWM", RESTART, icewm), -- ("Exit", EXIT) -- ) -+ ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), -+ ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), -+ ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") -+ ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), -+ ("Exit", -+ ("Restart", RESTART), -+ ("Exit", EXIT) -+ ) - ) ---- WindowMaker/plmenu.bg -+++ WindowMaker/plmenu.bg -@@ -1,61 +1,11 @@ - ("Приложения", - ("Инфо", - ("Информационен панел...", INFO_PANEL), -- ("Лицензионен панел...", LEGAL_PANEL), -- ("Системна конзола", EXEC, "xconsole"), -- ("Натоварване на системата", SHEXEC, "xosview || xload"), -- ("Списък на процесите", EXEC, "xterm -e top"), -- ("Ръководства", EXEC, "xman") -+ ("Лицензионен панел...", LEGAL_PANEL) - ), -- ("Стартирай...", SHEXEC, "%A(Run,Въведете команда, която да се стартира:)"), -+ ("Стартирай...", SHEXEC, "%a(Run,Въведете команда, която да се стартира:)"), - ("XTerm", EXEC, "xterm -sb"), -- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"), - ("Работни места", WORKSPACE_MENU), -- ("Приложения", -- ("Графични", -- ("Gimp", SHEXEC, "gimp >/dev/null"), -- ("XV", EXEC, "xv"), -- ("XPaint", EXEC, "xpaint"), -- ("XFig", EXEC, "xfig") -- ), -- ("X File Manager", EXEC, "xfm"), -- ("OffiX Files", EXEC, "files"), -- ("LyX", EXEC, "lyx"), -- ("Netscape", EXEC, "netscape"), -- ("Ghostview", EXEC, "ghostview %a(Enter file to view)"), -- ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"), -- ("TkDesk", EXEC, "tkdesk") -- ), -- ("Редактори", -- ("XFte", EXEC, "xfte"), -- ("XEmacs", SHEXEC, "xemacs || emacs"), -- ("XJed", EXEC, "xjed"), -- ("NEdit", EXEC, "nedit"), -- ("Xedit", EXEC, "xedit"), -- ("VI", EXEC, "xterm -e vi") -- ), -- ("Разни", -- ("Xmcd", SHEXEC, "xmcd 2> /dev/null"), -- ("Xplaycd", EXEC, "xplaycd"), -- ("Xmixer", EXEC, "xmixer") -- ), -- ("Инструменти", -- ("Калкулатор", EXEC, "xcalc"), -- ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"), -- ("Избор на шрифт", EXEC, "xfontsel"), -- ("Емулатор на терминал", EXEC, "xminicom"), -- ("Лупа", EXEC, "xmag"), -- ("Цветна палитра", EXEC, "xcmap"), -- ("XKill", EXEC, "xkill"), -- ("ASClock", EXEC, "asclock -shape"), -- ("Clipboard", EXEC, "xclipboard") -- ), -- ("Избор", -- ("Copy", SHEXEC, "echo '%s' | wxcopy"), -- ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"), -- ("Navigate", EXEC, "netscape %s"), -- ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)") -- ), - ("Работно място", - ("Скрий другите", HIDE_OTHERS), - ("Покажи всички", SHOW_ALL), -@@ -94,13 +44,12 @@ - ), - ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), - ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), -- ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") -+ ("Пособие за настройки", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") - ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), - ("Изход", - ("Рестартиране", RESTART), -- ("Стартирай BlackBox", RESTART, blackbox), -- ("Стартирай kwm", RESTART, kwm), -- ("Стартирай IceWM", RESTART, icewm), - ("Изход...", EXIT) - ) --) -+) -\ No newline at end of file ---- WindowMaker/plmenu.cs +Index: WindowMaker/plmenu.cs +=================================================================== +--- /dev/null +++ WindowMaker/plmenu.cs @@ -0,0 +1,158 @@ +( @@ -2648,7 +2469,9 @@ + ("Ukončit...", EXIT) + ) +) ---- WindowMaker/plmenu.da +Index: WindowMaker/plmenu.da +=================================================================== +--- WindowMaker/plmenu.da.orig +++ WindowMaker/plmenu.da @@ -3,23 +3,7 @@ ( @@ -2882,7 +2705,7 @@ + ("Gem Ikonsæt", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikonsæt navn,Indtast navn:)"), + ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ( "Afslut", @@ -2893,7 +2716,9 @@ ("Afslut...", EXIT) ) ) ---- WindowMaker/plmenu.de +Index: WindowMaker/plmenu.de +=================================================================== +--- WindowMaker/plmenu.de.orig +++ WindowMaker/plmenu.de @@ -1,61 +1,11 @@ ("Anwendungen", @@ -2980,11 +2805,12 @@ ), - ("Thema speichern", SHEXEC, "getstyle -t /home/mawa/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""), - ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"") +- ), + ("Thema speichern", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""), + ("Iconsatz speichern", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\""), -+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") - ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("Beenden", ("Neustart", RESTART), @@ -2994,12 +2820,14 @@ ("Beenden...", EXIT) ) ) ---- WindowMaker/plmenu.es +Index: WindowMaker/plmenu.es +=================================================================== +--- WindowMaker/plmenu.es.orig +++ WindowMaker/plmenu.es -@@ -1,61 +1,11 @@ +@@ -1,61 +1,10 @@ ("Aplicaciones", ("Informacion", - ("Panel de Informacion", INFO_PANEL), +- ("Panel de Informacion", INFO_PANEL), - ("Legal", LEGAL_PANEL), - ("Consola", EXEC, "xconsole"), - ("Carga del Sistema", SHEXEC, "xosview || xload"), @@ -3007,7 +2835,7 @@ - ("Paginas del Manual", EXEC, "xman") + ("Legal", LEGAL_PANEL) ), - ("Ejecutar...", SHEXEC, "%A(Run,Type command to run:)"), + ("Ejecutar...", SHEXEC, "%a(Run,Type command to run:)"), ("XTerm", EXEC, "xterm -sb"), - ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"), ("Espacio de Trabajo", WORKSPACE_MENU), @@ -3059,7 +2887,7 @@ ("Escritorio", ("Esconder otros", HIDE_OTHERS), ("Mostrar todos", SHOW_ALL), -@@ -66,9 +16,9 @@ +@@ -66,9 +15,9 @@ ("Borrar sesion", CLEAR_SESSION) ), ("Apariencia", @@ -3072,7 +2900,7 @@ ("Papel Tapiz", ("Solido", ("Negro", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), -@@ -90,17 +40,16 @@ +@@ -90,17 +39,16 @@ ("Sombras grises", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), ("Sombras vino", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") ), @@ -3084,7 +2912,7 @@ - ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") + ("Preferencias", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("Salir", ("Reiniciar", RESTART), @@ -3094,7 +2922,9 @@ ("Salir", EXIT) ) ) ---- WindowMaker/plmenu.fi +Index: WindowMaker/plmenu.fi +=================================================================== +--- WindowMaker/plmenu.fi.orig +++ WindowMaker/plmenu.fi @@ -3,27 +3,7 @@ ( @@ -3355,7 +3185,7 @@ + "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs" ) ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ( "Lopeta", @@ -3366,7 +3196,9 @@ ("Lopeta", EXIT) ) ) ---- WindowMaker/plmenu.fr +Index: WindowMaker/plmenu.fr +=================================================================== +--- WindowMaker/plmenu.fr.orig +++ WindowMaker/plmenu.fr @@ -1,61 +1,11 @@ ("Applications", @@ -3437,10 +3269,10 @@ ("Sauver le thème", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes /\"%a(Nom du thème,Entrez un nom de fichier:)\""), - ("Sauver le jeu d'icônes", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets /\"%a(Nom du jeu d'icônes,Entrez un nom de fichier:)\"") + ("Sauver le jeu d'icônes", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets /\"%a(Nom du jeu d'icônes,Entrez un nom de fichier:)\""), -+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("Quitter", ("Redémarrer", RESTART), - ("Démarrer AfterStep", RESTART, afterstep), @@ -3449,7 +3281,9 @@ + ("Quitter...", EXIT) ) ) ---- WindowMaker/plmenu.hr +Index: WindowMaker/plmenu.hr +=================================================================== +--- WindowMaker/plmenu.hr.orig +++ WindowMaker/plmenu.hr @@ -3,77 +3,12 @@ ( @@ -3571,15 +3405,15 @@ "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\"" - ) + ), -+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ), + ( + "Snimi temu", + SHEXEC, + "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\"" + ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ( Izlaz, ("Ponovo startaj", RESTART), @@ -3591,7 +3425,9 @@ + (Izlaz..., EXIT) ) ) ---- WindowMaker/plmenu.it +Index: WindowMaker/plmenu.it +=================================================================== +--- WindowMaker/plmenu.it.orig +++ WindowMaker/plmenu.it @@ -1,61 +1,11 @@ ("Applicazioni", @@ -3678,11 +3514,12 @@ ), ("Salva il tema", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""), - ("Salva il set icone", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\"") +- ), + ("Salva il set icone", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\""), -+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") - ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("Esci", ("Riavvia", RESTART), - ("Avvia BlackBox", RESTART, blackbox), @@ -3693,12 +3530,14 @@ + ("Esci...", EXIT) ) ) ---- WindowMaker/plmenu.ja +Index: WindowMaker/plmenu.ja +=================================================================== +--- WindowMaker/plmenu.ja.orig +++ WindowMaker/plmenu.ja -@@ -1,44 +1,11 @@ +@@ -1,44 +1,10 @@ ("アプリケーション", ("情報", - ("Info パネル", INFO_PANEL), +- ("Info パネル", INFO_PANEL), - ("Legal パネル", LEGAL_PANEL), - ("システムコンソール", EXEC, "xconsole"), - ("システム負荷", SHEXEC, "xosview || xload"), @@ -3706,7 +3545,7 @@ - ("マニュアルブラウザ", EXEC, "xman") + ("Legal パネル", LEGAL_PANEL) ), - ("コマンド実行", SHEXEC, "%A(Run,Type command to run:)"), + ("コマンド実行", SHEXEC, "%a(Run,Type command to run:)"), ("KTerm", EXEC, "kterm -sb"), - ("Rxvt", EXEC, "rxvt -bg black -fg white"), ("ワークスペース", WORKSPACE_MENU), @@ -3741,7 +3580,7 @@ ("ユーティリティー", ("電卓", EXEC, "xcalc"), ("プロパティ表示", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"), -@@ -50,12 +17,6 @@ +@@ -50,12 +16,6 @@ ("ASClock", EXEC, "asclock -shape"), ("Clipboard", EXEC, "xclipboard") ), @@ -3754,7 +3593,7 @@ ("ワークスペース", ("他をハイド", HIDE_OTHERS), ("全て表示", SHOW_ALL), -@@ -94,13 +55,12 @@ +@@ -94,13 +54,12 @@ ), ("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), @@ -3762,7 +3601,7 @@ - ), + ("設定ユーティリティ", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") + ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("終了", ("再起動", RESTART), @@ -3772,7 +3611,9 @@ ("終了", EXIT) ) ) ---- WindowMaker/plmenu.ko +Index: WindowMaker/plmenu.ko +=================================================================== +--- WindowMaker/plmenu.ko.orig +++ WindowMaker/plmenu.ko @@ -1,57 +1,7 @@ ("윈도우메이커", @@ -3854,8 +3695,8 @@ ) ), - ("화면잠금", SHORTCUT, "SHIFT+META+L", EXEC, "xlock -allowroot -usefirst"), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("종 료", ("재 시 작", RESTART), - ("재 시 작", @@ -3871,7 +3712,9 @@ + ("종 료", EXIT) ) ) ---- WindowMaker/plmenu.pl +Index: WindowMaker/plmenu.pl +=================================================================== +--- WindowMaker/plmenu.pl.orig +++ WindowMaker/plmenu.pl @@ -1,125 +1,12 @@ ("WindowMaker", @@ -4007,11 +3850,11 @@ ("Zaoamiętanie Tematu", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/'%a(Nazwa tematu,Wpisz nazwe pliku:)'"), - ("Zapamiętanie Ustawień Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'") + ("Zapamiętanie Ustawień Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'"), -+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ), - -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("Wyjście", ("Przeładowanie", RESTART), - ("Start BlackBox", RESTART, blackbox), @@ -4022,7 +3865,9 @@ + ("Wyjście...", EXIT) ) ) ---- WindowMaker/plmenu.ro +Index: WindowMaker/plmenu.ro +=================================================================== +--- WindowMaker/plmenu.ro.orig +++ WindowMaker/plmenu.ro @@ -1,61 +1,11 @@ ("Aplicaţii", @@ -4094,8 +3939,8 @@ - ("Utilitar de Configurare", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") + ("Utilitar de Configurare", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("Ieşire", ("Repornire", RESTART), - ("Porneşte BlackBox", RESTART, blackbox), @@ -4104,7 +3949,9 @@ ("Ieşi", EXIT) ) ) ---- WindowMaker/plmenu.sk +Index: WindowMaker/plmenu.sk +=================================================================== +--- WindowMaker/plmenu.sk.orig +++ WindowMaker/plmenu.sk @@ -1,61 +1,11 @@ ("Aplikácie", @@ -4186,7 +4033,9 @@ ("Koniec", EXIT) ) ) ---- WindowMaker/plmenu.zh_CN +Index: WindowMaker/plmenu.zh_CN +=================================================================== +--- WindowMaker/plmenu.zh_CN.orig +++ WindowMaker/plmenu.zh_CN @@ -1,63 +1,11 @@ ("应用程序", @@ -4258,11 +4107,12 @@ ), ("保存主题", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(主题名)\""), - ("保存图标集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(图标集名)\"") +- ), + ("保存图标集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(图标集名)\""), -+ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") - ), -+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("退出", ("重新启动", RESTART), - ("启动 BlackBox", RESTART, blackbox), @@ -4271,7 +4121,9 @@ ("退出...", EXIT) ) ) ---- WindowMaker/plmenu.zh_TW +Index: WindowMaker/plmenu.zh_TW +=================================================================== +--- WindowMaker/plmenu.zh_TW.orig +++ WindowMaker/plmenu.zh_TW @@ -1,59 +1,11 @@ ("應用程式", @@ -4340,7 +4192,7 @@ ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ), + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), -+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ("離開", ("重新啟動", RESTART), - ("啟動 BlackBox", RESTART, blackbox), @@ -4349,3 +4201,230 @@ ("離開...", EXIT) ) ) +Index: WindowMaker/plmenu +=================================================================== +--- WindowMaker/plmenu.orig ++++ WindowMaker/plmenu +@@ -1,106 +1,55 @@ + ("Applications", + ("Info", + ("Info Panel", INFO_PANEL), +- ("Legal", LEGAL_PANEL), +- ("System Console", EXEC, "xconsole"), +- ("System Load", SHEXEC, "xosview || xload"), +- ("Process List", EXEC, "xterm -e top"), +- ("Manual Browser", EXEC, "xman") +- ), ++ ("Legal", LEGAL_PANEL) ++ ), + ("Run...", SHEXEC, "%a(Run,Type command to run:)"), + ("XTerm", EXEC, "xterm -sb"), +- ("Mozilla Firefox", EXEC, "firefox"), + ("Workspaces", WORKSPACE_MENU), +- ("Applications", +- ("Gimp", SHEXEC, "gimp >/dev/null"), +- ("Ghostview", EXEC, "ghostview %a(Enter file to view)"), +- ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"), +- ("Abiword", EXEC, "abiword"), +- ("Dia", EXEC, "dia"), +- ("OpenOffice.org", +- ("OpenOffice.org", EXEC, "ooffice"), +- ("Writer", EXEC, "oowriter"), +- ("Spreadsheet", EXEC, "oocalc"), +- ("Draw", EXEC, "oodraw"), +- ("Impress", EXEC, "ooimpress") +- ), +- ("Editors", +- ("XEmacs", EXEC, "xemacs"), +- ("Emacs", EXEC, "emacs"), +- ("XJed", EXEC, "xjed"), +- ("VI", EXEC, "xterm -e vi"), +- ("GVIM", EXEC, "gvim"), +- ("NEdit", EXEC, "nedit"), +- ("Xedit", EXEC, "xedit") +- ), +- ("Multimedia", +- ("XMMS", +- ("XMMS", EXEC, "xmms"), +- ("XMMS play/pause", EXEC, "xmms -t"), +- ("XMMS stop", EXEC, "xmms -s") +- ), +- ("Xine video player", EXEC, "xine"), +- ("MPlayer", EXEC, "mplayer") +- ) +- ), +- ("Utils", +- ("Calculator", EXEC, "xcalc"), +- ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"), +- ("Font Chooser", EXEC, "xfontsel"), +- ("Magnify", EXEC, "wmagnify"), +- ("Colormap", EXEC, "xcmap"), +- ("Kill X Application", EXEC, "xkill") +- ), +- ("Selection", +- ("Copy", SHEXEC, "echo '%s' | wxcopy"), +- ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"), +- ("Navigate", EXEC, "mozilla %s"), +- ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)") +- ), + ("Commands", + ("Hide Others", HIDE_OTHERS), + ("Show All", SHOW_ALL), + ("Arrange Icons", ARRANGE_ICONS), + ("Refresh", REFRESH), +- ("Lock", EXEC, "xlock -allowroot -usefirst") +- ), ++ ("Lock", EXEC, "xlock -allowroot -usefirst"), ++ ("Save Session", SAVE_SESSION), ++ ("Clear Session", CLEAR_SESSION) ++ ), + ("Appearance", + ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"), + ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"), + ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"), + ("Background", + ("Solid", +- ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), +- ("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"), +- ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"), +- ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"), +- ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"), +- ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"), +- ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"), +- ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'") ++ ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), ++ ("Blue", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"), ++ ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"), ++ ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"), ++ ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"), ++ ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"), ++ ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"), ++ ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'") + ), + ("Gradient", +- ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"), +- ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"), +- ("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"), +- ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"), +- ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"), +- ("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"), +- ("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), +- ("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") ++ ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"), ++ ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"), ++ ("Blue Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"), ++ ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"), ++ ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"), ++ ("Wheat Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"), ++ ("Grey Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), ++ ("Wine Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") + ), + ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") + ), +- ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), +- ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), +- ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") +- ), +- ("Session", +- ("Save Session", SAVE_SESSION), +- ("Clear Session", CLEAR_SESSION), +- ("Restart Window Maker", RESTART), +- ("Start BlackBox", RESTART, blackbox), +- ("Start IceWM", RESTART, icewm), +- ("Exit", EXIT) +- ) ++ ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), ++ ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), ++ ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") ++ ), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), ++ ("Exit", ++ ("Restart", RESTART), ++ ("Exit", EXIT) ++ ) + ) +Index: WindowMaker/plmenu.bg +=================================================================== +--- WindowMaker/plmenu.bg.orig ++++ WindowMaker/plmenu.bg +@@ -1,61 +1,10 @@ + ("Приложения", + ("Инфо", +- ("Информационен панел...", INFO_PANEL), +- ("Лицензионен панел...", LEGAL_PANEL), +- ("Системна конзола", EXEC, "xconsole"), +- ("Натоварване на системата", SHEXEC, "xosview || xload"), +- ("Списък на процесите", EXEC, "xterm -e top"), +- ("Ръководства", EXEC, "xman") ++ ("Лицензионен панел...", LEGAL_PANEL) + ), + ("Стартирай...", SHEXEC, "%a(Run,Въведете команда, която да се стартира:)"), + ("XTerm", EXEC, "xterm -sb"), +- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"), + ("Работни места", WORKSPACE_MENU), +- ("Приложения", +- ("Графични", +- ("Gimp", SHEXEC, "gimp >/dev/null"), +- ("XV", EXEC, "xv"), +- ("XPaint", EXEC, "xpaint"), +- ("XFig", EXEC, "xfig") +- ), +- ("X File Manager", EXEC, "xfm"), +- ("OffiX Files", EXEC, "files"), +- ("LyX", EXEC, "lyx"), +- ("Netscape", EXEC, "netscape"), +- ("Ghostview", EXEC, "ghostview %a(Enter file to view)"), +- ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"), +- ("TkDesk", EXEC, "tkdesk") +- ), +- ("Редактори", +- ("XFte", EXEC, "xfte"), +- ("XEmacs", SHEXEC, "xemacs || emacs"), +- ("XJed", EXEC, "xjed"), +- ("NEdit", EXEC, "nedit"), +- ("Xedit", EXEC, "xedit"), +- ("VI", EXEC, "xterm -e vi") +- ), +- ("Разни", +- ("Xmcd", SHEXEC, "xmcd 2> /dev/null"), +- ("Xplaycd", EXEC, "xplaycd"), +- ("Xmixer", EXEC, "xmixer") +- ), +- ("Инструменти", +- ("Калкулатор", EXEC, "xcalc"), +- ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"), +- ("Избор на шрифт", EXEC, "xfontsel"), +- ("Емулатор на терминал", EXEC, "xminicom"), +- ("Лупа", EXEC, "xmag"), +- ("Цветна палитра", EXEC, "xcmap"), +- ("XKill", EXEC, "xkill"), +- ("ASClock", EXEC, "asclock -shape"), +- ("Clipboard", EXEC, "xclipboard") +- ), +- ("Избор", +- ("Copy", SHEXEC, "echo '%s' | wxcopy"), +- ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"), +- ("Navigate", EXEC, "netscape %s"), +- ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)") +- ), + ("Работно място", + ("Скрий другите", HIDE_OTHERS), + ("Покажи всички", SHOW_ALL), +@@ -94,13 +43,12 @@ + ), + ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), + ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), +- ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs") ++ ("Пособие за настройки", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs") + ), ++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"), ++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"), + ("Изход", + ("Рестартиране", RESTART), +- ("Стартирай BlackBox", RESTART, blackbox), +- ("Стартирай kwm", RESTART, kwm), +- ("Стартирай IceWM", RESTART, icewm), + ("Изход...", EXIT) + ) + ) diff --git a/WindowMaker-nb-locale.patch b/WindowMaker-nb-locale.patch deleted file mode 100644 index cc1e7b7..0000000 --- a/WindowMaker-nb-locale.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -292,7 +292,7 @@ - - dnl List of supported locales - dnl ------------------------- --supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" -+supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW" - supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW" - supported_wings_locales="bg ca cs de fr sk" - ---- po/Makefile.am -+++ po/Makefile.am -@@ -6,7 +6,7 @@ - - # Please keep this sorted in alphabetic order! - EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \ -- fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \ -+ fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po nb.po \ - pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po - - POTFILES = \ diff --git a/WindowMaker-null.patch b/WindowMaker-null.patch deleted file mode 100644 index a02176d..0000000 --- a/WindowMaker-null.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Window-Maker-5a2507602c48/WINGs/wfontpanel.c -+++ Window-Maker-5a2507602c48/WINGs/wfontpanel.c -@@ -585,7 +585,7 @@ - int i; - - pat = FcPatternCreate(); -- os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, 0); -+ os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, NULL); - fs = FcFontList(0, pat, os); - if (!fs) { - WMRunAlertPanel(scr, panel->win, _("Error"), diff --git a/WindowMaker-png_check_sig.patch b/WindowMaker-png_check_sig.patch deleted file mode 100644 index 9e964b8..0000000 --- a/WindowMaker-png_check_sig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wrlib/load.c -+++ wrlib/load.c -@@ -348,7 +348,7 @@ - - #ifdef USE_PNG - /* check for PNG */ -- if (png_check_sig(buffer, 8)) -+ if (!png_sig_cmp(buffer, 0, 8)) - return IM_PNG; - #endif - diff --git a/WindowMaker-rpmlintrc b/WindowMaker-rpmlintrc index 42c885b..480c35c 100644 --- a/WindowMaker-rpmlintrc +++ b/WindowMaker-rpmlintrc @@ -1,2 +1 @@ -# no left over, but the original menu -addFilter("E: suse-filelist-forbidden.*/usr/share/doc/packages/WindowMaker/menu.orig") +addFilter("macro-in-comment") diff --git a/WindowMaker-warnings.patch b/WindowMaker-warnings.patch deleted file mode 100644 index 656dd6b..0000000 --- a/WindowMaker-warnings.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- WINGs/Examples/puzzle.c -+++ WINGs/Examples/puzzle.c -@@ -12,7 +12,7 @@ - - WMWindow *win; - WMButton *Button[MAX_SIZE]; --char Map[MAX_SIZE]; -+signed char Map[MAX_SIZE]; - int Size = 4; - int MoveCount; - ---- WINGs/WINGs/WUtil.h -+++ WINGs/WINGs/WUtil.h -@@ -216,11 +216,11 @@ - /* don't free the returned string */ - char* wstrerror(int errnum); - --void wmessage(const char *msg, ...); --void wwarning(const char *msg, ...); --void wfatal(const char *msg, ...); --void wsyserror(const char *msg, ...); --void wsyserrorwithcode(int error, const char *msg, ...); -+void wmessage(const char *msg, ...) __attribute__((__format__(printf,1,2))); -+void wwarning(const char *msg, ...) __attribute__((__format__(printf,1,2))); -+void wfatal(const char *msg, ...) __attribute__((__format__(printf,1,2))); -+void wsyserror(const char *msg, ...) __attribute__((__format__(printf,1,2))); -+void wsyserrorwithcode(int error, const char *msg, ...) __attribute__((__format__(printf,2,3))); - - char* wfindfile(char *paths, char *file); - ---- WINGs/wcolorpanel.c -+++ WINGs/wcolorpanel.c -@@ -1239,7 +1239,7 @@ - } - - if (!(dPtr = opendir(panel->configurationPath))) { -- wwarning(_("Color Panel: Could not find file"), "%s", panel->configurationPath); -+ wwarning(_("Color Panel: Could not find file: %s"), panel->configurationPath); - return; - } - -@@ -3715,6 +3715,7 @@ - color.red = 0; - color.green = 0; - color.blue = 0; -+ color.alpha = 0; - return color; - } - -@@ -3724,6 +3725,7 @@ - color.red = xcolor->red >> 8; - color.green = xcolor->green >> 8; - color.blue = xcolor->blue >> 8; -+ color.alpha = 0; - - wfree(xcolor); - ---- src/cycling.c -+++ src/cycling.c -@@ -22,6 +22,7 @@ - - #include "wconfig.h" - -+#include - #include - #include - #include ---- src/dock.c -+++ src/dock.c -@@ -3780,7 +3780,7 @@ - - - if (wPreferences.flags.noupdates) -- return; -+ return False; - - if (XGrabPointer(dpy, icon->core->window, True, ButtonMotionMask - |ButtonReleaseMask|ButtonPressMask, GrabModeAsync, ---- src/texture.c -+++ src/texture.c -@@ -421,6 +421,8 @@ - texture->argc = argc; - texture->argv = argv; - -+ memset(&fallbackColor, 0, sizeof(fallbackColor)); -+ - fallbackColor.red = 0x8000; - fallbackColor.green = 0x8000; - fallbackColor.blue = 0x8000; ---- src/xdnd.c -+++ src/xdnd.c -@@ -185,7 +185,7 @@ - wfree(scr->xdestring); /* this xdestring is not from Xlib (no XFree) */ - } - -- /* why doesn't this function return anything ? -Dan */ -+ return True; - } - - Bool ---- util/wmsetup.c -+++ util/wmsetup.c -@@ -21,6 +21,7 @@ - int - main() - { -+return 0; - } - #else - #define PROG_VERSION "wmsetup 0.0 (Window Maker)" diff --git a/WindowMaker-wmspec.c-findBestIcon.patch b/WindowMaker-wmspec.c-findBestIcon.patch deleted file mode 100644 index 37384b3..0000000 --- a/WindowMaker-wmspec.c-findBestIcon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/wmspec.c -+++ src/wmspec.c -@@ -402,7 +402,7 @@ - * results in better overall aesthetics -Dan */ - wanted = wPreferences.icon_size * wPreferences.icon_size; - -- for (icon=NULL, distance=LONG_MAX, i=0L; i 1210 +BuildRequires: libXft-devel +%endif +BuildRequires: update-desktop-files +BuildRequires: xorg-x11-devel +Provides: wmaker +Provides: windowmanager +Requires: xdg-menu %description -Window Maker is a colorful and flexible window manager and -the designated successor of AfterStep. For more details, check -http://www.windowmaker.org. +Window Maker is an X11 window manager originally designed to provide +integration support for the GNUstep Desktop Environment. In every way +possible, it reproduces the elegant look and feel of the NEXTSTEP user +interface. It is fast, feature rich, easy to configure, and easy to +use. It is also free software, with contributions being made by +programmers from around the world. + +Window Maker has a stable user interface since many years and comes +with a powerful GUI configuration editor called WPrefs, which removes +the need to edit text-based config files by hand. It supports running +dockapps which make everyday tasks such as monitoring system +performance and battery usage, mounting devices or connecting to the +internet very easy. Please see the features section for more specifics +on what Window Maker can do, and how it compares with other popular +window managers. + +%package devel +Summary: Development files for WindowMaker +License: GPL-2.0+ +Group: Development/Libraries/X11 +Requires: %{name} = %{version} +Requires: giflib-devel +Requires: libjpeg-devel +Requires: libpng-devel +Requires: libtiff-devel +Requires: xorg-x11-devel +Requires: zlib-devel %description devel -Includes and static libraries for Window Maker +This package contains the header files and libraries necessary for +developing applications which use WindowMaker. %prep -%setup -q -n Window-Maker-5a2507602c48 -a 1 -mkdir menu.orig -cp WindowMaker/{menu.*,plmenu.*} menu.orig +%setup -q -n %{name}-%{version} -a 1 +mkdir menu_orig +cp %{name}/{menu.*,plmenu.*} menu_orig %patch1 %patch2 -%patch22 -%patch24 -%patch26 -p1 -%patch27 -#patch29 -%patch31 -%patch32 -%patch34 -%patch35 -%patch37 -%patch38 -%patch39 -%patch40 -%patch41 -%patch42 cp %{S:4} . cp %{S:6} . +%if 0%{?suse_version} < 1140 rename no nb po/no.* -(cd WindowMaker; rm -f *.orig; ./mkMakefile ) +%endif +(cd %{name}; rm -f *.orig; ./mkMakefile ) # --------------------------------------------------------------------------- %build -autoreconf --force --install -export LINGUAS="be bg ca cs da de el es et fi fr gl hr hu it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW" +#autoreconf --force --install +%if 0%{?suse_version} >= 1140 +export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" +%else +export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW" +%endif export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)" -%configure --disable-static --with-pic\ - --sysconfdir=/etc/X11 \ - --enable-sound \ - --enable-gnome \ - --enable-kde \ - --enable-xinerama \ - --with-nlsdir=/usr/share/locale \ - --with-pixmapdir=/usr/share/WindowMaker/Pixmaps \ - --with-gnustepdir=/usr/lib/GNUstep +%configure \ + --disable-static \ + --with-pic\ + --sysconfdir=/etc/X11 \ + --enable-xinerama \ + --with-nlsdir=/usr/share/locale \ + --with-pixmapdir=/usr/share/%{name}/Pixmaps \ + --with-gnustepdir=/usr/lib/GNUstep -(cd WindowMaker/Defaults; make clean; make %{?_smp_mflags}) +(cd %{name}/Defaults; make clean; make %{?_smp_mflags}) make %{?_smp_mflags} -(cd WindowMaker-extra-0.1 -%configure --disable-static --with-pic\ - --with-pixmapdir=/usr/share/WindowMaker/Pixmaps +(cd %{name}-extra-0.1 +%configure \ + --disable-static \ + --with-pic\ + --with-pixmapdir=/usr/share/%{name}/Pixmaps make %{?_smp_mflags} ) @@ -125,23 +132,24 @@ make %{?_smp_mflags} make DESTDIR=$RPM_BUILD_ROOT install install -m 755 dockit $RPM_BUILD_ROOT/usr/bin/dockit install -m 755 windowmaker $RPM_BUILD_ROOT/usr/bin/windowmaker -cd WindowMaker-extra-0.1 +cd %{name}-extra-0.1 make DESTDIR=$RPM_BUILD_ROOT install -tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes/ -find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type f -exec chmod 644 {} \; -find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type d -exec chmod 755 {} \; +tar -xvjf %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%{name}/Themes/ +find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type f -exec chmod 644 {} \; +find $RPM_BUILD_ROOT/usr/share/%{name}/Themes -type d -exec chmod 755 {} \; #---------------------------------------------------------------------- # not packaged -rm -f $RPM_BUILD_ROOT/%{_mandir}/sk/man1/* +rm -f $RPM_BUILD_ROOT/%{_mandir}/{cs,ru,sk}/man1/* rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la # install kdm/gdm entry install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ install -m 0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/xsessions/ -%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%name.desktop +%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%{name}.desktop cd .. %find_lang %{name} %find_lang WINGs %{name}.lang %find_lang WPrefs %{name}.lang +%find_lang wmgenmenu %{name}.lang %post -p /sbin/ldconfig @@ -149,25 +157,25 @@ cd .. %files -f %{name}.lang %defattr(-,root,root) -%dir /etc/X11/WindowMaker -%config /etc/X11/WindowMaker/* +%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N +%doc NEWS README* TODO +%doc menu_orig +%dir /etc/X11/%{name} +%config /etc/X11/%{name}/* /usr/lib/GNUstep /usr/bin/* %{_libdir}/*.so.* %{_mandir}/man1/* /usr/share/WINGs -/usr/share/WindowMaker +/usr/share/%{name} /usr/share/xsessions/* -%doc AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL ChangeLog FAQ FAQ.I18N -%doc MIRRORS NEWS README TODO README.SuSE -%doc menu.orig -#/usr/X11R6/share/WindowMaker +#/usr/X11R6/share/%{name} #/usr/X11R6/GNUstep %files devel %defattr(-,root,root) -%{_libdir}/pkgconfig/*.pc %{_includedir}/* +%{_libdir}/pkgconfig/*.pc %{_libdir}/*.so %changelog diff --git a/wm-linking.patch b/wm-linking.patch deleted file mode 100644 index 0087ca9..0000000 --- a/wm-linking.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- WPrefs.app/Makefile.am.orig -+++ WPrefs.app/Makefile.am -@@ -55,5 +55,6 @@ WPrefs_LDADD = \ - $(top_builddir)/WINGs/libWUtil.la\ - $(top_builddir)/wrlib/libwraster.la \ - @XFTLIBS@ \ -- @INTLIBS@ -+ @INTLIBS@ \ -+ -lfontconfig -