Accepting request 259998 from home:k_mroz:branches:X11:windowmanagers

- Update to WindowMaker-0.95.6
  - Add: WindowMaker-0.95.6.tar.gz
  - Remove: WindowMaker-0.95.5.tar.gz
  - Update WindowMaker-menu.patch to reflect changed menu.nl in
    0.95.6.
  - Update fix_wmgenmenu_paths.patch as most changes are already
    present in 0.95.6.
  - Update wm-giflib.c to reflect code changes (ie. re-written
    wrlib/gif.c with wrlib/load_gif.c). Not clear if this patch
    is even needed, but keeping it around.

OBS-URL: https://build.opensuse.org/request/show/259998
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=32
This commit is contained in:
Philipp Seiler 2014-11-10 11:08:34 +00:00 committed by Git OBS Bridge
parent c6537913ce
commit e1cca6a9ce
7 changed files with 851 additions and 871 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
size 2927995

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4
size 3004856

View File

@ -1,6 +1,7 @@
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu WindowMaker-0.95.4/WindowMaker/menu
--- WindowMaker-0.95.4.old/WindowMaker/menu 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu 2014-04-10 06:40:00.508787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu
+++ WindowMaker-0.95.6/WindowMaker/menu
@@ -111,72 +111,18 @@
"Info" MENU
"Info Panel" INFO_PANEL
@ -136,9 +137,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu WindowMaker-0.95.4/WindowMake
"Applications" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.bg WindowMaker-0.95.4/WindowMaker/menu.bg
--- WindowMaker-0.95.4.old/WindowMaker/menu.bg 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.bg 2014-04-10 06:40:00.509787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.bg
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.bg
+++ WindowMaker-0.95.6/WindowMaker/menu.bg
@@ -115,60 +115,10 @@
"Инфо" MENU
"Информационен панел..." INFO_PANEL
@ -218,9 +220,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.bg WindowMaker-0.95.4/WindowM
"Изход..." EXIT
"Изход" END
"Приложения" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ca WindowMaker-0.95.4/WindowMaker/menu.ca
--- WindowMaker-0.95.4.old/WindowMaker/menu.ca 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ca 2014-04-10 06:40:00.509787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.ca
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.ca
+++ WindowMaker-0.95.6/WindowMaker/menu.ca
@@ -110,60 +110,9 @@
"Informació" MENU
"Info Panel..." INFO_PANEL
@ -299,9 +302,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ca WindowMaker-0.95.4/WindowM
"Sortir" END
"Aplicacions" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.cs WindowMaker-0.95.4/WindowMaker/menu.cs
--- WindowMaker-0.95.4.old/WindowMaker/menu.cs 1969-12-31 16:00:00.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.cs 2014-04-10 06:40:00.509787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.cs
===================================================================
--- /dev/null
+++ WindowMaker-0.95.6/WindowMaker/menu.cs
@@ -0,0 +1,85 @@
+// Text bellow is in czech, encoding ISO8829-2.
+//
@ -388,9 +392,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.cs WindowMaker-0.95.4/WindowM
+ "Ukončit..." EXIT
+ "Konec" END
+"Hlavní menu" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.da WindowMaker-0.95.4/WindowMaker/menu.da
--- WindowMaker-0.95.4.old/WindowMaker/menu.da 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.da 2014-04-10 06:40:00.509787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.da
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.da
+++ WindowMaker-0.95.6/WindowMaker/menu.da
@@ -103,62 +103,10 @@
"Info" MENU
"Info Panel..." INFO_PANEL
@ -469,9 +474,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.da WindowMaker-0.95.4/WindowM
"Afslut..." EXIT
"Afslut" END
"Applikationer" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.de WindowMaker-0.95.4/WindowMaker/menu.de
--- WindowMaker-0.95.4.old/WindowMaker/menu.de 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.de 2014-04-10 06:40:00.509787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.de
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.de
+++ WindowMaker-0.95.6/WindowMaker/menu.de
@@ -44,55 +44,9 @@
"Info" MENU
"Info Panel..." INFO_PANEL
@ -550,9 +556,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.de WindowMaker-0.95.4/WindowM
- "Sitzung beenden..." SHUTDOWN
"Beenden" END
"Anwendungen" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.el WindowMaker-0.95.4/WindowMaker/menu.el
--- WindowMaker-0.95.4.old/WindowMaker/menu.el 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.el 2014-04-10 06:40:00.510787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.el
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.el
+++ WindowMaker-0.95.6/WindowMaker/menu.el
@@ -118,62 +118,10 @@
"Πληροφορίες" MENU
"Σχετικά..." INFO_PANEL
@ -633,9 +640,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.el WindowMaker-0.95.4/WindowM
"Έξοδος..." EXIT
"Έξοδος" END
"Μενού" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.es WindowMaker-0.95.4/WindowMaker/menu.es
--- WindowMaker-0.95.4.old/WindowMaker/menu.es 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.es 2014-04-10 06:40:00.510787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.es
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.es
+++ WindowMaker-0.95.6/WindowMaker/menu.es
@@ -43,62 +43,9 @@
"Informacion ..." MENU
"Copyright..." SHEXEC xmessage -center -font variable -title \
@ -726,9 +734,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.es WindowMaker-0.95.4/WindowM
- "Salir de la sesion" SHUTDOWN
"Salir ..." END
"Menu Principal" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fi WindowMaker-0.95.4/WindowMaker/menu.fi
--- WindowMaker-0.95.4.old/WindowMaker/menu.fi 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.fi 2014-04-10 06:40:00.510787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.fi
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.fi
+++ WindowMaker-0.95.6/WindowMaker/menu.fi
@@ -108,61 +108,10 @@
"Tietoja" MENU
"Tietoja..." INFO_PANEL
@ -809,9 +818,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fi WindowMaker-0.95.4/WindowM
"Lopeta" EXIT
"Lopeta" END
"Sovellukset" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fr WindowMaker-0.95.4/WindowMaker/menu.fr
--- WindowMaker-0.95.4.old/WindowMaker/menu.fr 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.fr 2014-04-10 06:40:00.510787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.fr
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.fr
+++ WindowMaker-0.95.6/WindowMaker/menu.fr
@@ -154,61 +154,10 @@
"Informations" MENU
"Panneau d'informations" INFO_PANEL
@ -890,9 +900,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fr WindowMaker-0.95.4/WindowM
- "Tuer la session..." SHUTDOWN
"Quitter" END
"Applications" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.gl WindowMaker-0.95.4/WindowMaker/menu.gl
--- WindowMaker-0.95.4.old/WindowMaker/menu.gl 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.gl 2014-04-10 06:40:00.510787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.gl
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.gl
+++ WindowMaker-0.95.6/WindowMaker/menu.gl
@@ -45,56 +45,9 @@
"Información" MENU
"Info Panel..." INFO_PANEL
@ -969,9 +980,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.gl WindowMaker-0.95.4/WindowM
- "Sair da sesión..." SHUTDOWN
"Sair" END
"Aplicacións" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.he WindowMaker-0.95.4/WindowMaker/menu.he
--- WindowMaker-0.95.4.old/WindowMaker/menu.he 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.he 2014-04-10 06:49:50.406780111 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.he
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.he
+++ WindowMaker-0.95.6/WindowMaker/menu.he
@@ -97,60 +97,9 @@
"עדימ" MENU
"Info Panel..." INFO_PANEL
@ -1050,9 +1062,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.he WindowMaker-0.95.4/WindowM
"האיצי" END
"םימושי" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hr WindowMaker-0.95.4/WindowMaker/menu.hr
--- WindowMaker-0.95.4.old/WindowMaker/menu.hr 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.hr 2014-04-10 06:40:00.511787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.hr
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.hr
+++ WindowMaker-0.95.6/WindowMaker/menu.hr
@@ -97,62 +97,9 @@
"Informacije" MENU
"Info Panel..." INFO_PANEL
@ -1133,9 +1146,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hr WindowMaker-0.95.4/WindowM
- "Izlaz iz sessiona..." SHUTDOWN
"Izlaz" END
"Programi" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hu WindowMaker-0.95.4/WindowMaker/menu.hu
--- WindowMaker-0.95.4.old/WindowMaker/menu.hu 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.hu 2014-04-10 06:40:00.511787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.hu
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.hu
+++ WindowMaker-0.95.6/WindowMaker/menu.hu
@@ -111,62 +111,10 @@
"Infó" MENU
"Információs panel..." INFO_PANEL
@ -1217,9 +1231,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hu WindowMaker-0.95.4/WindowM
"Kilépés..." EXIT
"Kilépés" END
"Alkalmazások" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.it WindowMaker-0.95.4/WindowMaker/menu.it
--- WindowMaker-0.95.4.old/WindowMaker/menu.it 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.it 2014-04-10 06:40:00.511787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.it
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.it
+++ WindowMaker-0.95.6/WindowMaker/menu.it
@@ -45,58 +45,9 @@
"Informazioni" MENU
"Info Panel..." INFO_PANEL
@ -1296,9 +1311,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.it WindowMaker-0.95.4/WindowM
- "Uscire dalla sessione..." SHUTDOWN
"Uscire" END
"Applicazioni" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ja WindowMaker-0.95.4/WindowMaker/menu.ja
--- WindowMaker-0.95.4.old/WindowMaker/menu.ja 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ja 2014-04-10 06:50:56.520779325 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.ja
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.ja
+++ WindowMaker-0.95.6/WindowMaker/menu.ja
@@ -103,61 +103,8 @@
"情報" MENU
"Info パネル..." INFO_PANEL
@ -1378,9 +1394,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ja WindowMaker-0.95.4/WindowM
"終了" END
"アプリケーション" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ko WindowMaker-0.95.4/WindowMaker/menu.ko
--- WindowMaker-0.95.4.old/WindowMaker/menu.ko 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ko 2014-04-10 06:40:00.511787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.ko
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.ko
+++ WindowMaker-0.95.6/WindowMaker/menu.ko
@@ -102,57 +102,7 @@
"정 보" MENU
"정보 패널" INFO_PANEL
@ -1480,77 +1497,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ko WindowMaker-0.95.4/WindowM
- "세션종료" SHUTDOWN
"종 료" END
"윈도우메이커" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.nl WindowMaker-0.95.4/WindowMaker/menu.nl
--- WindowMaker-0.95.4.old/WindowMaker/menu.nl 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.nl 2014-04-10 06:40:00.512787124 -0700
@@ -35,48 +35,9 @@
"Info" MENU
"Info Panel..." INFO_PANEL
"Legal" LEGAL_PANEL
- "Xosview" EXEC xosview
- "Top" EXEC xterm -e top
- "Handleidingszoeker" EXEC xman
"Info" END
"XTerm" SHEXEC xterm -sb || color-xterm -sb || xterm -sb
- "XJed" EXEC xjed
"Werkplaatsen" WORKSPACE_MENU
- "Applicaties" MENU
- "Grafische toepassingen" MENU
- "Gimp" EXEC gimp
- "XV" EXEC xv
- "XPaint" EXEC xpaint
- "XFig" EXEC xfig
- "Grafische toepassingen" END
- "X File Manager" EXEC xfm
- "OffiX Files" EXEC files
- "LyX" EXEC lyx
- "Netscape" EXEC netscape
- "Ghostview" EXEC ghostview
- "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
- "TkDesk" EXEC tkdesk
- "Applicaties" END
- "Editors" MENU
- "XEmacs" EXEC xemacs
- "XJed" EXEC xjed
- "NEdit" EXEC nedit
- "Xedit" EXEC xedit
- "VI" EXEC xterm -e vi
- "Editors" END
- "Diverse" MENU
- "Xmcd" SHEXEC xmcd 2> /dev/null
- "Xplaycd" EXEC xplaycd
- "Xmixer" EXEC xmixer
- "Diverse" END
- "Utils" MENU
- "Calculator" EXEC xcalc
- "Font Chooser" EXEC xfontsel
- "Magnify" EXEC xmag
- "Colormap" EXEC xcmap
- "XKill" EXEC xkill
- "ASClock" EXEC asclock
- "Utils" END
"Werkplaats" MENU
"Achtergrond" MENU
"-" EXEC CLEARROOT
@@ -97,12 +58,12 @@
"Herschik iconen" ARRANGE_ICONS
"Ververs" REFRESH
"Blokkeren" EXEC xlock -allowroot -usefirst
- "Opslaan werkplaats" EXEC SAVE_WORKSPACE
+ "Opslaan werkplaats" SAVE_SESSION
"Werkplaats" END
+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
"Exit" MENU
"Herstart" RESTART
- "Start AfterStep" RESTART afterstep
"Afsluiten..." EXIT
- "Afsluiten sessie..." SHUTDOWN
"Exit" END
"Applicaties" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.no WindowMaker-0.95.4/WindowMaker/menu.no
--- WindowMaker-0.95.4.old/WindowMaker/menu.no 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.no 2014-04-10 06:40:00.512787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.no
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.no
+++ WindowMaker-0.95.6/WindowMaker/menu.no
@@ -100,58 +100,9 @@
"Info" MENU
"Lisens..." INFO_PANEL
@ -1626,9 +1576,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.no WindowMaker-0.95.4/WindowM
- "Avslutt X11..." SHUTDOWN
"Avslutt" END
"Applikasjoner" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pl WindowMaker-0.95.4/WindowMaker/menu.pl
--- WindowMaker-0.95.4.old/WindowMaker/menu.pl 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.pl 2014-04-10 06:40:00.512787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.pl
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.pl
+++ WindowMaker-0.95.6/WindowMaker/menu.pl
@@ -104,125 +104,12 @@
"Informacja" MENU
"Informacja o WMaker..." INFO_PANEL
@ -1774,9 +1725,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pl WindowMaker-0.95.4/WindowM
- "Zabicie sesji..." SHUTDOWN
"Wyjście" END
"WindowMaker" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pt WindowMaker-0.95.4/WindowMaker/menu.pt
--- WindowMaker-0.95.4.old/WindowMaker/menu.pt 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.pt 2014-04-10 06:40:00.512787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.pt
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.pt
+++ WindowMaker-0.95.6/WindowMaker/menu.pt
@@ -106,61 +106,9 @@
"Informações" MENU
"Informações..." INFO_PANEL
@ -1856,9 +1808,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pt WindowMaker-0.95.4/WindowM
"Sair" END
"Aplicações" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ro WindowMaker-0.95.4/WindowMaker/menu.ro
--- WindowMaker-0.95.4.old/WindowMaker/menu.ro 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ro 2014-04-10 06:40:00.512787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.ro
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.ro
+++ WindowMaker-0.95.6/WindowMaker/menu.ro
@@ -108,61 +108,10 @@
"Informaţii" MENU
"Panou cu Informaţii" INFO_PANEL
@ -1942,9 +1895,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ro WindowMaker-0.95.4/WindowM
"Ieşi" EXIT
"Ieşire" END
"Aplicaţii" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ru WindowMaker-0.95.4/WindowMaker/menu.ru
--- WindowMaker-0.95.4.old/WindowMaker/menu.ru 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ru 2014-04-10 06:40:00.513787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.ru
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.ru
+++ WindowMaker-0.95.6/WindowMaker/menu.ru
@@ -57,70 +57,19 @@
"Информация" MENU
"Info Panel..." INFO_PANEL
@ -2033,9 +1987,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ru WindowMaker-0.95.4/WindowM
- "Завершить сессию..." SHUTDOWN
"Выход" END
"Приложения" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sk WindowMaker-0.95.4/WindowMaker/menu.sk
--- WindowMaker-0.95.4.old/WindowMaker/menu.sk 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.sk 2014-04-10 06:40:00.513787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.sk
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.sk
+++ WindowMaker-0.95.6/WindowMaker/menu.sk
@@ -122,61 +122,10 @@
"Informácie" MENU
"Panel Info" INFO_PANEL
@ -2116,9 +2071,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sk WindowMaker-0.95.4/WindowM
"Koniec" EXIT
"Koniec" END
"Aplikácie" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sl WindowMaker-0.95.4/WindowMaker/menu.sl
--- WindowMaker-0.95.4.old/WindowMaker/menu.sl 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.sl 2014-04-10 06:40:00.513787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.sl
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.sl
+++ WindowMaker-0.95.6/WindowMaker/menu.sl
@@ -105,61 +105,9 @@
"Informacije" MENU
"Informacije o programu..." INFO_PANEL
@ -2197,9 +2153,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sl WindowMaker-0.95.4/WindowM
- "Izhod iz session..." SHUTDOWN
"Izhod" END
"Aplikacije" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.tr WindowMaker-0.95.4/WindowMaker/menu.tr
--- WindowMaker-0.95.4.old/WindowMaker/menu.tr 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.tr 2014-04-10 06:40:00.513787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.tr
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.tr
+++ WindowMaker-0.95.6/WindowMaker/menu.tr
@@ -91,61 +91,9 @@
"Bilgi" MENU
"Copyright..." EXEC xmessage -center -font variable -title \
@ -2280,9 +2237,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.tr WindowMaker-0.95.4/WindowM
ıkış" END
"Ana Menü" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW WindowMaker-0.95.4/WindowMaker/menu.zh_TW
--- WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.zh_TW 2014-04-10 06:53:22.923777584 -0700
Index: WindowMaker-0.95.6/WindowMaker/menu.zh_TW
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.zh_TW
+++ WindowMaker-0.95.6/WindowMaker/menu.zh_TW
@@ -199,7 +199,7 @@
"背景" END
"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
@ -2292,9 +2250,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW WindowMaker-0.95.4/Wind
"外觀" END
"離開" MENU
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu WindowMaker-0.95.4/WindowMaker/plmenu
--- WindowMaker-0.95.4.old/WindowMaker/plmenu 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu 2014-04-10 06:40:00.517787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu
+++ WindowMaker-0.95.6/WindowMaker/plmenu
@@ -1,106 +1,55 @@
("Applications",
("Info",
@ -2434,9 +2393,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu WindowMaker-0.95.4/WindowMa
+ ("Exit", EXIT)
+ )
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.bg WindowMaker-0.95.4/WindowMaker/plmenu.bg
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.bg 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.bg 2014-04-10 06:40:00.518787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.bg
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.bg
+++ WindowMaker-0.95.6/WindowMaker/plmenu.bg
@@ -1,61 +1,10 @@
("Приложения",
("Инфо",
@ -2517,9 +2477,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.bg WindowMaker-0.95.4/Windo
("Изход...", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.cs WindowMaker-0.95.4/WindowMaker/plmenu.cs
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.cs 1969-12-31 16:00:00.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.cs 2014-04-10 06:40:00.513787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.cs
===================================================================
--- /dev/null
+++ WindowMaker-0.95.6/WindowMaker/plmenu.cs
@@ -0,0 +1,158 @@
+(
+"Hlavní menu",
@ -2679,9 +2640,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.cs WindowMaker-0.95.4/Windo
+ ("Ukončit...", EXIT)
+ )
+)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.da WindowMaker-0.95.4/WindowMaker/plmenu.da
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.da 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.da 2014-04-10 06:40:00.514787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.da
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.da
+++ WindowMaker-0.95.6/WindowMaker/plmenu.da
@@ -3,23 +3,7 @@
(
"Info",
@ -2925,9 +2887,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.da WindowMaker-0.95.4/Windo
("Afslut...", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.de WindowMaker-0.95.4/WindowMaker/plmenu.de
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.de 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.de 2014-04-10 06:42:15.996785513 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.de
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.de
+++ WindowMaker-0.95.6/WindowMaker/plmenu.de
@@ -1,61 +1,11 @@
("Anwendungen",
("Info",
@ -3026,9 +2989,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.de WindowMaker-0.95.4/Windo
("Beenden...", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.es WindowMaker-0.95.4/WindowMaker/plmenu.es
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.es 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.es 2014-04-10 06:40:00.514787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.es
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.es
+++ WindowMaker-0.95.6/WindowMaker/plmenu.es
@@ -1,61 +1,10 @@
("Aplicaciones",
("Informacion",
@ -3127,9 +3091,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.es WindowMaker-0.95.4/Windo
("Salir", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fi WindowMaker-0.95.4/WindowMaker/plmenu.fi
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.fi 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.fi 2014-04-10 06:40:00.514787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.fi
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.fi
+++ WindowMaker-0.95.6/WindowMaker/plmenu.fi
@@ -3,27 +3,7 @@
(
"Tietoja",
@ -3400,9 +3365,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fi WindowMaker-0.95.4/Windo
("Lopeta", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fr WindowMaker-0.95.4/WindowMaker/plmenu.fr
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.fr 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.fr 2014-04-10 06:43:34.349784582 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.fr
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.fr
+++ WindowMaker-0.95.6/WindowMaker/plmenu.fr
@@ -1,61 +1,11 @@
("Applications",
("Informations",
@ -3501,9 +3467,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fr WindowMaker-0.95.4/Windo
+ ("Quitter...", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.hr WindowMaker-0.95.4/WindowMaker/plmenu.hr
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.hr 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.hr 2014-04-10 06:43:50.233784393 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.hr
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.hr
+++ WindowMaker-0.95.6/WindowMaker/plmenu.hr
@@ -3,77 +3,12 @@
(
Info,
@ -3644,9 +3611,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.hr WindowMaker-0.95.4/Windo
+ (Izlaz..., EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.it WindowMaker-0.95.4/WindowMaker/plmenu.it
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.it 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.it 2014-04-10 06:44:06.579784199 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.it
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.it
+++ WindowMaker-0.95.6/WindowMaker/plmenu.it
@@ -1,61 +1,11 @@
("Applicazioni",
("Informazioni",
@ -3747,9 +3715,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.it WindowMaker-0.95.4/Windo
- ("Uccidi sessione...", SHUTDOWN)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ja WindowMaker-0.95.4/WindowMaker/plmenu.ja
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ja 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.ja 2014-04-10 06:44:22.655784007 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.ja
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.ja
+++ WindowMaker-0.95.6/WindowMaker/plmenu.ja
@@ -1,44 +1,10 @@
("アプリケーション",
("情報",
@ -3827,9 +3796,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ja WindowMaker-0.95.4/Windo
("終了", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ko WindowMaker-0.95.4/WindowMaker/plmenu.ko
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ko 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.ko 2014-04-10 06:40:00.515787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.ko
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.ko
+++ WindowMaker-0.95.6/WindowMaker/plmenu.ko
@@ -1,57 +1,7 @@
("윈도우메이커",
("정 보",
@ -3927,9 +3897,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ko WindowMaker-0.95.4/Windo
+ ("종 료", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.pl WindowMaker-0.95.4/WindowMaker/plmenu.pl
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.pl 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.pl 2014-04-10 06:40:00.515787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.pl
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.pl
+++ WindowMaker-0.95.6/WindowMaker/plmenu.pl
@@ -1,125 +1,12 @@
("WindowMaker",
("Informacja",
@ -4079,9 +4050,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.pl WindowMaker-0.95.4/Windo
+ ("Wyjście...", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ro WindowMaker-0.95.4/WindowMaker/plmenu.ro
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ro 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.ro 2014-04-10 06:40:00.516787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.ro
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.ro
+++ WindowMaker-0.95.6/WindowMaker/plmenu.ro
@@ -1,61 +1,11 @@
("Aplicaţii",
("Informaţii",
@ -4162,9 +4134,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ro WindowMaker-0.95.4/Windo
("Ieşi", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.sk WindowMaker-0.95.4/WindowMaker/plmenu.sk
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.sk 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.sk 2014-04-10 06:40:00.516787124 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.sk
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.sk
+++ WindowMaker-0.95.6/WindowMaker/plmenu.sk
@@ -1,61 +1,11 @@
("Aplikácie",
("Info",
@ -4245,9 +4218,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.sk WindowMaker-0.95.4/Windo
("Koniec", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN WindowMaker-0.95.4/WindowMaker/plmenu.zh_CN
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.zh_CN 2014-04-10 06:46:13.072782695 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_CN
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.zh_CN
+++ WindowMaker-0.95.6/WindowMaker/plmenu.zh_CN
@@ -1,63 +1,11 @@
("应用程序",
("信息",
@ -4332,9 +4306,10 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN WindowMaker-0.95.4/Wi
("退出...", EXIT)
)
)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW WindowMaker-0.95.4/WindowMaker/plmenu.zh_TW
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.zh_TW 2014-04-10 06:46:46.022782303 -0700
Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_TW
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/plmenu.zh_TW
+++ WindowMaker-0.95.6/WindowMaker/plmenu.zh_TW
@@ -1,59 +1,11 @@
("應用程式",
("資訊",
@ -4414,3 +4389,89 @@ diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW WindowMaker-0.95.4/Wi
("離開...", EXIT)
)
)
Index: WindowMaker-0.95.6/WindowMaker/menu.nl
===================================================================
--- WindowMaker-0.95.6.orig/WindowMaker/menu.nl
+++ WindowMaker-0.95.6/WindowMaker/menu.nl
@@ -111,65 +111,9 @@
"Info" MENU
"Infopaneel" INFO_PANEL
"Juridische info" LEGAL_PANEL
- "Systeemconsole" EXEC xconsole
- "Systeembelasting" SHEXEC xosview || xload
- "Proceslijst" EXEC xterm -e top
- "Handleidingbrowser" EXEC xman
"Info" END
- "Uitvoeren..." SHEXEC %a(Uitvoeren,Typ uit te voeren commando:)
"XTerm" EXEC xterm -sb
- "Mozilla Firefox" EXEC firefox
"Werkruimten" WORKSPACE_MENU
- "Programma's" MENU
- "Gimp" SHEXEC gimp >/dev/null
- "Ghostview" EXEC ghostview %a(GhostView,Voer te bekijken bestand in)
- "Xpdf" EXEC xpdf %a(Xpdf,Voer te bekijken PDF in)
- "Abiword" EXEC abiword
- "Dia" EXEC dia
- "OpenOffice.org" MENU
- "OpenOffice.org" EXEC ooffice
- "Writer" EXEC oowriter
- "Rekenblad" EXEC oocalc
- "Draw" EXEC oodraw
- "Impress" EXEC ooimpress
- "OpenOffice.org" END
-
- "Tekstbewerkers" MENU
- "XEmacs" EXEC xemacs
- "Emacs" EXEC emacs
- "XJed" EXEC xjed
- "VI" EXEC xterm -e vi
- "GVIM" EXEC gvim
- "NEdit" EXEC nedit
- "Xedit" EXEC xedit
- "Tekstbewerkers" END
-
- "Multimedia" MENU
- "XMMS" MENU
- "XMMS" EXEC xmms
- "XMMS afspelen/pauzeren" EXEC xmms -t
- "XMMS stoppen" EXEC xmms -s
- "XMMS" END
- "Xine videospeler" EXEC xine
- "MPlayer" EXEC mplayer
- "Multimedia" END
- "Programma's" END
-
- "Hulpmiddelen" MENU
- "Rekenmachine" EXEC xcalc
- "Venstereigenschappen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
- "Lettertypekiezer" EXEC xfontsel
- "Vergroten" EXEC wmagnify
- "Kleurenkaart" EXEC xcmap
- "X-programma doden" EXEC xkill
- "Hulpmiddelen" END
-
- "Selectie" MENU
- "Kopiëren" SHEXEC echo '%s' | wxcopy
- "E-mailen naar" EXEC xterm -name mail -T "Pine" -e pine %s
- "Navigeren" EXEC netscape %s
- "Zoeken in handleiding" SHEXEC MANUAL_SEARCH(%s)
- "Selectie" END
"Commando's" MENU
"Andere verbergen" HIDE_OTHERS
@@ -210,13 +154,12 @@
"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
"Uiterlijk" END
-
+ "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+ "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
"Sessie" MENU
"Sessie opslaan" SAVE_SESSION
"Sessie wissen" CLEAR_SESSION
"Window Maker herstarten" RESTART
- "BlackBox starten" RESTART blackbox
- "IceWM starten" RESTART icewm
"Afsluiten" EXIT
"Sessie" END
"Programma's" END

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Nov 6 00:12:35 UTC 2014 - kmroz@suse.com
- Update to WindowMaker-0.95.6
- Add: WindowMaker-0.95.6.tar.gz
- Remove: WindowMaker-0.95.5.tar.gz
- Update WindowMaker-menu.patch to reflect changed menu.nl in
0.95.6.
- Update fix_wmgenmenu_paths.patch as most changes are already
present in 0.95.6.
- Update wm-giflib.c to reflect code changes (ie. re-written
wrlib/gif.c with wrlib/load_gif.c). Not clear if this patch
is even needed, but keeping it around.
-------------------------------------------------------------------
Fri May 30 20:31:01 UTC 2014 - jengelh@inai.de

View File

@ -20,7 +20,7 @@ Name: WindowMaker
Summary: A Colorful and Flexible Window Manager
License: GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain
Group: System/GUI/Other
Version: 0.95.5
Version: 0.95.6
Release: 0
# 81eefca4ef70414d73048300058e5007f402dd7f
# f846b7cdd39749b5291d4559185a229b752b4fed

View File

@ -12,51 +12,26 @@ Fix this by writing strings composed with PKGDATADIR.
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
---
diff -rupN WindowMaker-0.95.4.old/util/wmgenmenu.c WindowMaker-0.95.4/util/wmgenmenu.c
--- WindowMaker-0.95.4.old/util/wmgenmenu.c 2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/util/wmgenmenu.c 2014-04-10 13:02:00.693514632 -0700
@@ -35,6 +35,13 @@ int main(int argc, char *argv[])
Index: WindowMaker-0.95.6/util/wmgenmenu.c
===================================================================
--- WindowMaker-0.95.6.orig/util/wmgenmenu.c
+++ WindowMaker-0.95.6/util/wmgenmenu.c
@@ -41,12 +41,13 @@ int main(int argc, char *argv[])
{
char *t;
int ch;
- char *tmp, *theme_paths, *style_paths, *icon_paths;
+ char *tmp, *theme_paths, *style_paths, *icon_paths, *bg_paths;
+
+ tmp = wstrconcat("-noext ", PKGDATADIR);
+ theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
+ style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
+ icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
tmp = wstrconcat("-noext ", PKGDATADIR);
theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
+ bg_paths = wstrconcat(tmp, "/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t");
struct option longopts[] = {
{ "version", no_argument, NULL, 'v' },
@@ -146,7 +153,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Themes")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ WMCreatePLString(theme_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -155,7 +162,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Styles")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ WMCreatePLString(style_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -164,7 +171,7 @@ int main(int argc, char *argv[])
L2Menu = WMCreatePLArray(
WMCreatePLString(_("Icon Sets")),
WMCreatePLString("OPEN_MENU"),
- WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ WMCreatePLString(icon_paths),
NULL
);
WMAddToPLArray(L1Menu, L2Menu);
@@ -232,7 +239,7 @@ int main(int argc, char *argv[])
@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
L3Menu = WMCreatePLArray(
WMCreatePLString(_("Images")),
WMCreatePLString("OPEN_MENU"),
@ -65,7 +40,7 @@ diff -rupN WindowMaker-0.95.4.old/util/wmgenmenu.c WindowMaker-0.95.4/util/wmgen
NULL
);
WMAddToPLArray(L2Menu, L3Menu);
@@ -321,7 +328,7 @@ int main(int argc, char *argv[])
@@ -333,7 +334,7 @@ int main(int argc, char *argv[])
L1Menu = WMCreatePLArray(
WMCreatePLString(_("Configure Window Maker")),
WMCreatePLString("EXEC"),

File diff suppressed because it is too large Load Diff