From 044a2675b2ca5e02d18575fa8eff2de8834e18c380321f04e96260bf2d200804 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Tue, 12 Jun 2012 07:19:20 +0000 Subject: [PATCH] Accepting request 122558 from home:computersalat:devel:X11wm update to 0.95.3 OBS-URL: https://build.opensuse.org/request/show/122558 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=17 --- WindowMaker-0.95.2.tar.bz2 | 3 -- WindowMaker-0.95.3.tar.bz2 | 3 ++ WindowMaker-config.patch | 66 ++++++++++++++------------------------ WindowMaker-menu.patch | 47 ++++++++------------------- WindowMaker.changes | 9 ++++++ WindowMaker.spec | 7 ++-- 6 files changed, 53 insertions(+), 82 deletions(-) delete mode 100644 WindowMaker-0.95.2.tar.bz2 create mode 100644 WindowMaker-0.95.3.tar.bz2 diff --git a/WindowMaker-0.95.2.tar.bz2 b/WindowMaker-0.95.2.tar.bz2 deleted file mode 100644 index fb9b3d4..0000000 --- a/WindowMaker-0.95.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65b5dee5d87103292fd6afc039a81ed3287e4a545d149a33a50b303a9a9cc94b -size 2190825 diff --git a/WindowMaker-0.95.3.tar.bz2 b/WindowMaker-0.95.3.tar.bz2 new file mode 100644 index 0000000..784ac14 --- /dev/null +++ b/WindowMaker-0.95.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b239e2531b7509cdebe0162e3c2f6fc8ca9c6bbef00e1bf7eb6e3e9aaf95a329 +size 2207148 diff --git a/WindowMaker-config.patch b/WindowMaker-config.patch index ae46dfe..1835691 100644 --- a/WindowMaker-config.patch +++ b/WindowMaker-config.patch @@ -9,25 +9,7 @@ Index: WindowMaker/Defaults/WindowMaker.in PopupSwitchMenu = NO; MenuStyle = normal; DisableMiniwindows = NO; -@@ -12,6 +13,8 @@ - "~/GNUstep/Library/Icons", - "#pkgdatadir#/Icons", - "#pkgdatadir#/Pixmaps", -+ "/usr/X11R6/share/icons/png/hicolor/all", -+ "/usr/X11R6/share/icons/png/locolor/all", - "/usr/X11R6/include/X11/pixmaps", - "~/GNUstep/Library/WindowMaker/Pixmaps", - "/usr/share/icons", -@@ -23,6 +26,8 @@ - "~/GNUstep/Library/WindowMaker/Backgrounds", - "#pkgdatadir#/Pixmaps", - "#pkgdatadir#/Backgrounds", -+ "/usr/X11R6/share/icons/png/hicolor/all", -+ "/usr/X11R6/share/icons/png/locolor/all", - "/usr/X11R6/include/X11/pixmaps", - "/usr/local/share/pixmaps", - "/usr/share/pixmaps" -@@ -31,7 +36,7 @@ +@@ -31,7 +32,7 @@ IconSize = 64; FocusMode = manual; DisableWSMouseActions = NO; @@ -58,7 +40,7 @@ Index: dockit +# DO NOT EDIT BELOW THIS LINE # +############################### +global xprop; -+global instance;set instance "" ++global instance;set instance "" +global class;set class "" +global command; set command "" +global Version;set Version V1.2 @@ -75,7 +57,7 @@ Index: dockit + wm group .dockit .dockit + wm command .dockit "$argv0 $argv" + wm iconname .dockit "Dockit ${Version}" -+ wm protocol .dockit WM_DELETE_WINDOW {exit} ++ wm protocol .dockit WM_DELETE_WINDOW {exit} + wm focusmodel .dockit passive + wm title .dockit "Dockit ${Version}" + wm geometry .dockit 309x157+440+412 @@ -87,18 +69,18 @@ Index: dockit + + label .dockit.msgbar \ + -anchor nw -borderwidth 1 -justify left -relief raised \ -+ -text "" ++ -text "" + label .dockit.instlbl \ -+ -borderwidth 1 -relief raised -text Instance ++ -borderwidth 1 -relief raised -text Instance + label .dockit.cllbl \ -+ -borderwidth 1 -relief raised -text Class ++ -borderwidth 1 -relief raised -text Class + label .dockit.comlbl \ -+ -borderwidth 1 -relief raised -text Command ++ -borderwidth 1 -relief raised -text Command + entry .dockit.instent -textvariable instance + entry .dockit.clent -textvariable class + entry .dockit.coment -textvariable command + button .dockit.create \ -+ -padx 9 -pady 3 -text {Create Icon} -command {docreate} ++ -padx 9 -pady 3 -text {Create Icon} -command {docreate} + button .dockit.exit \ + -padx 9 -pady 3 -text Quit -command exit + button .dockit.grab \ @@ -109,27 +91,27 @@ Index: dockit + # SETTING GEOMETRY + ################### + place .dockit.msgbar \ -+ -x 5 -y 120 -width 296 -height 33 -anchor nw -bordermode ignore ++ -x 5 -y 120 -width 296 -height 33 -anchor nw -bordermode ignore + place .dockit.instlbl \ -+ -x 5 -y 5 -width 76 -height 23 -anchor nw -bordermode ignore ++ -x 5 -y 5 -width 76 -height 23 -anchor nw -bordermode ignore + place .dockit.cllbl \ -+ -x 5 -y 30 -width 76 -height 23 -anchor nw -bordermode ignore ++ -x 5 -y 30 -width 76 -height 23 -anchor nw -bordermode ignore + place .dockit.comlbl \ -+ -x 5 -y 55 -width 76 -height 23 -anchor nw -bordermode ignore ++ -x 5 -y 55 -width 76 -height 23 -anchor nw -bordermode ignore + place .dockit.instent \ -+ -x 85 -y 5 -width 216 -height 22 -anchor nw -bordermode ignore ++ -x 85 -y 5 -width 216 -height 22 -anchor nw -bordermode ignore + place .dockit.clent \ -+ -x 85 -y 30 -width 216 -height 22 -anchor nw -bordermode ignore ++ -x 85 -y 30 -width 216 -height 22 -anchor nw -bordermode ignore + place .dockit.coment \ -+ -x 85 -y 55 -width 216 -height 22 -anchor nw -bordermode ignore ++ -x 85 -y 55 -width 216 -height 22 -anchor nw -bordermode ignore + place .dockit.create \ -+ -x 5 -y 80 -width 77 -height 36 -anchor nw -bordermode ignore ++ -x 5 -y 80 -width 77 -height 36 -anchor nw -bordermode ignore + place .dockit.exit \ -+ -x 230 -y 80 -width 72 -height 36 -anchor nw -bordermode ignore ++ -x 230 -y 80 -width 72 -height 36 -anchor nw -bordermode ignore + place .dockit.grab \ -+ -x 80 -y 80 -width 77 -height 36 -anchor nw -bordermode ignore ++ -x 80 -y 80 -width 77 -height 36 -anchor nw -bordermode ignore + place .dockit.help \ -+ -x 155 -y 80 -width 77 -height 36 -anchor nw -bordermode ignore ++ -x 155 -y 80 -width 77 -height 36 -anchor nw -bordermode ignore +############ +# Bindings # +############ @@ -150,7 +132,7 @@ Index: dockit + bind .dockit.exit {message "Exit Dockit!"} + bind .dockit.help {message "Help with creating AppIcons, +and for these commands."} -+ bind .dockit.grab {message "Grab AppInfo from a running App."} ++ bind .dockit.grab {message "Grab AppInfo from a running App."} + + +################### @@ -218,11 +200,11 @@ Index: dockit + It's instance is 'Navigator' + A work-around to this limitation, is to double-define your App + settings. (ex:'navigator', and 'Navigator') -+ ++ + +Error: couldn't execute "xprop": no such file or directory + -+ This means that /usr/X11R6/bin (or its equivilent) ++ This means that /usr/X11R6/bin (or its equivilent) + is not defined in your path. + You must add this to your path. + @@ -258,9 +240,9 @@ Index: dockit + wm title .userhelp "Dockit ${Version}: HELP" + label .userhelp.text \ + -anchor nw -justify left -borderwidth 1 \ -+ -text $HLPTXT ++ -text $HLPTXT + place .userhelp.text \ -+ -x 0 -y 0 -anchor nw -bordermode ignore ++ -x 0 -y 0 -anchor nw -bordermode ignore + + + diff --git a/WindowMaker-menu.patch b/WindowMaker-menu.patch index bac5de0..b5e7b97 100644 --- a/WindowMaker-menu.patch +++ b/WindowMaker-menu.patch @@ -1213,16 +1213,16 @@ Index: WindowMaker/menu.hu "Munkafelület" MENU "Elrejtés" HIDE_OTHERS "Mindent mutat" SHOW_ALL -@@ -204,14 +152,12 @@ +@@ -204,14 +152,13 @@ "Háttér" END "Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)" "Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)" -- "Konfiguráló program" EXEC /usr/X11R6/bin/WPrefs +- "Konfiguráló program" EXEC /usr/bin/WPrefs + "Konfiguráló program" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs "Megjelenés" 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" "Kilépés" MENU "Újraindítás" RESTART - "BlackBox indítása" RESTART blackbox @@ -2783,31 +2783,11 @@ Index: WindowMaker/plmenu.de ("Arbeitsfläche", ("Andere verbergen", HIDE_OTHERS), ("Alle zeigen", SHOW_ALL), -@@ -66,9 +16,9 @@ - ("Gespeicherte Sitzung löschen", CLEAR_SESSION) - ), - ("Erscheinungsbild", -- ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes /home/mawa/GNUstep/Library/WindowMaker/Themes WITH setstyle"), -- ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles /home/mawa/GNUstep/Library/WindowMaker/Styles WITH setstyle"), -- ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets /home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"), -+ ("Themen", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"), -+ ("Stile", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"), -+ ("Iconsätze", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"), - ("Hintergrund", - ("Einfarbig", - ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"), -@@ -90,16 +40,16 @@ - ("Grau schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), - ("Weinfarben schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") - ), -- ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds /home/mawa/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") -+ ("Bilder", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") +@@ -94,12 +44,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)\"") - ), -+ ("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"), @@ -3496,9 +3476,9 @@ Index: WindowMaker/plmenu.it ("Cancella Sessione salvata", CLEAR_SESSION) ), ("Visualizzazione", -- ("Temi", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), -- ("Stili", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), -- ("Set di Icone", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"), +- ("Temi", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), +- ("Stili", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), +- ("Set di Icone", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"), + ("Temi", OPEN_MENU, "-noext #wmdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"), + ("Stili", OPEN_MENU, "-noext #wmdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"), + ("Set di Icone", OPEN_MENU, "-noext #wmdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"), @@ -3509,7 +3489,7 @@ Index: WindowMaker/plmenu.it ("Sfumature Grigie", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"), ("Sfumature Vinaccia", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'") ), -- ("Immagini", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") +- ("Immagini", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") + ("Immagini", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t") ), ("Salva il tema", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""), @@ -3525,9 +3505,8 @@ Index: WindowMaker/plmenu.it - ("Avvia BlackBox", RESTART, blackbox), - ("Avvia kwm", RESTART, kwm), - ("Avvia IceWM", RESTART, icewm), -- ("Esci...", EXIT), + ("Esci...", EXIT), - ("Uccidi sessione...", SHUTDOWN) -+ ("Esci...", EXIT) ) ) Index: WindowMaker/plmenu.ja diff --git a/WindowMaker.changes b/WindowMaker.changes index 2a89f90..171f76e 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri May 25 08:44:59 UTC 2012 - chris@computersalat.de + +- update to 0.95.3 + * no up-to-date ChangeLog available + see http://repo.or.cz/w/wmaker-crm.git/shortlog +- rebase patches + * config, menu + ------------------------------------------------------------------- Fri Feb 17 23:01:00 UTC 2012 - chris@computersalat.de diff --git a/WindowMaker.spec b/WindowMaker.spec index 731edc0..11adc96 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -16,12 +16,11 @@ # - Name: WindowMaker Summary: A Colorful and Flexible Window Manager License: GPL-2.0+ ; LGPL-2.1+ ; SUSE-Public-Domain Group: System/GUI/Other -Version: 0.95.2 +Version: 0.95.3 Release: 0 Url: http://windowmaker.org/ Source: http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.bz2 @@ -48,8 +47,8 @@ BuildRequires: libXft-devel %endif BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -Provides: wmaker Provides: windowmanager +Provides: wmaker Requires: xdg-menu %description @@ -100,6 +99,7 @@ rename no nb po/no.* # --------------------------------------------------------------------------- %build +./autogen.sh #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" @@ -166,6 +166,7 @@ cd .. /usr/bin/* %{_libdir}/*.so.* %{_mandir}/man1/* +%{_mandir}/man8/* /usr/share/WINGs /usr/share/%{name} /usr/share/xsessions/*