diff --git a/Window-Maker-5a2507602c48.tar.bz2 b/Window-Maker-5a2507602c48.tar.bz2 new file mode 100644 index 0000000..7ca7f5e --- /dev/null +++ b/Window-Maker-5a2507602c48.tar.bz2 @@ -0,0 +1,3 @@ +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 index 8f57d8c..210838b 100644 --- a/WindowMaker-0.92.0-printf.diff +++ b/WindowMaker-0.92.0-printf.diff @@ -1,6 +1,6 @@ --- src/misc.c +++ src/misc.c -@@ -733,7 +733,7 @@ +@@ -696,7 +696,7 @@ olen = len+1; out = malloc(olen); if (!out) { @@ -9,7 +9,7 @@ return NULL; } *out = 0; -@@ -821,7 +821,8 @@ +@@ -785,7 +785,8 @@ olen += slen; nout = realloc(out,olen); if (!nout) { @@ -19,7 +19,7 @@ goto error; } out = nout; -@@ -871,7 +872,8 @@ +@@ -835,7 +836,8 @@ olen += slen; nout = realloc(out,olen); if (!nout) { diff --git a/WindowMaker-0.92.0.tar.bz2 b/WindowMaker-0.92.0.tar.bz2 deleted file mode 100644 index c2df6b8..0000000 --- a/WindowMaker-0.92.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b431ce9f47c5d4cd52ab5b8298cff56fd5700d6e6052b149e19b6c567e526db1 -size 2202748 diff --git a/WindowMaker-composite.patch b/WindowMaker-composite.patch index c2fbef9..9ecdc7b 100644 --- a/WindowMaker-composite.patch +++ b/WindowMaker-composite.patch @@ -1,6 +1,6 @@ --- src/main.c +++ src/main.c -@@ -835,6 +835,17 @@ +@@ -747,6 +747,17 @@ exit(1); } diff --git a/WindowMaker-crash.patch b/WindowMaker-crash.patch index 83ccdd2..0b2fd31 100644 --- a/WindowMaker-crash.patch +++ b/WindowMaker-crash.patch @@ -1,6 +1,6 @@ --- src/misc.c +++ src/misc.c -@@ -1141,7 +1141,7 @@ +@@ -1105,7 +1105,7 @@ len = (msg ? strlen(msg) : 0) + (workspace >=0 ? 4 : 0) + 1 ; buffer = wmalloc(len+5); diff --git a/WindowMaker-de_translation.patch b/WindowMaker-de_translation.patch index c96f771..8d19e48 100644 --- a/WindowMaker-de_translation.patch +++ b/WindowMaker-de_translation.patch @@ -1,11 +1,11 @@ --- po/de.po +++ po/de.po -@@ -70,7 +70,7 @@ - #: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248 +@@ -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:519 ../src/dock.c:3501 + #: ../src/appicon.c:508 ../src/dock.c:3511 msgid "Unhide" diff --git a/WindowMaker-exec.patch b/WindowMaker-exec.patch deleted file mode 100644 index c21f8b2..0000000 --- a/WindowMaker-exec.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- src/dock.c -+++ src/dock.c -@@ -3002,6 +3002,8 @@ - args[i] = argv[i]; - } - args[argc] = NULL; -+ for(i = 3; i < 1024; i++) -+ close(i); - execvp(argv[0], args); - exit(111); - } ---- src/main.c -+++ src/main.c -@@ -302,12 +302,16 @@ - pid = fork(); - - if (pid==0) { -+ int i; - - SetupEnvironment(scr); - - #ifdef HAVE_SETSID - setsid(); - #endif -+ for(i = 3; i < 1024; i++) -+ close(i); -+ - execl(shell, shell, "-c", command, NULL); - wsyserror("could not execute %s -c %s", shell, command); - Exit(-1); -@@ -337,6 +341,7 @@ - int in_fd[2]; - int out_fd[2]; - int err_fd[2]; -+ int i; - pid_t pid; - - SetupEnvironment(scr); -@@ -389,7 +394,9 @@ - close(in_fd[1]); - close(out_fd[1]); - close(err_fd[1]); -- -+ -+ for(i = 3; i < 1024; i++) -+ close(i); - execl("/bin/sh", "/bin/sh", "-c", wPreferences.logger_shell, NULL); - wsyserror("could not execute %s\n", wPreferences.logger_shell); - exit(1); ---- src/session.c -+++ src/session.c -@@ -398,6 +398,10 @@ - args[i] = argv[i]; - } - args[argc] = NULL; -+ -+ for(i = 3; i < 1024; i++) -+ close(i); -+ - execvp(argv[0], args); - exit(111); - } diff --git a/WindowMaker-fullscreen.patch b/WindowMaker-fullscreen.patch deleted file mode 100644 index 1225912..0000000 --- a/WindowMaker-fullscreen.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/event.c -+++ src/event.c -@@ -559,6 +559,10 @@ - wwin->flags.skip_next_animation = 1; - wIconifyWindow(wwin); - } -+ if (wwin->flags.fullscreen) { -+ wwin->flags.fullscreen = 0; -+ wFullscreenWindow(wwin); -+ } - if (wwin->flags.hidden) { - WApplication *wapp = wApplicationOf(wwin->main_window); - diff --git a/WindowMaker-menu.patch b/WindowMaker-menu.patch index a5635eb..cc1ae0f 100644 --- a/WindowMaker-menu.patch +++ b/WindowMaker-menu.patch @@ -9,7 +9,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 @@ -138,85 +138,87 @@ --- WindowMaker/menu.bg +++ WindowMaker/menu.bg @@ -115,61 +115,10 @@ - "Инфо" MENU - "Информационен панел..." INFO_PANEL - "Лицензионен панел..." LEGAL_PANEL -- "Системна конзола" EXEC xconsole -- "Натоварване на системата" SHEXEC xosview || xload -- "Списък процеси" EXEC xterm -e top -- "Ръководства" EXEC xman - "Инфо" END - "Стартирай..." SHEXEC %a(Run,Въведете команда, която да се стартира:) - "XTerm" EXEC xterm -sb -- "Rxvt" EXEC rxvt -bg black -fg white -fn fixed - "Работни места" WORKSPACE_MENU -- "Приложения" MENU -- "Графични" MENU -- "Gimp" SHEXEC gimp >/dev/null -- "XV" EXEC xv -- "XPaint" EXEC xpaint -- "XFig" EXEC xfig -- "Графични" END -- "X File Manager" EXEC xfm -- "OffiX Files" EXEC files -- "LyX" EXEC lyx -- "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 -- "Приложения" END -- "Редактори" MENU -- "XFte" EXEC xfte -- "XEmacs" SHEXEC xemacs || emacs -- "XJed" EXEC xjed -- "NEdit" EXEC nedit -- "Xedit" EXEC xedit -- "VI" EXEC xterm -e vi -- "Редактори" END -- "Разни" MENU -- "Xmcd" SHEXEC xmcd 2> /dev/null -- "Xplaycd" EXEC xplaycd -- "Xmixer" EXEC xmixer -- "Разни" END -- "Инструменти" MENU -- "Калкукатор" EXEC xcalc -- "Свойства на прозореца" SHEXEC xprop | xmessage -center -title 'xprop' -file - -- "Избор на шрифт" EXEC xfontsel -- "Емулатор на терминал" EXEC xminicom -- "Лупа" EXEC xmag -- "Цветова палитра" EXEC xcmap -- "XKill" EXEC xkill -- "Clipboard" EXEC xclipboard -- "Инструменти" END -- -- "Избор" MENU -- "Copy" SHEXEC echo '%s' | wxcopy -- "Mail To" EXEC xterm -name mail -T "Pine" -e pine %s -- "Navigate" EXEC netscape %s -- "Search in Manual" SHEXEC MANUAL_SEARCH(%s) -- "Избор" END -- - "Работно място" MENU - "Скрий другите" HIDE_OTHERS - "Покажи всички" SHOW_ALL + "Инфо" MENU + "Информационен панел..." INFO_PANEL + "Лицензионен панел..." LEGAL_PANEL +- "Системна конзола" EXEC xconsole +- "Натоварване на системата" SHEXEC xosview || xload +- "Списък процеси" EXEC xterm -e top +- "Ръководства" EXEC xman + "Инфо" END +- "Стартирай..." SHEXEC %A(Run,Въведете команда, която да се стартира:) ++ "Стартирай..." SHEXEC %a(Run,Въведете команда, която да се стартира:) + "XTerm" EXEC xterm -sb +- "Rxvt" EXEC rxvt -bg black -fg white -fn fixed + "Работни места" WORKSPACE_MENU +- "Приложения" MENU +- "Графични" MENU +- "Gimp" SHEXEC gimp >/dev/null +- "XV" EXEC xv +- "XPaint" EXEC xpaint +- "XFig" EXEC xfig +- "Графични" END +- "X File Manager" EXEC xfm +- "OffiX Files" EXEC files +- "LyX" EXEC lyx +- "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 +- "Приложения" END +- "Редактори" MENU +- "XFte" EXEC xfte +- "XEmacs" SHEXEC xemacs || emacs +- "XJed" EXEC xjed +- "NEdit" EXEC nedit +- "Xedit" EXEC xedit +- "VI" EXEC xterm -e vi +- "Редактори" END +- "Разни" MENU +- "Xmcd" SHEXEC xmcd 2> /dev/null +- "Xplaycd" EXEC xplaycd +- "Xmixer" EXEC xmixer +- "Разни" END +- "Инструменти" MENU +- "Калкукатор" EXEC xcalc +- "Свойства на прозореца" SHEXEC xprop | xmessage -center -title 'xprop' -file - +- "Избор на шрифт" EXEC xfontsel +- "Емулатор на терминал" EXEC xminicom +- "Лупа" EXEC xmag +- "Цветова палитра" EXEC xcmap +- "XKill" EXEC xkill +- "Clipboard" EXEC xclipboard +- "Инструменти" END +- +- "Избор" MENU +- "Copy" SHEXEC echo '%s' | wxcopy +- "Mail To" EXEC xterm -name mail -T "Pine" -e pine %s +- "Navigate" EXEC netscape %s +- "Search in Manual" SHEXEC MANUAL_SEARCH(%s) +- "Избор" END +- + "Работно място" MENU + "Скрий другите" HIDE_OTHERS + "Покажи всички" SHOW_ALL @@ -209,14 +158,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:)" -- "Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs -+ "Пособие за настройки" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs - "Изглед" END -- + "Фон" 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:)" +- "Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/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" - "Изход" MENU - "Рестартиране" RESTART -- "Стартирай BlackBox" RESTART blackbox -- "Стартирай kwm" RESTART kwm -- "Стартирай IceWM" RESTART icewm - "Изход..." EXIT - "Изход" END - "Приложения" END + "Изход" MENU + "Рестартиране" RESTART +- "Стартирай BlackBox" RESTART blackbox +- "Стартирай kwm" RESTART kwm +- "Стартирай IceWM" RESTART icewm + "Изход..." EXIT + "Изход" END +-"Приложения" END ++"Приложения" END \ No newline at end of file --- WindowMaker/menu.ca +++ WindowMaker/menu.ca @@ -2259,135 +2261,94 @@ --- 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:)"), -- ("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") -- ), -- ("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\")'") -- ), -- ("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\")'") -- ), -- ("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) -- ) --) -+("Applications", -+ ("Info", -+ ("Info Panel", INFO_PANEL), + ("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"), -+ ("Workspaces", WORKSPACE_MENU), -+ ("Commands", -+ ("Hide Others", HIDE_OTHERS), -+ ("Show All", SHOW_ALL), -+ ("Arrange Icons", ARRANGE_ICONS), -+ ("Refresh", REFRESH), + ("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", + ("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\")'"), @@ -2397,7 +2358,16 @@ + ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"), + ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'") + ), -+ ("Gradient", + ("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\")'"), @@ -2407,8 +2377,20 @@ + ("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") -+ ), + ("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") @@ -2419,89 +2401,91 @@ + ("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") + ("Приложения", + ("Инфо", + ("Информационен панел...", 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), + ), +- ("Стартирай...", 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") - ), + ), + ("Запази темата", 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) - ) - ) + ("Изход", + ("Рестартиране", RESTART), +- ("Стартирай BlackBox", RESTART, blackbox), +- ("Стартирай kwm", RESTART, kwm), +- ("Стартирай IceWM", RESTART, icewm), + ("Изход...", EXIT) + ) +-) ++) \ No newline at end of file --- WindowMaker/plmenu.cs +++ WindowMaker/plmenu.cs @@ -3023,7 +3007,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), @@ -3722,7 +3706,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), diff --git a/WindowMaker-nb-locale.patch b/WindowMaker-nb-locale.patch index 0aa5d6e..cc1e7b7 100644 --- a/WindowMaker-nb-locale.patch +++ b/WindowMaker-nb-locale.patch @@ -1,6 +1,6 @@ --- configure.ac +++ configure.ac -@@ -281,7 +281,7 @@ +@@ -292,7 +292,7 @@ dnl List of supported locales dnl ------------------------- diff --git a/WindowMaker-null.patch b/WindowMaker-null.patch index b7f53f1..a02176d 100644 --- a/WindowMaker-null.patch +++ b/WindowMaker-null.patch @@ -1,6 +1,6 @@ ---- WindowMaker-0.92.0/WINGs/wfontpanel.c -+++ WindowMaker-0.92.0/WINGs/wfontpanel.c -@@ -584,7 +584,7 @@ +--- Window-Maker-5a2507602c48/WINGs/wfontpanel.c ++++ Window-Maker-5a2507602c48/WINGs/wfontpanel.c +@@ -585,7 +585,7 @@ int i; pat = FcPatternCreate(); diff --git a/WindowMaker-refcount.patch b/WindowMaker-refcount.patch deleted file mode 100644 index fb408e9..0000000 --- a/WindowMaker-refcount.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -r -N -u WindowMaker-0.92.0-orig/src/switchpanel.c WindowMaker-0.92.0/src/switchpanel.c ---- WindowMaker-0.92.0-orig/src/switchpanel.c 2004-10-30 09:16:04.000000000 +0200 -+++ WindowMaker-0.92.0/src/switchpanel.c 2005-09-01 14:28:14.000000000 +0200 -@@ -501,6 +501,7 @@ - - if (!panel->bg) { - WMFrame *frame = WMCreateFrame(panel->win); -+ WMColor *darkGray = WMDarkGrayColor(scr->wmscreen); - WMSetFrameRelief(frame, WRSimple); - WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0); - -@@ -508,10 +509,11 @@ - WMResizeWidget(panel->label, width, LABEL_HEIGHT); - WMMoveWidget(panel->label, BORDER_SPACE, BORDER_SPACE+ICON_TILE_SIZE+5); - WMSetLabelRelief(panel->label, WRSimple); -- WMSetWidgetBackgroundColor(panel->label, WMDarkGrayColor(scr->wmscreen)); -+ WMSetWidgetBackgroundColor(panel->label, darkGray); - WMSetLabelFont(panel->label, panel->font); - WMSetLabelTextColor(panel->label, panel->white); - -+ WMReleaseColor(darkGray); - height+= 5; - } - -@@ -604,6 +606,8 @@ - RReleaseImage(panel->bg); - if (panel->font) - WMReleaseFont(panel->font); -+ if (panel->white) -+ WMReleaseColor(panel->white); - wfree(panel); - } - -diff -r -N -u WindowMaker-0.92.0-orig/WINGs/wview.c WindowMaker-0.92.0/WINGs/wview.c ---- WindowMaker-0.92.0-orig/WINGs/wview.c 2004-10-28 04:41:04.000000000 +0200 -+++ WindowMaker-0.92.0/WINGs/wview.c 2005-09-01 14:02:33.000000000 +0200 -@@ -450,6 +450,9 @@ - - W_FreeViewXdndPart(view); - -+ if (view->backColor) -+ WMReleaseColor(view->backColor); -+ - wfree(view); - } - - diff --git a/WindowMaker-warnings.patch b/WindowMaker-warnings.patch index 39dc27a..656dd6b 100644 --- a/WindowMaker-warnings.patch +++ b/WindowMaker-warnings.patch @@ -28,19 +28,9 @@ char* wfindfile(char *paths, char *file); ---- WINGs/dragsource.c -+++ WINGs/dragsource.c -@@ -448,6 +448,7 @@ - XDND_TIMESTAMP(info), - XDND_SOURCE_ACTION(info)); - } -+ return True; - } else { - /* send position on each move */ - return sendDnDClientMessage(info, scr->xdndPositionAtom, --- WINGs/wcolorpanel.c +++ WINGs/wcolorpanel.c -@@ -1247,7 +1247,7 @@ +@@ -1239,7 +1239,7 @@ } if (!(dPtr = opendir(panel->configurationPath))) { @@ -49,25 +39,7 @@ return; } -@@ -1283,7 +1283,7 @@ - WMListItem *item; - - if (stat(RGBTXT, &stat_buf) != 0) { -- wsyserror(_("Color Panel: Could not find file"), " %s", RGBTXT); -+ wsyserror(_("Color Panel: Could not find file %s"), RGBTXT); - return; - } - else { -@@ -1301,7 +1301,7 @@ - fclose(rgbtxt); - } - else { -- wsyserror(_("Color Panel: Could not find file"), "%s", RGBTXT); -+ wsyserror(_("Color Panel: Could not find file %s"), RGBTXT); - } - } - } -@@ -3746,6 +3746,7 @@ +@@ -3715,6 +3715,7 @@ color.red = 0; color.green = 0; color.blue = 0; @@ -75,7 +47,7 @@ return color; } -@@ -3755,6 +3756,7 @@ +@@ -3724,6 +3725,7 @@ color.red = xcolor->red >> 8; color.green = xcolor->green >> 8; color.blue = xcolor->blue >> 8; @@ -93,16 +65,17 @@ #include #include #include ---- src/startup.c -+++ src/startup.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#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 @@ diff --git a/WindowMaker-wmspec.c-findBestIcon.patch b/WindowMaker-wmspec.c-findBestIcon.patch index acb9006..37384b3 100644 --- a/WindowMaker-wmspec.c-findBestIcon.patch +++ b/WindowMaker-wmspec.c-findBestIcon.patch @@ -1,6 +1,6 @@ --- src/wmspec.c +++ src/wmspec.c -@@ -401,7 +401,7 @@ +@@ -402,7 +402,7 @@ * results in better overall aesthetics -Dan */ wanted = wPreferences.icon_size * wPreferences.icon_size; diff --git a/WindowMaker-wmspec.c-icon.patch b/WindowMaker-wmspec.c-icon.patch deleted file mode 100644 index d3ca963..0000000 --- a/WindowMaker-wmspec.c-icon.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- WINGs/wwindow.c -+++ WINGs/wwindow.c -@@ -254,14 +254,14 @@ - setMiniwindow(WMWindow *win, RImage *image) - { - WMScreen *scr= win->view->screen; -- CARD32 *data; -+ long *data; - int x, y; - int o; - - if (!image) - return; - -- data = wmalloc((image->width * image->height + 2) * sizeof(CARD32)); -+ data = wmalloc((image->width * image->height + 2) * sizeof(long)); - - o= 0; - data[o++] = image->width; ---- src/wmspec.c -+++ src/wmspec.c -@@ -389,12 +389,12 @@ - * - * The logic can also be changed to accept bigger images and scale them down. - */ --static CARD32* --findBestIcon(CARD32 *data, unsigned long items) -+static unsigned long* -+findBestIcon(unsigned long *data, unsigned long items) - { - int size, wanted, d, distance; - unsigned long i; -- CARD32 *icon; -+ unsigned long *icon; - - /* better use only 75% of icon_size. For 64x64 this means 48x48 - * This leaves room around the icon for the miniwindow title and -@@ -418,7 +418,7 @@ - - - static RImage* --makeRImageFromARGBData(CARD32 *data) -+makeRImageFromARGBData(unsigned long *data) - { - int size, width, height, i; - RImage *image; -@@ -449,7 +449,7 @@ - static void - updateIconImage(WScreen *scr, WWindow *wwin) - { -- CARD32 *property, *data; -+ unsigned long *property, *data; - unsigned long items, rest; - Atom type; - int format; diff --git a/WindowMaker-wmspec.c.patch b/WindowMaker-wmspec.c.patch deleted file mode 100644 index 7114339..0000000 --- a/WindowMaker-wmspec.c.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- src/wmspec.c -+++ src/wmspec.c -@@ -322,15 +322,15 @@ - void - wNETWMUpdateDesktop(WScreen *scr) - { -- CARD32 *views, sizes[2]; -+ long *views, sizes[2]; - int count, i; - - if (scr->workspace_count==0) - return; - - count = scr->workspace_count * 2; -- views = wmalloc(sizeof(CARD32) * count); -- /*memset(views, 0, sizeof(CARD32) * count);*/ -+ views = wmalloc(sizeof(long) * count); -+ /*memset(views, 0, sizeof(long) * count);*/ - - #ifdef VIRTUAL_DESKTOP - sizes[0] = scr->workspaces[scr->current_workspace]->width; -@@ -370,7 +370,7 @@ - 0, 1, &count); - if (prop) - { -- int desktop= *(CARD32*)prop; -+ int desktop= *(long*)prop; - XFree(prop); - return desktop; - } -@@ -487,7 +487,7 @@ - static void - updateShowDesktop(WScreen * scr, Bool show) - { -- CARD32 foo; -+ long foo; - - foo = (show == True); - XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32, -@@ -660,7 +660,7 @@ - void - wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea) - { -- CARD32 *area; -+ long *area; - int count, i; - - /* XXX: not Xinerama compatible, -@@ -670,7 +670,7 @@ - return; - - count = scr->workspace_count * 4; -- area = wmalloc(sizeof(CARD32) * count); -+ area = wmalloc(sizeof(long) * count); - for (i=0; iworkspace_count; i++) { - area[4*i + 0] = usableArea.x1; - area[4*i + 1] = usableArea.y1; -@@ -793,7 +793,7 @@ - static void - updateWorkspaceCount(WScreen *scr) /* changeable */ - { -- CARD32 count; -+ long count; - - count = scr->workspace_count; - -@@ -805,7 +805,7 @@ - static void - updateCurrentWorkspace(WScreen *scr) /* changeable */ - { -- CARD32 count; -+ long count; - - count = scr->current_workspace; - -@@ -852,7 +852,7 @@ - static void - updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del) - { -- CARD32 l; -+ long l; - - if (del) { - XDeleteProperty(dpy, wwin->client_win, net_wm_desktop); diff --git a/WindowMaker.changes b/WindowMaker.changes index 423a5af..7457012 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -4,6 +4,11 @@ Mon Mar 30 03:31:24 CEST 2009 - crrodriguez@suse.de - remove static libwraster - remove la files +------------------------------------------------------------------- +Thu Feb 12 17:16:44 CET 2009 - nadvornik@suse.cz + +- updated to development snapshot + ------------------------------------------------------------------- Wed Feb 11 13:41:40 CET 2009 - coolo@suse.de diff --git a/WindowMaker.spec b/WindowMaker.spec index 4abc4be..86219ce 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -1,7 +1,7 @@ # # spec file for package WindowMaker (Version 0.92.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: WindowMaker BuildRequires: freetype2-devel gcc-c++ giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel -License: GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware +License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware Group: System/GUI/Other Url: http://www.windowmaker.info/ Obsoletes: wmaker @@ -29,8 +29,8 @@ Requires: xdg-menu AutoReqProv: on Summary: A Colorful and Flexible Window Manager Version: 0.92.0 -Release: 206 -Source: WindowMaker-%{version}.tar.bz2 +Release: 207 +Source: Window-Maker-5a2507602c48.tar.bz2 Source1: WindowMaker-extra-0.1.tar.bz2 Source2: SuSE-theme.tar.bz2 Source4: README.SuSE @@ -41,18 +41,13 @@ Patch1: WindowMaker-config.dif Patch2: WindowMaker-menu.patch Patch22: WindowMaker-warnings.patch Patch24: WindowMaker-nb-locale.patch -Patch25: WindowMaker-wmspec.c.patch Patch26: WindowMaker-null.patch Patch27: WindowMaker-de_translation.patch -Patch28: WindowMaker-wmspec.c-icon.patch Patch29: WindowMaker-asm.patch -Patch30: WindowMaker-fullscreen.patch Patch31: WindowMaker-MAX_WORKSPACENAME_WIDTH.patch Patch32: WindowMaker-0.92.0-printf.diff -Patch33: WindowMaker-refcount.patch Patch34: WindowMaker-crash.patch Patch35: WindowMaker-fonts.patch -Patch36: WindowMaker-exec.patch Patch37: WindowMaker-event.patch Patch38: WindowMaker-wmspec.c-findBestIcon.patch Patch39: WindowMaker-dir-specification.patch @@ -60,7 +55,7 @@ Patch40: WindowMaker-composite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel -License: GPL v2 or later +License: GPLv2+ Requires: %{name} = %{version} libtiff-devel libjpeg-devel xorg-x11-devel libpng-devel zlib-devel giflib-devel Summary: Includes and static libraries for Window Maker Group: Development/Libraries/X11 @@ -86,25 +81,20 @@ Authors: Alfredo K. Kojima %prep -%setup -q -n WindowMaker-%{version} -a 1 +%setup -q -n Window-Maker-5a2507602c48 -a 1 mkdir menu.orig cp WindowMaker/{menu.*,plmenu.*} menu.orig %patch1 %patch2 %patch22 %patch24 -%patch25 %patch26 -p1 %patch27 -%patch28 -%patch29 -%patch30 +#patch29 %patch31 %patch32 -%patch33 -p1 %patch34 %patch35 -%patch36 %patch37 %patch38 %patch39 @@ -149,6 +139,7 @@ find $RPM_BUILD_ROOT/usr/share/WindowMaker/Themes -type d -exec chmod 755 {} \; #---------------------------------------------------------------------- # not packaged rm -f $RPM_BUILD_ROOT/%{_mandir}/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/ @@ -157,7 +148,6 @@ cd .. %find_lang %{name} %find_lang WINGs %{name}.lang %find_lang WPrefs %{name}.lang -%{__rm} -fv %{buildroot}%{_libdir}/*.la %clean rm -rf "$RPM_BUILD_ROOT" @@ -188,347 +178,5 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/pkgconfig/*.pc %{_includedir}/* %{_libdir}/*.so -%{_libdir}/*.a %changelog -* Mon Mar 30 2009 crrodriguez@suse.de -- remove static libwraster -- remove la files -* Wed Feb 11 2009 coolo@suse.de -- ignore error about menu.orig - it's left for documentation -* Mon Oct 13 2008 nadvornik@suse.cz -- fixed composite extension usage [bnc#433808] -* Thu May 22 2008 pgajdos@suse.cz -- fixed "local variable used before set" [bnc#353376] -* Mon Apr 28 2008 ro@suse.de -- remove hermes-devel from buildreq -* Tue Mar 18 2008 nadvornik@suse.cz -- fixed a bug in findBestIcon [bnc#371974] -* Sun Mar 16 2008 crrodriguez@suse.de -- fix file-not-in-lang errors -* Wed Jan 23 2008 nadvornik@suse.cz -- fixed declaration of functions in event.c [#355254] -* Sat Mar 03 2007 aj@suse.de -- /usr/share/xsessions is now part of filesystem. -* Mon Oct 23 2006 nadvornik@suse.cz -- reverted previous change [#213889] -- added an offer to update the config files to start script -- documented the possibility of compatibility symlinks - in README.SuSE -* Mon Oct 16 2006 lnussel@suse.de -- add compatibility symlinks /usr/X11R6/GNUstep and - /usr/X11R6/share/WindowMaker as those directories are still - referenced in old config files -* Thu Aug 17 2006 nadvornik@suse.cz -- changed prefix /usr/X11R6 -> /usr -* Tue Mar 14 2006 nadvornik@suse.cz -- fixed the previous change -* Thu Mar 09 2006 anicka@suse.cz -- close file descriptors before exec [#155502] -* Wed Mar 08 2006 anicka@suse.cz -- change default fonts to work with all languages [#154758] -* Tue Jan 31 2006 nadvornik@suse.cz -- fixed invalid usage of snprintf [#117663] -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Mon Nov 28 2005 nadvornik@suse.cz -- fixed color reference counting [#119439] -* Fri Oct 14 2005 nadvornik@suse.cz -- fixed another missing return value warning -* Fri Oct 07 2005 mmj@suse.de -- fix wrong printf calls -* Mon Sep 12 2005 nadvornik@suse.cz -- increased MAX_WORKSPACENAME_WIDTH because ru.po - contains longer strings [#116475] -* Fri Jul 22 2005 nadvornik@suse.cz -- fixed fullscreen in OpenOffice.org presentations [#74375] -- fixed char comparison [#95091] -* Thu Jul 14 2005 nadvornik@suse.cz -- updated to 0.92.0: - * added support for X Input Methods - * improved hiding/unhiding animations to be quicker and do - less icon shuffling -* Thu May 12 2005 nadvornik@suse.cz -- fixed bug in WINGs that caused wmaker crash [#82768] -* Wed Apr 06 2005 nadvornik@suse.cz -- fixed to compile with gcc4 -- added gettext-devel to neededforbuild -* Tue Mar 22 2005 nadvornik@suse.cz -- fixed crash with KDE applications on 64bit archs [#74246] -- fixed german translation [#74254] -* Thu Feb 17 2005 nadvornik@suse.cz -- do not strip binaries -* Tue Feb 15 2005 nadvornik@suse.cz -- use the correct exec in desktop file -* Thu Feb 10 2005 adrian@suse.de -- add session desktop file -* Sat Feb 05 2005 meissner@suse.de -- fixed missing getenv prototype, added format attributes - and fixes found by the attributes. -* Wed Jan 26 2005 nadvornik@suse.cz -- fixed 64bit bug [#50203] -* Mon Jan 17 2005 ro@suse.de -- added c++ to neededforbuild (for libtiff) -* Wed Jan 05 2005 nadvornik@suse.cz -- updated to 0.91.0: - * NetWM support - * UTF-8 support included upstream - * antialiased text support included upstream -* Fri Oct 22 2004 nadvornik@suse.cz -- do not install locale files with codeset [#47262] -* Thu Oct 21 2004 ro@suse.de -- locale rename: no -> nb -* Sat Oct 02 2004 wimer@suse.de -- adding new bgs for 9.2 -* Thu Apr 29 2004 nadvornik@suse.cz -- fixed high CPU load on omnipresent windows [#38570] -* Mon Apr 19 2004 nadvornik@suse.cz -- fixed missing return values -* Mon Apr 05 2004 nadvornik@suse.cz -- updated SUSE theme [#30775] -* Tue Mar 30 2004 nadvornik@suse.cz -- more fixed widget sizes in WPrefs [#35915] -* Thu Mar 18 2004 nadvornik@suse.cz -- better handling of utf8 charset -- fixed widget sizes in WPrefs (some localized texts did not fit in) [#35915] -* Thu Mar 11 2004 nadvornik@suse.cz -- better handle invalid multibyte characters [#35247] -- added README.SuSE describing the problem -* Tue Feb 03 2004 nadvornik@suse.cz -- fixed temp file handling [#34078] -- run xdg_menu on startup to cache output -- compile with -fno-strict-aliasing -* Sat Jan 10 2004 adrian@suse.de -- add %%run_ldconfig -* Tue Sep 23 2003 nadvornik@suse.cz -- fixed changing background color with wmsetbg [#31567] -* Mon Sep 22 2003 nadvornik@suse.cz -- update old SUSE theme on startup, because images from the old - theme are no longer present -* Fri Sep 19 2003 nadvornik@suse.cz -- new SuSE theme [#30775] -* Fri Sep 12 2003 nadvornik@suse.cz -- fixed updating WMRootMenu on startup [#29508] -* Wed Sep 03 2003 nadvornik@suse.cz -- fixed workspace cycling problem [#29720] -- fixed broken exit dialog in de_DE locale [#29728] -* Mon Sep 01 2003 nadvornik@suse.cz -- fix SuSE menu location in WMRootMenu on startup -* Wed Aug 27 2003 nadvornik@suse.cz -- fixed focus bug [#29004] -- suse menu is cached -* Tue Aug 26 2003 ro@suse.de -- make sure iconv_menu_files is executable -* Mon Aug 25 2003 nadvornik@suse.cz -- added fix for focus flickering [#27175] -- moved config files to /etc/X11 -- use xdg-menu for SuSE menu -* Mon May 26 2003 ro@suse.de -- add pkgconfig files to devel subpackage -- remove not-packaged sk man-pages from buildroot -* Tue May 06 2003 mfabian@suse.de -- another improvment to wsetfont by Gerd Knorr : - make the font size easily configurable when using Xft by - adding a "--size" option to wsetfont. -* Tue May 06 2003 mfabian@suse.de -- update to current CVS (0.80.2.20030506) -- improve wsetfont to set AntialiasedText=YES/NO depending on - whether the font setup is for Xft or X11 core fonts (and remove - useless "WINGsConfiguration.antialiasedText = True;" from - WindowMaker-useMultiByte-useXft.patch). -- set size for "LargDisplayFont" to 24 pixel in wsetfont when - using Xft. -- add configure test to distinguish between Xft1 and Xft2 - and remove check for RENDER extension only when Xft2 is - available. -* Mon May 05 2003 mfabian@suse.de -- WindowMaker-wsetfont.patch: use "-*-" instead of "-xftdummy-" - in the foundry because the latest version of fontconfig now - actually uses the foundry and inserting an dummy value doesn't - work anymore. -- remove "fontconfig fontconfig-devel" from neededforbuild again - and replace xf86 by x-devel-packages -* Mon Apr 28 2003 mfabian@suse.de -- update to current CVS (0.80.2.20030428) -- improved wsetfont now included upstream -- add "fontconfig fontconfig-devel" to neededforbuild, - add config-dist.sh to remove this when building for SuSE 8.2. -- add option "--no-fonts" to setstyle when installing the - SuSE-theme in /usr/X11R6/bin/windowmaker to avoid overwriting - the font done by wsetfont. -* Wed Apr 23 2003 mfabian@suse.de -- update to current CVS (0.80.2.20030423) -- improve "wsetfont" to make it work on FreeBSD as well -- remove: WindowMaker-nls.patch, - WindowMaker-plmenu.zh_TW.Big5.patch (included upstream) -- remove Vladimir's WindowMaker-LocMenu.patch, a similar fix - is now included upstream -* Thu Apr 17 2003 mfabian@suse.de -- disable use of assembler mmx stuff because it makes WindowMaker - crash immediately. This assembler code was recently introduced - in CVS, but apparently it doesn't work yet. -* Wed Apr 16 2003 mfabian@suse.de -- update to current CVS (0.80.2.20030415) and adapt patches -- add "freetype2 freetype2-devel expat" to neededforbuild to enable - Xft. -- WindowMaker-useMultiByte-useXft.patch: enable Xft always - even when there is no RENDER extension, improve fallback font - settings, call "wsetfont --sans" in wmaker.inst to get reasonable - default font settings for Xft. -- WindowMaker-wsetfont.patch: extend to support useful font - settings for Xft. Also include Support for CP1251 - (Bulgarian and Belarussian) and ISO 8859-5 (Macedonian, - Cyrillic Serbian) by Anton Zinoviev -* Wed Mar 12 2003 nadvornik@suse.cz -- fixed bug in opening localized menu [#25144] -* Mon Mar 03 2003 nadvornik@suse.cz -- use GNUSTEP_USER_ROOT in windowmaker script [#24418] -* Fri Dec 20 2002 mfabian@suse.de -- update to 0.80.2 -- remove WindowMaker-overflow.patch (included upstream) -- remove obsolete configure option --enable-kanji -- add WindowMaker-fontmatching.patch to improve fontset guessing -- improve wsetfont: - add fontsets: latin9, turkish, efontuni, gnuuni, generic - add LargeDisplayFont to the lists of fontsets changed by wsetfont - improve behaviour of '--auto and --locale' switch by using - 'locale charmap' to find out which fontset is suitable. -- add iconv_menu_files script to generate UTF-8 encoded menu files -- fix syntax error in plmenu.zh_TW.Big5 -- patch plmenu.ja the same way the other plmenu.* files - are patched -* Tue Nov 12 2002 nadvornik@suse.cz -- fixed overflow in RCreateImage() -* Tue Jul 02 2002 nadvornik@suse.cz -- updated to 0.80.1: bugfix release -* Wed Apr 24 2002 nadvornik@suse.cz -- used macro %%{_lib} -* Fri Feb 22 2002 nadvornik@suse.cz -- fixed file permissions -* Fri Feb 22 2002 nadvornik@suse.cz -- replaced /home/mawa with $HOME in german menu -* Fri Feb 22 2002 adrian@suse.de -- add SuSE default theme by Ken -- change behaviour of LMB on background (menu instead of selection) -* Mon Feb 18 2002 nadvornik@suse.cz -- added bugfixes from CVS: - - fixed crash when setting "Emulate AppIcon" [bug #13380] - - fixed problem with saving session when shared appicon is enabled - - fixed focus related problems - - fixes for multihead systems -* Thu Feb 14 2002 nadvornik@suse.cz -- set MultiByteText to yes in WMGLOBAL -* Fri Feb 01 2002 ro@suse.de -- changed neededforbuild to -* Tue Jan 08 2002 nadvornik@suse.cz -- updated to 0.80.0 - - shared appicons between applications of the same class - - Dock/Clip can steal appicons of applications started by other - means (main menu, terminal) and attach them - - many bugs fixed -* Fri Nov 16 2001 nadvornik@suse.cz -- set MultiByteText to yes by default -* Mon Oct 08 2001 nadvornik@suse.cz -- updated to 0.70.0 - libPropList is no longer required - many bugs fixed -* Sun Sep 16 2001 mfabian@suse.de -- fix wsetfont script for Japanese and Korean -* Thu Jul 26 2001 nadvornik@suse.cz -- update to 0.65.1 -* Wed Jun 06 2001 nadvornik@suse.cz -- updated to 0.65.0 -- compiled with hermes -* Thu Apr 26 2001 nadvornik@suse.cz -- fixed problems with saving icons -* Tue Apr 24 2001 nadvornik@suse.cz -- fixed segfault in WPrefs -* Thu Apr 19 2001 nadvornik@suse.cz -- fixes for ia64 -* Fri Apr 06 2001 nadvornik@suse.cz -- better integration of menus generated by susewm -* Thu Mar 29 2001 nadvornik@suse.cz -- fixed bug in keyboard handling -- used RPM_OPT_FLAGS -* Tue Mar 13 2001 nadvornik@suse.cz -- created devel subpackage -* Mon Feb 26 2001 nadvornik@suse.cz -- update to 0.64.0 -* Fri Jan 26 2001 nadvornik@suse.cz -- update to 0.63.1 -* Fri Dec 15 2000 nadvornik@suse.cz -- added paths for package icons -* Thu Nov 23 2000 nadvornik@suse.cz -- added Provides: wmaker windowmanager -- removed Requires: wterm -* Wed Nov 15 2000 ro@suse.de -- fixed neededforbuild for libPropList -* Wed Nov 01 2000 egger@suse.de -- Updated specfile to new long packagenames. -- Reworked specfile. -- Probably needs some more work; I'm taking care of that. -* Tue Oct 10 2000 nadvornik@suse.cz -- fixed list of doc files -* Mon Oct 02 2000 nadvornik@suse.cz -- fixed start script -- used bzip2 -* Mon Aug 14 2000 nadvornik@suse.cz -- fixed bug in shutdown.c -* Fri Aug 11 2000 nadvornik@suse.cz -- fixed bug in menu.c -* Thu Jul 27 2000 nadvornik@suse.cz -- "EXEC SAVE_WORKSPACE" replaced with "SAVE_SESSION" in menu - (bug #3640) -* Tue May 09 2000 nadvornik@suse.cz -- update to 0.62.1 -* Wed May 03 2000 nadvornik@suse.cz -- build with i18n support -* Fri Apr 21 2000 nadvornik@suse.cz -- added BuildRoot -* Mon Apr 10 2000 bk@suse.de -- added suse update config macro -* Wed Mar 01 2000 choeger@suse.de -- added mandir -* Tue Feb 29 2000 choeger@suse.de -- added wterm to requires -* Mon Oct 25 1999 ro@suse.de -- switched to libungif -* Tue Oct 19 1999 choeger@suse.de -- new version, 0.61.1 -* Tue Sep 28 1999 choeger@suse.de -- added KDE-Support -* Thu Sep 23 1999 choeger@suse.de -- new version -* Mon Sep 20 1999 ro@suse.de -- added provides windowmanager -* Tue Sep 14 1999 ro@suse.de -- finally removed libproplist-files from filelist -* Mon Sep 13 1999 bs@suse.de -- ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu Aug 19 1999 choeger@suse.de -- removed proplist from source archives and - using the already present version of SuSE Dist. -* Fri Jul 16 1999 choeger@suse.de -- add script windowmaker -- changed wmaker.inst not to touch .xinitrc -* Tue Jul 06 1999 choeger@suse.de -- added GNOME-Support (--enable-gnome) -* Wed Apr 28 1999 choeger@suse.de -- new version 0.53.0 -* Tue Mar 23 1999 choeger@suse.de -- bugfix for spec-file (make clean in the Default-Config-Dir) -* Thu Mar 11 1999 choeger@suse.de -- new version 0.51.1 -* Tue Jan 19 1999 choeger@suse.de -- actual version 0.50.2 -* Mon Dec 21 1998 choeger@suse.de -- actual version 0.20.3 -* Thu Jul 09 1998 ro@suse.de -- removed doc/libproplist/COPYING.LIB (simply doesn't exist) -* Wed Jul 01 1998 maddin@suse.de -- first S.u.S.E. version 0.15.1 -- changed configure so it works right for libPropList -- moved documentation -- /usr/X11R6/lib/X11/WindowMaker used as wm's home -- made wrapper script for wmaker, called windowmaker so user's - files are updated correctly