From e1cca6a9ce9c7a6de91b2f5de5085b0299e8a773f48fa833d7a08df4b2906c53 Mon Sep 17 00:00:00 2001 From: Philipp Seiler Date: Mon, 10 Nov 2014 11:08:34 +0000 Subject: [PATCH] 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 --- WindowMaker-0.95.5.tar.gz | 3 - WindowMaker-0.95.6.tar.gz | 3 + WindowMaker-menu.patch | 455 ++++++++------ WindowMaker.changes | 14 + WindowMaker.spec | 2 +- fix_wmgenmenu_paths.patch | 51 +- wm-giflib.patch | 1194 +++++++++++++++++-------------------- 7 files changed, 851 insertions(+), 871 deletions(-) delete mode 100644 WindowMaker-0.95.5.tar.gz create mode 100644 WindowMaker-0.95.6.tar.gz diff --git a/WindowMaker-0.95.5.tar.gz b/WindowMaker-0.95.5.tar.gz deleted file mode 100644 index 5b727b2..0000000 --- a/WindowMaker-0.95.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 -size 2927995 diff --git a/WindowMaker-0.95.6.tar.gz b/WindowMaker-0.95.6.tar.gz new file mode 100644 index 0000000..05aae77 --- /dev/null +++ b/WindowMaker-0.95.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 +size 3004856 diff --git a/WindowMaker-menu.patch b/WindowMaker-menu.patch index 4306659..0519177 100644 --- a/WindowMaker-menu.patch +++ b/WindowMaker-menu.patch @@ -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 diff --git a/WindowMaker.changes b/WindowMaker.changes index 1591bea..81a41a8 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -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 diff --git a/WindowMaker.spec b/WindowMaker.spec index 4cf1749..980168a 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -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 diff --git a/fix_wmgenmenu_paths.patch b/fix_wmgenmenu_paths.patch index ec7827a..3191768 100644 --- a/fix_wmgenmenu_paths.patch +++ b/fix_wmgenmenu_paths.patch @@ -12,51 +12,26 @@ Fix this by writing strings composed with PKGDATADIR. Signed-off-by: Carlos R. Mafra --- -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"), diff --git a/wm-giflib.patch b/wm-giflib.patch index 230f78f..e0d0a00 100644 --- a/wm-giflib.patch +++ b/wm-giflib.patch @@ -168,10 +168,10 @@ wrlib/tests/view.c | 4 ++++ 167 files changed, 686 insertions(+), 5 deletions(-) -Index: WindowMaker-0.95.5/WINGs/Examples/colorpick.c +Index: WindowMaker-0.95.6/WINGs/Examples/colorpick.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Examples/colorpick.c -+++ WindowMaker-0.95.5/WINGs/Examples/colorpick.c +--- WindowMaker-0.95.6.orig/WINGs/Examples/colorpick.c ++++ WindowMaker-0.95.6/WINGs/Examples/colorpick.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -181,10 +181,10 @@ Index: WindowMaker-0.95.5/WINGs/Examples/colorpick.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/Examples/fontl.c +Index: WindowMaker-0.95.6/WINGs/Examples/fontl.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Examples/fontl.c -+++ WindowMaker-0.95.5/WINGs/Examples/fontl.c +--- WindowMaker-0.95.6.orig/WINGs/Examples/fontl.c ++++ WindowMaker-0.95.6/WINGs/Examples/fontl.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -196,10 +196,10 @@ Index: WindowMaker-0.95.5/WINGs/Examples/fontl.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/Examples/puzzle.c +Index: WindowMaker-0.95.6/WINGs/Examples/puzzle.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Examples/puzzle.c -+++ WindowMaker-0.95.5/WINGs/Examples/puzzle.c +--- WindowMaker-0.95.6.orig/WINGs/Examples/puzzle.c ++++ WindowMaker-0.95.6/WINGs/Examples/puzzle.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -209,10 +209,10 @@ Index: WindowMaker-0.95.5/WINGs/Examples/puzzle.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/Extras/test.c +Index: WindowMaker-0.95.6/WINGs/Extras/test.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Extras/test.c -+++ WindowMaker-0.95.5/WINGs/Extras/test.c +--- WindowMaker-0.95.6.orig/WINGs/Extras/test.c ++++ WindowMaker-0.95.6/WINGs/Extras/test.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -222,10 +222,10 @@ Index: WindowMaker-0.95.5/WINGs/Extras/test.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c +Index: WindowMaker-0.95.6/WINGs/Extras/wtabledelegates.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Extras/wtabledelegates.c -+++ WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c +--- WindowMaker-0.95.6.orig/WINGs/Extras/wtabledelegates.c ++++ WindowMaker-0.95.6/WINGs/Extras/wtabledelegates.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -235,10 +235,10 @@ Index: WindowMaker-0.95.5/WINGs/Extras/wtabledelegates.c #include #include -Index: WindowMaker-0.95.5/WINGs/Extras/wtableview.c +Index: WindowMaker-0.95.6/WINGs/Extras/wtableview.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Extras/wtableview.c -+++ WindowMaker-0.95.5/WINGs/Extras/wtableview.c +--- WindowMaker-0.95.6.orig/WINGs/Extras/wtableview.c ++++ WindowMaker-0.95.6/WINGs/Extras/wtableview.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -248,10 +248,10 @@ Index: WindowMaker-0.95.5/WINGs/Extras/wtableview.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/Tests/mywidget.c +Index: WindowMaker-0.95.6/WINGs/Tests/mywidget.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Tests/mywidget.c -+++ WindowMaker-0.95.5/WINGs/Tests/mywidget.c +--- WindowMaker-0.95.6.orig/WINGs/Tests/mywidget.c ++++ WindowMaker-0.95.6/WINGs/Tests/mywidget.c @@ -13,6 +13,10 @@ * * @@ -263,10 +263,10 @@ Index: WindowMaker-0.95.5/WINGs/Tests/mywidget.c #include /* -Index: WindowMaker-0.95.5/WINGs/Tests/testmywidget.c +Index: WindowMaker-0.95.6/WINGs/Tests/testmywidget.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Tests/testmywidget.c -+++ WindowMaker-0.95.5/WINGs/Tests/testmywidget.c +--- WindowMaker-0.95.6.orig/WINGs/Tests/testmywidget.c ++++ WindowMaker-0.95.6/WINGs/Tests/testmywidget.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -276,10 +276,10 @@ Index: WindowMaker-0.95.5/WINGs/Tests/testmywidget.c #include #include -Index: WindowMaker-0.95.5/WINGs/Tests/wmfile.c +Index: WindowMaker-0.95.6/WINGs/Tests/wmfile.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Tests/wmfile.c -+++ WindowMaker-0.95.5/WINGs/Tests/wmfile.c +--- WindowMaker-0.95.6.orig/WINGs/Tests/wmfile.c ++++ WindowMaker-0.95.6/WINGs/Tests/wmfile.c @@ -11,6 +11,10 @@ ----------------------------------------------------------------------- */ @@ -291,10 +291,10 @@ Index: WindowMaker-0.95.5/WINGs/Tests/wmfile.c #include #include -Index: WindowMaker-0.95.5/WINGs/Tests/wmquery.c +Index: WindowMaker-0.95.6/WINGs/Tests/wmquery.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Tests/wmquery.c -+++ WindowMaker-0.95.5/WINGs/Tests/wmquery.c +--- WindowMaker-0.95.6.orig/WINGs/Tests/wmquery.c ++++ WindowMaker-0.95.6/WINGs/Tests/wmquery.c @@ -3,6 +3,10 @@ * Author: Len Trigg */ @@ -306,10 +306,10 @@ Index: WindowMaker-0.95.5/WINGs/Tests/wmquery.c #include #include -Index: WindowMaker-0.95.5/WINGs/Tests/wtest.c +Index: WindowMaker-0.95.6/WINGs/Tests/wtest.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/Tests/wtest.c -+++ WindowMaker-0.95.5/WINGs/Tests/wtest.c +--- WindowMaker-0.95.6.orig/WINGs/Tests/wtest.c ++++ WindowMaker-0.95.6/WINGs/Tests/wtest.c @@ -2,6 +2,10 @@ * WINGs test application */ @@ -321,10 +321,10 @@ Index: WindowMaker-0.95.5/WINGs/Tests/wtest.c #include #include -Index: WindowMaker-0.95.5/WINGs/array.c +Index: WindowMaker-0.95.6/WINGs/array.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/array.c -+++ WindowMaker-0.95.5/WINGs/array.c +--- WindowMaker-0.95.6.orig/WINGs/array.c ++++ WindowMaker-0.95.6/WINGs/array.c @@ -8,6 +8,10 @@ * proper credit is always appreciated :) */ @@ -336,10 +336,10 @@ Index: WindowMaker-0.95.5/WINGs/array.c #include #include -Index: WindowMaker-0.95.5/WINGs/bagtree.c +Index: WindowMaker-0.95.6/WINGs/bagtree.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/bagtree.c -+++ WindowMaker-0.95.5/WINGs/bagtree.c +--- WindowMaker-0.95.6.orig/WINGs/bagtree.c ++++ WindowMaker-0.95.6/WINGs/bagtree.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -349,10 +349,10 @@ Index: WindowMaker-0.95.5/WINGs/bagtree.c #include #include -Index: WindowMaker-0.95.5/WINGs/configuration.c +Index: WindowMaker-0.95.6/WINGs/configuration.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/configuration.c -+++ WindowMaker-0.95.5/WINGs/configuration.c +--- WindowMaker-0.95.6.orig/WINGs/configuration.c ++++ WindowMaker-0.95.6/WINGs/configuration.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -362,10 +362,10 @@ Index: WindowMaker-0.95.5/WINGs/configuration.c #include "WINGsP.h" #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/data.c +Index: WindowMaker-0.95.6/WINGs/data.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/data.c -+++ WindowMaker-0.95.5/WINGs/data.c +--- WindowMaker-0.95.6.orig/WINGs/data.c ++++ WindowMaker-0.95.6/WINGs/data.c @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */ @@ -377,10 +377,10 @@ Index: WindowMaker-0.95.5/WINGs/data.c #include #include "WUtil.h" -Index: WindowMaker-0.95.5/WINGs/dragcommon.c +Index: WindowMaker-0.95.6/WINGs/dragcommon.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/dragcommon.c -+++ WindowMaker-0.95.5/WINGs/dragcommon.c +--- WindowMaker-0.95.6.orig/WINGs/dragcommon.c ++++ WindowMaker-0.95.6/WINGs/dragcommon.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -390,10 +390,10 @@ Index: WindowMaker-0.95.5/WINGs/dragcommon.c #include "WINGsP.h" #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion -Index: WindowMaker-0.95.5/WINGs/dragdestination.c +Index: WindowMaker-0.95.6/WINGs/dragdestination.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/dragdestination.c -+++ WindowMaker-0.95.5/WINGs/dragdestination.c +--- WindowMaker-0.95.6.orig/WINGs/dragdestination.c ++++ WindowMaker-0.95.6/WINGs/dragdestination.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -403,10 +403,10 @@ Index: WindowMaker-0.95.5/WINGs/dragdestination.c #include "WINGsP.h" #include -Index: WindowMaker-0.95.5/WINGs/dragsource.c +Index: WindowMaker-0.95.6/WINGs/dragsource.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/dragsource.c -+++ WindowMaker-0.95.5/WINGs/dragsource.c +--- WindowMaker-0.95.6.orig/WINGs/dragsource.c ++++ WindowMaker-0.95.6/WINGs/dragsource.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -416,10 +416,10 @@ Index: WindowMaker-0.95.5/WINGs/dragsource.c #include "wconfig.h" #include "WINGsP.h" -Index: WindowMaker-0.95.5/WINGs/error.c +Index: WindowMaker-0.95.6/WINGs/error.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/error.c -+++ WindowMaker-0.95.5/WINGs/error.c +--- WindowMaker-0.95.6.orig/WINGs/error.c ++++ WindowMaker-0.95.6/WINGs/error.c @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */ @@ -431,10 +431,10 @@ Index: WindowMaker-0.95.5/WINGs/error.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/WINGs/findfile.c +Index: WindowMaker-0.95.6/WINGs/findfile.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/findfile.c -+++ WindowMaker-0.95.5/WINGs/findfile.c +--- WindowMaker-0.95.6.orig/WINGs/findfile.c ++++ WindowMaker-0.95.6/WINGs/findfile.c @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */ @@ -446,10 +446,10 @@ Index: WindowMaker-0.95.5/WINGs/findfile.c #include "wconfig.h" #include "WUtil.h" -Index: WindowMaker-0.95.5/WINGs/handlers.c +Index: WindowMaker-0.95.6/WINGs/handlers.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/handlers.c -+++ WindowMaker-0.95.5/WINGs/handlers.c +--- WindowMaker-0.95.6.orig/WINGs/handlers.c ++++ WindowMaker-0.95.6/WINGs/handlers.c @@ -3,6 +3,10 @@ * WINGs internal handlers: timer, idle and input handlers */ @@ -461,10 +461,10 @@ Index: WindowMaker-0.95.5/WINGs/handlers.c #include "wconfig.h" #include "WINGsP.h" -Index: WindowMaker-0.95.5/WINGs/hashtable.c +Index: WindowMaker-0.95.6/WINGs/hashtable.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/hashtable.c -+++ WindowMaker-0.95.5/WINGs/hashtable.c +--- WindowMaker-0.95.6.orig/WINGs/hashtable.c ++++ WindowMaker-0.95.6/WINGs/hashtable.c @@ -1,5 +1,9 @@ #include @@ -475,10 +475,10 @@ Index: WindowMaker-0.95.5/WINGs/hashtable.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/memory.c +Index: WindowMaker-0.95.6/WINGs/memory.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/memory.c -+++ WindowMaker-0.95.5/WINGs/memory.c +--- WindowMaker-0.95.6.orig/WINGs/memory.c ++++ WindowMaker-0.95.6/WINGs/memory.c @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */ @@ -490,11 +490,11 @@ Index: WindowMaker-0.95.5/WINGs/memory.c #include "wconfig.h" #include "WUtil.h" -Index: WindowMaker-0.95.5/WINGs/misc.c +Index: WindowMaker-0.95.6/WINGs/misc.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/misc.c -+++ WindowMaker-0.95.5/WINGs/misc.c -@@ -1,6 +1,10 @@ +--- WindowMaker-0.95.6.orig/WINGs/misc.c ++++ WindowMaker-0.95.6/WINGs/misc.c +@@ -20,6 +20,10 @@ /* Miscelaneous helper functions */ @@ -502,13 +502,13 @@ Index: WindowMaker-0.95.5/WINGs/misc.c +#include "config.h" +#endif + - #include "WINGsP.h" + #include - WMRange wmkrange(int start, int count) -Index: WindowMaker-0.95.5/WINGs/notification.c + #include "error.h" +Index: WindowMaker-0.95.6/WINGs/notification.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/notification.c -+++ WindowMaker-0.95.5/WINGs/notification.c +--- WindowMaker-0.95.6.orig/WINGs/notification.c ++++ WindowMaker-0.95.6/WINGs/notification.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -518,10 +518,10 @@ Index: WindowMaker-0.95.5/WINGs/notification.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/proplist.c +Index: WindowMaker-0.95.6/WINGs/proplist.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/proplist.c -+++ WindowMaker-0.95.5/WINGs/proplist.c +--- WindowMaker-0.95.6.orig/WINGs/proplist.c ++++ WindowMaker-0.95.6/WINGs/proplist.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -531,10 +531,10 @@ Index: WindowMaker-0.95.5/WINGs/proplist.c #include #include -Index: WindowMaker-0.95.5/WINGs/selection.c +Index: WindowMaker-0.95.6/WINGs/selection.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/selection.c -+++ WindowMaker-0.95.5/WINGs/selection.c +--- WindowMaker-0.95.6.orig/WINGs/selection.c ++++ WindowMaker-0.95.6/WINGs/selection.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -544,10 +544,10 @@ Index: WindowMaker-0.95.5/WINGs/selection.c #include #include -Index: WindowMaker-0.95.5/WINGs/string.c +Index: WindowMaker-0.95.6/WINGs/string.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/string.c -+++ WindowMaker-0.95.5/WINGs/string.c +--- WindowMaker-0.95.6.orig/WINGs/string.c ++++ WindowMaker-0.95.6/WINGs/string.c @@ -6,6 +6,10 @@ # undef _XOPEN_SOURCE #endif @@ -559,10 +559,10 @@ Index: WindowMaker-0.95.5/WINGs/string.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/WINGs/tree.c +Index: WindowMaker-0.95.6/WINGs/tree.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/tree.c -+++ WindowMaker-0.95.5/WINGs/tree.c +--- WindowMaker-0.95.6.orig/WINGs/tree.c ++++ WindowMaker-0.95.6/WINGs/tree.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -572,10 +572,10 @@ Index: WindowMaker-0.95.5/WINGs/tree.c #include #include "WUtil.h" -Index: WindowMaker-0.95.5/WINGs/userdefaults.c +Index: WindowMaker-0.95.6/WINGs/userdefaults.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/userdefaults.c -+++ WindowMaker-0.95.5/WINGs/userdefaults.c +--- WindowMaker-0.95.6.orig/WINGs/userdefaults.c ++++ WindowMaker-0.95.6/WINGs/userdefaults.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -585,10 +585,10 @@ Index: WindowMaker-0.95.5/WINGs/userdefaults.c #include #include #include -Index: WindowMaker-0.95.5/WINGs/usleep.c +Index: WindowMaker-0.95.6/WINGs/usleep.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/usleep.c -+++ WindowMaker-0.95.5/WINGs/usleep.c +--- WindowMaker-0.95.6.orig/WINGs/usleep.c ++++ WindowMaker-0.95.6/WINGs/usleep.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -598,10 +598,10 @@ Index: WindowMaker-0.95.5/WINGs/usleep.c #include #include -Index: WindowMaker-0.95.5/WINGs/wapplication.c +Index: WindowMaker-0.95.6/WINGs/wapplication.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wapplication.c -+++ WindowMaker-0.95.5/WINGs/wapplication.c +--- WindowMaker-0.95.6.orig/WINGs/wapplication.c ++++ WindowMaker-0.95.6/WINGs/wapplication.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -611,10 +611,10 @@ Index: WindowMaker-0.95.5/WINGs/wapplication.c #include #include -Index: WindowMaker-0.95.5/WINGs/wappresource.c +Index: WindowMaker-0.95.6/WINGs/wappresource.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wappresource.c -+++ WindowMaker-0.95.5/WINGs/wappresource.c +--- WindowMaker-0.95.6.orig/WINGs/wappresource.c ++++ WindowMaker-0.95.6/WINGs/wappresource.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -624,10 +624,10 @@ Index: WindowMaker-0.95.5/WINGs/wappresource.c #include #include "WINGsP.h" -Index: WindowMaker-0.95.5/WINGs/wballoon.c +Index: WindowMaker-0.95.6/WINGs/wballoon.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wballoon.c -+++ WindowMaker-0.95.5/WINGs/wballoon.c +--- WindowMaker-0.95.6.orig/WINGs/wballoon.c ++++ WindowMaker-0.95.6/WINGs/wballoon.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -637,10 +637,10 @@ Index: WindowMaker-0.95.5/WINGs/wballoon.c #include "wconfig.h" #include "WINGsP.h" -Index: WindowMaker-0.95.5/WINGs/wbox.c +Index: WindowMaker-0.95.6/WINGs/wbox.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wbox.c -+++ WindowMaker-0.95.5/WINGs/wbox.c +--- WindowMaker-0.95.6.orig/WINGs/wbox.c ++++ WindowMaker-0.95.6/WINGs/wbox.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -650,10 +650,10 @@ Index: WindowMaker-0.95.5/WINGs/wbox.c #include "WINGsP.h" typedef struct { -Index: WindowMaker-0.95.5/WINGs/wbrowser.c +Index: WindowMaker-0.95.6/WINGs/wbrowser.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wbrowser.c -+++ WindowMaker-0.95.5/WINGs/wbrowser.c +--- WindowMaker-0.95.6.orig/WINGs/wbrowser.c ++++ WindowMaker-0.95.6/WINGs/wbrowser.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -663,10 +663,10 @@ Index: WindowMaker-0.95.5/WINGs/wbrowser.c #include "WINGsP.h" #include /* for : double rint (double) */ -Index: WindowMaker-0.95.5/WINGs/wbutton.c +Index: WindowMaker-0.95.6/WINGs/wbutton.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wbutton.c -+++ WindowMaker-0.95.5/WINGs/wbutton.c +--- WindowMaker-0.95.6.orig/WINGs/wbutton.c ++++ WindowMaker-0.95.6/WINGs/wbutton.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -676,10 +676,10 @@ Index: WindowMaker-0.95.5/WINGs/wbutton.c #include "WINGsP.h" typedef struct W_Button { -Index: WindowMaker-0.95.5/WINGs/wcolor.c +Index: WindowMaker-0.95.6/WINGs/wcolor.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wcolor.c -+++ WindowMaker-0.95.5/WINGs/wcolor.c +--- WindowMaker-0.95.6.orig/WINGs/wcolor.c ++++ WindowMaker-0.95.6/WINGs/wcolor.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -689,10 +689,10 @@ Index: WindowMaker-0.95.5/WINGs/wcolor.c #include "WINGsP.h" #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/wcolorpanel.c +Index: WindowMaker-0.95.6/WINGs/wcolorpanel.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wcolorpanel.c -+++ WindowMaker-0.95.5/WINGs/wcolorpanel.c +--- WindowMaker-0.95.6.orig/WINGs/wcolorpanel.c ++++ WindowMaker-0.95.6/WINGs/wcolorpanel.c @@ -23,6 +23,10 @@ * - Resizing */ @@ -704,10 +704,10 @@ Index: WindowMaker-0.95.5/WINGs/wcolorpanel.c #include "wconfig.h" #include "WINGsP.h" #include "rgb.h" -Index: WindowMaker-0.95.5/WINGs/wcolorwell.c +Index: WindowMaker-0.95.6/WINGs/wcolorwell.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wcolorwell.c -+++ WindowMaker-0.95.5/WINGs/wcolorwell.c +--- WindowMaker-0.95.6.orig/WINGs/wcolorwell.c ++++ WindowMaker-0.95.6/WINGs/wcolorwell.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -717,10 +717,10 @@ Index: WindowMaker-0.95.5/WINGs/wcolorwell.c #include "WINGsP.h" #define XDND_COLOR_DATA_TYPE "application/X-color" -Index: WindowMaker-0.95.5/WINGs/wevent.c +Index: WindowMaker-0.95.6/WINGs/wevent.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wevent.c -+++ WindowMaker-0.95.5/WINGs/wevent.c +--- WindowMaker-0.95.6.orig/WINGs/wevent.c ++++ WindowMaker-0.95.6/WINGs/wevent.c @@ -3,6 +3,10 @@ * This event handling stuff was inspired on Tk. */ @@ -732,10 +732,10 @@ Index: WindowMaker-0.95.5/WINGs/wevent.c #include "WINGsP.h" /* table to map event types to event masks */ -Index: WindowMaker-0.95.5/WINGs/wfilepanel.c +Index: WindowMaker-0.95.6/WINGs/wfilepanel.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wfilepanel.c -+++ WindowMaker-0.95.5/WINGs/wfilepanel.c +--- WindowMaker-0.95.6.orig/WINGs/wfilepanel.c ++++ WindowMaker-0.95.6/WINGs/wfilepanel.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -745,10 +745,10 @@ Index: WindowMaker-0.95.5/WINGs/wfilepanel.c #include #include -Index: WindowMaker-0.95.5/WINGs/wfont.c +Index: WindowMaker-0.95.6/WINGs/wfont.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wfont.c -+++ WindowMaker-0.95.5/WINGs/wfont.c +--- WindowMaker-0.95.6.orig/WINGs/wfont.c ++++ WindowMaker-0.95.6/WINGs/wfont.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -758,10 +758,10 @@ Index: WindowMaker-0.95.5/WINGs/wfont.c #include #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/wfontpanel.c +Index: WindowMaker-0.95.6/WINGs/wfontpanel.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wfontpanel.c -+++ WindowMaker-0.95.5/WINGs/wfontpanel.c +--- WindowMaker-0.95.6.orig/WINGs/wfontpanel.c ++++ WindowMaker-0.95.6/WINGs/wfontpanel.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -771,10 +771,10 @@ Index: WindowMaker-0.95.5/WINGs/wfontpanel.c #include "WINGsP.h" #include "WUtil.h" #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/wframe.c +Index: WindowMaker-0.95.6/WINGs/wframe.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wframe.c -+++ WindowMaker-0.95.5/WINGs/wframe.c +--- WindowMaker-0.95.6.orig/WINGs/wframe.c ++++ WindowMaker-0.95.6/WINGs/wframe.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -784,10 +784,10 @@ Index: WindowMaker-0.95.5/WINGs/wframe.c #include "WINGsP.h" typedef struct W_Frame { -Index: WindowMaker-0.95.5/WINGs/widgets.c +Index: WindowMaker-0.95.6/WINGs/widgets.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/widgets.c -+++ WindowMaker-0.95.5/WINGs/widgets.c +--- WindowMaker-0.95.6.orig/WINGs/widgets.c ++++ WindowMaker-0.95.6/WINGs/widgets.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -797,10 +797,10 @@ Index: WindowMaker-0.95.5/WINGs/widgets.c #include "WINGsP.h" #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/winputmethod.c +Index: WindowMaker-0.95.6/WINGs/winputmethod.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/winputmethod.c -+++ WindowMaker-0.95.5/WINGs/winputmethod.c +--- WindowMaker-0.95.6.orig/WINGs/winputmethod.c ++++ WindowMaker-0.95.6/WINGs/winputmethod.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -810,10 +810,10 @@ Index: WindowMaker-0.95.5/WINGs/winputmethod.c #include #include "WINGsP.h" -Index: WindowMaker-0.95.5/WINGs/wlabel.c +Index: WindowMaker-0.95.6/WINGs/wlabel.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wlabel.c -+++ WindowMaker-0.95.5/WINGs/wlabel.c +--- WindowMaker-0.95.6.orig/WINGs/wlabel.c ++++ WindowMaker-0.95.6/WINGs/wlabel.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -823,10 +823,10 @@ Index: WindowMaker-0.95.5/WINGs/wlabel.c #include "WINGsP.h" typedef struct W_Label { -Index: WindowMaker-0.95.5/WINGs/wlist.c +Index: WindowMaker-0.95.6/WINGs/wlist.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wlist.c -+++ WindowMaker-0.95.5/WINGs/wlist.c +--- WindowMaker-0.95.6.orig/WINGs/wlist.c ++++ WindowMaker-0.95.6/WINGs/wlist.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -836,10 +836,10 @@ Index: WindowMaker-0.95.5/WINGs/wlist.c #include "WINGsP.h" char *WMListDidScrollNotification = "WMListDidScrollNotification"; -Index: WindowMaker-0.95.5/WINGs/wmenuitem.c +Index: WindowMaker-0.95.6/WINGs/wmenuitem.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wmenuitem.c -+++ WindowMaker-0.95.5/WINGs/wmenuitem.c +--- WindowMaker-0.95.6.orig/WINGs/wmenuitem.c ++++ WindowMaker-0.95.6/WINGs/wmenuitem.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -849,10 +849,10 @@ Index: WindowMaker-0.95.5/WINGs/wmenuitem.c #include "WINGsP.h" typedef struct W_MenuItem { -Index: WindowMaker-0.95.5/WINGs/wmisc.c +Index: WindowMaker-0.95.6/WINGs/wmisc.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wmisc.c -+++ WindowMaker-0.95.5/WINGs/wmisc.c +--- WindowMaker-0.95.6.orig/WINGs/wmisc.c ++++ WindowMaker-0.95.6/WINGs/wmisc.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -862,10 +862,10 @@ Index: WindowMaker-0.95.5/WINGs/wmisc.c #include "WINGsP.h" #include -Index: WindowMaker-0.95.5/WINGs/wpanel.c +Index: WindowMaker-0.95.6/WINGs/wpanel.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wpanel.c -+++ WindowMaker-0.95.5/WINGs/wpanel.c +--- WindowMaker-0.95.6.orig/WINGs/wpanel.c ++++ WindowMaker-0.95.6/WINGs/wpanel.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -875,10 +875,10 @@ Index: WindowMaker-0.95.5/WINGs/wpanel.c #include "WINGsP.h" #include -Index: WindowMaker-0.95.5/WINGs/wpixmap.c +Index: WindowMaker-0.95.6/WINGs/wpixmap.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wpixmap.c -+++ WindowMaker-0.95.5/WINGs/wpixmap.c +--- WindowMaker-0.95.6.orig/WINGs/wpixmap.c ++++ WindowMaker-0.95.6/WINGs/wpixmap.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -888,10 +888,10 @@ Index: WindowMaker-0.95.5/WINGs/wpixmap.c #include "WINGsP.h" #include -Index: WindowMaker-0.95.5/WINGs/wpopupbutton.c +Index: WindowMaker-0.95.6/WINGs/wpopupbutton.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wpopupbutton.c -+++ WindowMaker-0.95.5/WINGs/wpopupbutton.c +--- WindowMaker-0.95.6.orig/WINGs/wpopupbutton.c ++++ WindowMaker-0.95.6/WINGs/wpopupbutton.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -901,10 +901,10 @@ Index: WindowMaker-0.95.5/WINGs/wpopupbutton.c #include "WINGsP.h" typedef struct W_PopUpButton { -Index: WindowMaker-0.95.5/WINGs/wprogressindicator.c +Index: WindowMaker-0.95.6/WINGs/wprogressindicator.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wprogressindicator.c -+++ WindowMaker-0.95.5/WINGs/wprogressindicator.c +--- WindowMaker-0.95.6.orig/WINGs/wprogressindicator.c ++++ WindowMaker-0.95.6/WINGs/wprogressindicator.c @@ -5,6 +5,10 @@ * - centralized drawing into one pain function */ @@ -916,10 +916,10 @@ Index: WindowMaker-0.95.5/WINGs/wprogressindicator.c #include "WINGsP.h" typedef struct W_ProgressIndicator { -Index: WindowMaker-0.95.5/WINGs/wruler.c +Index: WindowMaker-0.95.6/WINGs/wruler.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wruler.c -+++ WindowMaker-0.95.5/WINGs/wruler.c +--- WindowMaker-0.95.6.orig/WINGs/wruler.c ++++ WindowMaker-0.95.6/WINGs/wruler.c @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */ @@ -931,10 +931,10 @@ Index: WindowMaker-0.95.5/WINGs/wruler.c #include "WINGsP.h" #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/wscroller.c +Index: WindowMaker-0.95.6/WINGs/wscroller.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wscroller.c -+++ WindowMaker-0.95.5/WINGs/wscroller.c +--- WindowMaker-0.95.6.orig/WINGs/wscroller.c ++++ WindowMaker-0.95.6/WINGs/wscroller.c @@ -7,6 +7,10 @@ # undef _XOPEN_SOURCE #endif @@ -946,10 +946,10 @@ Index: WindowMaker-0.95.5/WINGs/wscroller.c #include "WINGsP.h" #include -Index: WindowMaker-0.95.5/WINGs/wscrollview.c +Index: WindowMaker-0.95.6/WINGs/wscrollview.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wscrollview.c -+++ WindowMaker-0.95.5/WINGs/wscrollview.c +--- WindowMaker-0.95.6.orig/WINGs/wscrollview.c ++++ WindowMaker-0.95.6/WINGs/wscrollview.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -959,10 +959,10 @@ Index: WindowMaker-0.95.5/WINGs/wscrollview.c #include "WINGsP.h" typedef struct W_ScrollView { -Index: WindowMaker-0.95.5/WINGs/wslider.c +Index: WindowMaker-0.95.6/WINGs/wslider.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wslider.c -+++ WindowMaker-0.95.5/WINGs/wslider.c +--- WindowMaker-0.95.6.orig/WINGs/wslider.c ++++ WindowMaker-0.95.6/WINGs/wslider.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -972,10 +972,10 @@ Index: WindowMaker-0.95.5/WINGs/wslider.c #include "WINGsP.h" #undef STRICT_NEXT_BEHAVIOUR -Index: WindowMaker-0.95.5/WINGs/wsplitview.c +Index: WindowMaker-0.95.6/WINGs/wsplitview.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wsplitview.c -+++ WindowMaker-0.95.5/WINGs/wsplitview.c +--- WindowMaker-0.95.6.orig/WINGs/wsplitview.c ++++ WindowMaker-0.95.6/WINGs/wsplitview.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -985,10 +985,10 @@ Index: WindowMaker-0.95.5/WINGs/wsplitview.c #include "WINGsP.h" /* -Index: WindowMaker-0.95.5/WINGs/wtabview.c +Index: WindowMaker-0.95.6/WINGs/wtabview.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wtabview.c -+++ WindowMaker-0.95.5/WINGs/wtabview.c +--- WindowMaker-0.95.6.orig/WINGs/wtabview.c ++++ WindowMaker-0.95.6/WINGs/wtabview.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -998,10 +998,10 @@ Index: WindowMaker-0.95.5/WINGs/wtabview.c #include "WINGsP.h" typedef struct W_TabView { -Index: WindowMaker-0.95.5/WINGs/wtext.c +Index: WindowMaker-0.95.6/WINGs/wtext.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wtext.c -+++ WindowMaker-0.95.5/WINGs/wtext.c +--- WindowMaker-0.95.6.orig/WINGs/wtext.c ++++ WindowMaker-0.95.6/WINGs/wtext.c @@ -1,6 +1,10 @@ /* WINGs WMText: multi-line/font/color/graphic text widget, by Nwanua. */ @@ -1013,10 +1013,10 @@ Index: WindowMaker-0.95.5/WINGs/wtext.c #include "WINGsP.h" #include #include -Index: WindowMaker-0.95.5/WINGs/wtextfield.c +Index: WindowMaker-0.95.6/WINGs/wtextfield.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wtextfield.c -+++ WindowMaker-0.95.5/WINGs/wtextfield.c +--- WindowMaker-0.95.6.orig/WINGs/wtextfield.c ++++ WindowMaker-0.95.6/WINGs/wtextfield.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1026,10 +1026,10 @@ Index: WindowMaker-0.95.5/WINGs/wtextfield.c #include "WINGsP.h" #include "wconfig.h" -Index: WindowMaker-0.95.5/WINGs/wutil.c +Index: WindowMaker-0.95.6/WINGs/wutil.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wutil.c -+++ WindowMaker-0.95.5/WINGs/wutil.c +--- WindowMaker-0.95.6.orig/WINGs/wutil.c ++++ WindowMaker-0.95.6/WINGs/wutil.c @@ -3,6 +3,10 @@ * Handle events for non-GUI based applications */ @@ -1041,10 +1041,10 @@ Index: WindowMaker-0.95.5/WINGs/wutil.c #include "WINGsP.h" void WHandleEvents() -Index: WindowMaker-0.95.5/WINGs/wview.c +Index: WindowMaker-0.95.6/WINGs/wview.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wview.c -+++ WindowMaker-0.95.5/WINGs/wview.c +--- WindowMaker-0.95.6.orig/WINGs/wview.c ++++ WindowMaker-0.95.6/WINGs/wview.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1054,10 +1054,10 @@ Index: WindowMaker-0.95.5/WINGs/wview.c #include "WINGsP.h" #include -Index: WindowMaker-0.95.5/WINGs/wwindow.c +Index: WindowMaker-0.95.6/WINGs/wwindow.c =================================================================== ---- WindowMaker-0.95.5.orig/WINGs/wwindow.c -+++ WindowMaker-0.95.5/WINGs/wwindow.c +--- WindowMaker-0.95.6.orig/WINGs/wwindow.c ++++ WindowMaker-0.95.6/WINGs/wwindow.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1067,10 +1067,10 @@ Index: WindowMaker-0.95.5/WINGs/wwindow.c #include #include "WINGsP.h" -Index: WindowMaker-0.95.5/WPrefs.app/Appearance.c +Index: WindowMaker-0.95.6/WPrefs.app/Appearance.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Appearance.c -+++ WindowMaker-0.95.5/WPrefs.app/Appearance.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Appearance.c ++++ WindowMaker-0.95.6/WPrefs.app/Appearance.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1082,10 +1082,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Appearance.c #include "WPrefs.h" #include -Index: WindowMaker-0.95.5/WPrefs.app/Configurations.c +Index: WindowMaker-0.95.6/WPrefs.app/Configurations.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Configurations.c -+++ WindowMaker-0.95.5/WPrefs.app/Configurations.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Configurations.c ++++ WindowMaker-0.95.6/WPrefs.app/Configurations.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1097,11 +1097,11 @@ Index: WindowMaker-0.95.5/WPrefs.app/Configurations.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/Expert.c +Index: WindowMaker-0.95.6/WPrefs.app/Expert.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Expert.c -+++ WindowMaker-0.95.5/WPrefs.app/Expert.c -@@ -19,6 +19,10 @@ +--- WindowMaker-0.95.6.orig/WPrefs.app/Expert.c ++++ WindowMaker-0.95.6/WPrefs.app/Expert.c +@@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1112,10 +1112,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Expert.c #include "WPrefs.h" /* This structure containts the list of all the check-buttons to display in the -Index: WindowMaker-0.95.5/WPrefs.app/Focus.c +Index: WindowMaker-0.95.6/WPrefs.app/Focus.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Focus.c -+++ WindowMaker-0.95.5/WPrefs.app/Focus.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Focus.c ++++ WindowMaker-0.95.6/WPrefs.app/Focus.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1127,10 +1127,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Focus.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/FontSimple.c +Index: WindowMaker-0.95.6/WPrefs.app/FontSimple.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/FontSimple.c -+++ WindowMaker-0.95.5/WPrefs.app/FontSimple.c +--- WindowMaker-0.95.6.orig/WPrefs.app/FontSimple.c ++++ WindowMaker-0.95.6/WPrefs.app/FontSimple.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1142,10 +1142,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/FontSimple.c #include "WPrefs.h" #include #include -Index: WindowMaker-0.95.5/WPrefs.app/Icons.c +Index: WindowMaker-0.95.6/WPrefs.app/Icons.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Icons.c -+++ WindowMaker-0.95.5/WPrefs.app/Icons.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Icons.c ++++ WindowMaker-0.95.6/WPrefs.app/Icons.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1157,10 +1157,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Icons.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c +Index: WindowMaker-0.95.6/WPrefs.app/KeyboardSettings.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/KeyboardSettings.c -+++ WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c +--- WindowMaker-0.95.6.orig/WPrefs.app/KeyboardSettings.c ++++ WindowMaker-0.95.6/WPrefs.app/KeyboardSettings.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1172,10 +1172,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/KeyboardSettings.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/Menu.c +Index: WindowMaker-0.95.6/WPrefs.app/Menu.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Menu.c -+++ WindowMaker-0.95.5/WPrefs.app/Menu.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Menu.c ++++ WindowMaker-0.95.6/WPrefs.app/Menu.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1187,10 +1187,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Menu.c #include "WPrefs.h" #include #include -Index: WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c +Index: WindowMaker-0.95.6/WPrefs.app/MenuPreferences.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/MenuPreferences.c -+++ WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c +--- WindowMaker-0.95.6.orig/WPrefs.app/MenuPreferences.c ++++ WindowMaker-0.95.6/WPrefs.app/MenuPreferences.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1202,10 +1202,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/MenuPreferences.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/MouseSettings.c +Index: WindowMaker-0.95.6/WPrefs.app/MouseSettings.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/MouseSettings.c -+++ WindowMaker-0.95.5/WPrefs.app/MouseSettings.c +--- WindowMaker-0.95.6.orig/WPrefs.app/MouseSettings.c ++++ WindowMaker-0.95.6/WPrefs.app/MouseSettings.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1217,10 +1217,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/MouseSettings.c #include "WPrefs.h" #include -Index: WindowMaker-0.95.5/WPrefs.app/Paths.c +Index: WindowMaker-0.95.6/WPrefs.app/Paths.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Paths.c -+++ WindowMaker-0.95.5/WPrefs.app/Paths.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Paths.c ++++ WindowMaker-0.95.6/WPrefs.app/Paths.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1232,10 +1232,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Paths.c #include "WPrefs.h" #include #include -Index: WindowMaker-0.95.5/WPrefs.app/Preferences.c +Index: WindowMaker-0.95.6/WPrefs.app/Preferences.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Preferences.c -+++ WindowMaker-0.95.5/WPrefs.app/Preferences.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Preferences.c ++++ WindowMaker-0.95.6/WPrefs.app/Preferences.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1247,10 +1247,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Preferences.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/TexturePanel.c +Index: WindowMaker-0.95.6/WPrefs.app/TexturePanel.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/TexturePanel.c -+++ WindowMaker-0.95.5/WPrefs.app/TexturePanel.c +--- WindowMaker-0.95.6.orig/WPrefs.app/TexturePanel.c ++++ WindowMaker-0.95.6/WPrefs.app/TexturePanel.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1262,10 +1262,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/TexturePanel.c #include #include #include -Index: WindowMaker-0.95.5/WPrefs.app/Themes.c +Index: WindowMaker-0.95.6/WPrefs.app/Themes.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Themes.c -+++ WindowMaker-0.95.5/WPrefs.app/Themes.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Themes.c ++++ WindowMaker-0.95.6/WPrefs.app/Themes.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1277,13 +1277,13 @@ Index: WindowMaker-0.95.5/WPrefs.app/Themes.c #include "WPrefs.h" #include -Index: WindowMaker-0.95.5/WPrefs.app/WPrefs.c +Index: WindowMaker-0.95.6/WPrefs.app/WPrefs.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/WPrefs.c -+++ WindowMaker-0.95.5/WPrefs.app/WPrefs.c -@@ -19,6 +19,10 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ +--- WindowMaker-0.95.6.orig/WPrefs.app/WPrefs.c ++++ WindowMaker-0.95.6/WPrefs.app/WPrefs.c +@@ -21,6 +21,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -1292,10 +1292,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/WPrefs.c #include "WPrefs.h" #include -Index: WindowMaker-0.95.5/WPrefs.app/WindowHandling.c +Index: WindowMaker-0.95.6/WPrefs.app/WindowHandling.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/WindowHandling.c -+++ WindowMaker-0.95.5/WPrefs.app/WindowHandling.c +--- WindowMaker-0.95.6.orig/WPrefs.app/WindowHandling.c ++++ WindowMaker-0.95.6/WPrefs.app/WindowHandling.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1307,10 +1307,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/WindowHandling.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/Workspace.c +Index: WindowMaker-0.95.6/WPrefs.app/Workspace.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/Workspace.c -+++ WindowMaker-0.95.5/WPrefs.app/Workspace.c +--- WindowMaker-0.95.6.orig/WPrefs.app/Workspace.c ++++ WindowMaker-0.95.6/WPrefs.app/Workspace.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1322,10 +1322,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/Workspace.c #include "WPrefs.h" typedef struct _Panel { -Index: WindowMaker-0.95.5/WPrefs.app/double.c +Index: WindowMaker-0.95.6/WPrefs.app/double.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/double.c -+++ WindowMaker-0.95.5/WPrefs.app/double.c +--- WindowMaker-0.95.6.orig/WPrefs.app/double.c ++++ WindowMaker-0.95.6/WPrefs.app/double.c @@ -4,6 +4,10 @@ * */ @@ -1337,10 +1337,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/double.c #include #include "WPrefs.h" -Index: WindowMaker-0.95.5/WPrefs.app/editmenu.c +Index: WindowMaker-0.95.6/WPrefs.app/editmenu.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/editmenu.c -+++ WindowMaker-0.95.5/WPrefs.app/editmenu.c +--- WindowMaker-0.95.6.orig/WPrefs.app/editmenu.c ++++ WindowMaker-0.95.6/WPrefs.app/editmenu.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1352,13 +1352,13 @@ Index: WindowMaker-0.95.5/WPrefs.app/editmenu.c #include #include #include -Index: WindowMaker-0.95.5/WPrefs.app/main.c +Index: WindowMaker-0.95.6/WPrefs.app/main.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/main.c -+++ WindowMaker-0.95.5/WPrefs.app/main.c -@@ -18,6 +18,10 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ +--- WindowMaker-0.95.6.orig/WPrefs.app/main.c ++++ WindowMaker-0.95.6/WPrefs.app/main.c +@@ -20,6 +20,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -1367,10 +1367,10 @@ Index: WindowMaker-0.95.5/WPrefs.app/main.c #include "WPrefs.h" #include -Index: WindowMaker-0.95.5/WPrefs.app/xmodifier.c +Index: WindowMaker-0.95.6/WPrefs.app/xmodifier.c =================================================================== ---- WindowMaker-0.95.5.orig/WPrefs.app/xmodifier.c -+++ WindowMaker-0.95.5/WPrefs.app/xmodifier.c +--- WindowMaker-0.95.6.orig/WPrefs.app/xmodifier.c ++++ WindowMaker-0.95.6/WPrefs.app/xmodifier.c @@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph #include #include -Index: WindowMaker-0.95.5/configure.ac +Index: WindowMaker-0.95.6/configure.ac =================================================================== ---- WindowMaker-0.95.5.orig/configure.ac -+++ WindowMaker-0.95.5/configure.ac -@@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by +--- WindowMaker-0.95.6.orig/configure.ac ++++ WindowMaker-0.95.6/configure.ac +@@ -67,7 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by dnl Checks for programs. dnl =================== --AC_ISC_POSIX -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE + WM_PROG_CC_C11 AC_PROG_LN_S AC_PROG_GCC_TRADITIONAL - AC_PROG_LIBTOOL -Index: WindowMaker-0.95.5/src/actions.c +Index: WindowMaker-0.95.6/src/actions.c =================================================================== ---- WindowMaker-0.95.5.orig/src/actions.c -+++ WindowMaker-0.95.5/src/actions.c -@@ -20,6 +20,10 @@ +--- WindowMaker-0.95.6.orig/src/actions.c ++++ WindowMaker-0.95.6/src/actions.c +@@ -21,6 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1413,10 +1412,10 @@ Index: WindowMaker-0.95.5/src/actions.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/appicon.c +Index: WindowMaker-0.95.6/src/appicon.c =================================================================== ---- WindowMaker-0.95.5.orig/src/appicon.c -+++ WindowMaker-0.95.5/src/appicon.c +--- WindowMaker-0.95.6.orig/src/appicon.c ++++ WindowMaker-0.95.6/src/appicon.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1428,10 +1427,10 @@ Index: WindowMaker-0.95.5/src/appicon.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/application.c +Index: WindowMaker-0.95.6/src/application.c =================================================================== ---- WindowMaker-0.95.5.orig/src/application.c -+++ WindowMaker-0.95.5/src/application.c +--- WindowMaker-0.95.6.orig/src/application.c ++++ WindowMaker-0.95.6/src/application.c @@ -18,6 +18,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1443,10 +1442,10 @@ Index: WindowMaker-0.95.5/src/application.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/appmenu.c +Index: WindowMaker-0.95.6/src/appmenu.c =================================================================== ---- WindowMaker-0.95.5.orig/src/appmenu.c -+++ WindowMaker-0.95.5/src/appmenu.c +--- WindowMaker-0.95.6.orig/src/appmenu.c ++++ WindowMaker-0.95.6/src/appmenu.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1458,11 +1457,11 @@ Index: WindowMaker-0.95.5/src/appmenu.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/balloon.c +Index: WindowMaker-0.95.6/src/balloon.c =================================================================== ---- WindowMaker-0.95.5.orig/src/balloon.c -+++ WindowMaker-0.95.5/src/balloon.c -@@ -18,6 +18,10 @@ +--- WindowMaker-0.95.6.orig/src/balloon.c ++++ WindowMaker-0.95.6/src/balloon.c +@@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1473,10 +1472,10 @@ Index: WindowMaker-0.95.5/src/balloon.c #include "wconfig.h" #ifdef BALLOON_TEXT -Index: WindowMaker-0.95.5/src/client.c +Index: WindowMaker-0.95.6/src/client.c =================================================================== ---- WindowMaker-0.95.5.orig/src/client.c -+++ WindowMaker-0.95.5/src/client.c +--- WindowMaker-0.95.6.orig/src/client.c ++++ WindowMaker-0.95.6/src/client.c @@ -17,6 +17,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1488,10 +1487,10 @@ Index: WindowMaker-0.95.5/src/client.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/colormap.c +Index: WindowMaker-0.95.6/src/colormap.c =================================================================== ---- WindowMaker-0.95.5.orig/src/colormap.c -+++ WindowMaker-0.95.5/src/colormap.c +--- WindowMaker-0.95.6.orig/src/colormap.c ++++ WindowMaker-0.95.6/src/colormap.c @@ -23,6 +23,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1503,10 +1502,10 @@ Index: WindowMaker-0.95.5/src/colormap.c #include "wconfig.h" #include "WindowMaker.h" -Index: WindowMaker-0.95.5/src/cycling.c +Index: WindowMaker-0.95.6/src/cycling.c =================================================================== ---- WindowMaker-0.95.5.orig/src/cycling.c -+++ WindowMaker-0.95.5/src/cycling.c +--- WindowMaker-0.95.6.orig/src/cycling.c ++++ WindowMaker-0.95.6/src/cycling.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1518,10 +1517,10 @@ Index: WindowMaker-0.95.5/src/cycling.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/defaults.c +Index: WindowMaker-0.95.6/src/defaults.c =================================================================== ---- WindowMaker-0.95.5.orig/src/defaults.c -+++ WindowMaker-0.95.5/src/defaults.c +--- WindowMaker-0.95.6.orig/src/defaults.c ++++ WindowMaker-0.95.6/src/defaults.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1533,10 +1532,25 @@ Index: WindowMaker-0.95.5/src/defaults.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/dialog.c +Index: WindowMaker-0.95.6/src/dialog.c =================================================================== ---- WindowMaker-0.95.5.orig/src/dialog.c -+++ WindowMaker-0.95.5/src/dialog.c +--- WindowMaker-0.95.6.orig/src/dialog.c ++++ WindowMaker-0.95.6/src/dialog.c +@@ -21,6 +21,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include +Index: WindowMaker-0.95.6/src/dock.c +=================================================================== +--- WindowMaker-0.95.6.orig/src/dock.c ++++ WindowMaker-0.95.6/src/dock.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1548,44 +1562,29 @@ Index: WindowMaker-0.95.5/src/dialog.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/dock.c +Index: WindowMaker-0.95.6/src/dockedapp.c =================================================================== ---- WindowMaker-0.95.5.orig/src/dock.c -+++ WindowMaker-0.95.5/src/dock.c +--- WindowMaker-0.95.6.orig/src/dockedapp.c ++++ WindowMaker-0.95.6/src/dockedapp.c +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include +Index: WindowMaker-0.95.6/src/event.c +=================================================================== +--- WindowMaker-0.95.6.orig/src/event.c ++++ WindowMaker-0.95.6/src/event.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "wconfig.h" - - #include -Index: WindowMaker-0.95.5/src/dockedapp.c -=================================================================== ---- WindowMaker-0.95.5.orig/src/dockedapp.c -+++ WindowMaker-0.95.5/src/dockedapp.c -@@ -19,6 +19,10 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "wconfig.h" - - #include -Index: WindowMaker-0.95.5/src/event.c -=================================================================== ---- WindowMaker-0.95.5.orig/src/event.c -+++ WindowMaker-0.95.5/src/event.c -@@ -19,6 +19,10 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif @@ -1593,10 +1592,10 @@ Index: WindowMaker-0.95.5/src/event.c #include "wconfig.h" #ifdef HAVE_INOTIFY -Index: WindowMaker-0.95.5/src/framewin.c +Index: WindowMaker-0.95.6/src/framewin.c =================================================================== ---- WindowMaker-0.95.5.orig/src/framewin.c -+++ WindowMaker-0.95.5/src/framewin.c +--- WindowMaker-0.95.6.orig/src/framewin.c ++++ WindowMaker-0.95.6/src/framewin.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1608,10 +1607,10 @@ Index: WindowMaker-0.95.5/src/framewin.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/geomview.c +Index: WindowMaker-0.95.6/src/geomview.c =================================================================== ---- WindowMaker-0.95.5.orig/src/geomview.c -+++ WindowMaker-0.95.5/src/geomview.c +--- WindowMaker-0.95.6.orig/src/geomview.c ++++ WindowMaker-0.95.6/src/geomview.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1621,10 +1620,10 @@ Index: WindowMaker-0.95.5/src/geomview.c #include #include "geomview.h" -Index: WindowMaker-0.95.5/src/icon.c +Index: WindowMaker-0.95.6/src/icon.c =================================================================== ---- WindowMaker-0.95.5.orig/src/icon.c -+++ WindowMaker-0.95.5/src/icon.c +--- WindowMaker-0.95.6.orig/src/icon.c ++++ WindowMaker-0.95.6/src/icon.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1636,10 +1635,10 @@ Index: WindowMaker-0.95.5/src/icon.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/main.c +Index: WindowMaker-0.95.6/src/main.c =================================================================== ---- WindowMaker-0.95.5.orig/src/main.c -+++ WindowMaker-0.95.5/src/main.c +--- WindowMaker-0.95.6.orig/src/main.c ++++ WindowMaker-0.95.6/src/main.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1651,10 +1650,10 @@ Index: WindowMaker-0.95.5/src/main.c #include "wconfig.h" #ifdef HAVE_INOTIFY -Index: WindowMaker-0.95.5/src/menu.c +Index: WindowMaker-0.95.6/src/menu.c =================================================================== ---- WindowMaker-0.95.5.orig/src/menu.c -+++ WindowMaker-0.95.5/src/menu.c +--- WindowMaker-0.95.6.orig/src/menu.c ++++ WindowMaker-0.95.6/src/menu.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1666,10 +1665,10 @@ Index: WindowMaker-0.95.5/src/menu.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/misc.c +Index: WindowMaker-0.95.6/src/misc.c =================================================================== ---- WindowMaker-0.95.5.orig/src/misc.c -+++ WindowMaker-0.95.5/src/misc.c +--- WindowMaker-0.95.6.orig/src/misc.c ++++ WindowMaker-0.95.6/src/misc.c @@ -17,6 +17,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -1681,10 +1680,10 @@ Index: WindowMaker-0.95.5/src/misc.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/monitor.c +Index: WindowMaker-0.95.6/src/monitor.c =================================================================== ---- WindowMaker-0.95.5.orig/src/monitor.c -+++ WindowMaker-0.95.5/src/monitor.c +--- WindowMaker-0.95.6.orig/src/monitor.c ++++ WindowMaker-0.95.6/src/monitor.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1696,10 +1695,10 @@ Index: WindowMaker-0.95.5/src/monitor.c #include "wconfig.h" #include #include -Index: WindowMaker-0.95.5/src/motif.c +Index: WindowMaker-0.95.6/src/motif.c =================================================================== ---- WindowMaker-0.95.5.orig/src/motif.c -+++ WindowMaker-0.95.5/src/motif.c +--- WindowMaker-0.95.6.orig/src/motif.c ++++ WindowMaker-0.95.6/src/motif.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1711,10 +1710,10 @@ Index: WindowMaker-0.95.5/src/motif.c #include "wconfig.h" #ifdef MWM_HINTS -Index: WindowMaker-0.95.5/src/moveres.c +Index: WindowMaker-0.95.6/src/moveres.c =================================================================== ---- WindowMaker-0.95.5.orig/src/moveres.c -+++ WindowMaker-0.95.5/src/moveres.c +--- WindowMaker-0.95.6.orig/src/moveres.c ++++ WindowMaker-0.95.6/src/moveres.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1726,10 +1725,10 @@ Index: WindowMaker-0.95.5/src/moveres.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/osdep_bsd.c +Index: WindowMaker-0.95.6/src/osdep_bsd.c =================================================================== ---- WindowMaker-0.95.5.orig/src/osdep_bsd.c -+++ WindowMaker-0.95.5/src/osdep_bsd.c +--- WindowMaker-0.95.6.orig/src/osdep_bsd.c ++++ WindowMaker-0.95.6/src/osdep_bsd.c @@ -11,6 +11,10 @@ #else /* OPENBSD || NETBSD */ # include @@ -1741,10 +1740,10 @@ Index: WindowMaker-0.95.5/src/osdep_bsd.c #include #include -Index: WindowMaker-0.95.5/src/osdep_darwin.c +Index: WindowMaker-0.95.6/src/osdep_darwin.c =================================================================== ---- WindowMaker-0.95.5.orig/src/osdep_darwin.c -+++ WindowMaker-0.95.5/src/osdep_darwin.c +--- WindowMaker-0.95.6.orig/src/osdep_darwin.c ++++ WindowMaker-0.95.6/src/osdep_darwin.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1754,10 +1753,10 @@ Index: WindowMaker-0.95.5/src/osdep_darwin.c #include #include -Index: WindowMaker-0.95.5/src/osdep_linux.c +Index: WindowMaker-0.95.6/src/osdep_linux.c =================================================================== ---- WindowMaker-0.95.5.orig/src/osdep_linux.c -+++ WindowMaker-0.95.5/src/osdep_linux.c +--- WindowMaker-0.95.6.orig/src/osdep_linux.c ++++ WindowMaker-0.95.6/src/osdep_linux.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1767,10 +1766,10 @@ Index: WindowMaker-0.95.5/src/osdep_linux.c #include #include -Index: WindowMaker-0.95.5/src/osdep_stub.c +Index: WindowMaker-0.95.6/src/osdep_stub.c =================================================================== ---- WindowMaker-0.95.5.orig/src/osdep_stub.c -+++ WindowMaker-0.95.5/src/osdep_stub.c +--- WindowMaker-0.95.6.orig/src/osdep_stub.c ++++ WindowMaker-0.95.6/src/osdep_stub.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -1780,10 +1779,10 @@ Index: WindowMaker-0.95.5/src/osdep_stub.c #include #include -Index: WindowMaker-0.95.5/src/pixmap.c +Index: WindowMaker-0.95.6/src/pixmap.c =================================================================== ---- WindowMaker-0.95.5.orig/src/pixmap.c -+++ WindowMaker-0.95.5/src/pixmap.c +--- WindowMaker-0.95.6.orig/src/pixmap.c ++++ WindowMaker-0.95.6/src/pixmap.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1795,10 +1794,10 @@ Index: WindowMaker-0.95.5/src/pixmap.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/placement.c +Index: WindowMaker-0.95.6/src/placement.c =================================================================== ---- WindowMaker-0.95.5.orig/src/placement.c -+++ WindowMaker-0.95.5/src/placement.c +--- WindowMaker-0.95.6.orig/src/placement.c ++++ WindowMaker-0.95.6/src/placement.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1810,10 +1809,10 @@ Index: WindowMaker-0.95.5/src/placement.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/properties.c +Index: WindowMaker-0.95.6/src/properties.c =================================================================== ---- WindowMaker-0.95.5.orig/src/properties.c -+++ WindowMaker-0.95.5/src/properties.c +--- WindowMaker-0.95.6.orig/src/properties.c ++++ WindowMaker-0.95.6/src/properties.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1825,10 +1824,10 @@ Index: WindowMaker-0.95.5/src/properties.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/resources.c +Index: WindowMaker-0.95.6/src/resources.c =================================================================== ---- WindowMaker-0.95.5.orig/src/resources.c -+++ WindowMaker-0.95.5/src/resources.c +--- WindowMaker-0.95.6.orig/src/resources.c ++++ WindowMaker-0.95.6/src/resources.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1840,10 +1839,10 @@ Index: WindowMaker-0.95.5/src/resources.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/rootmenu.c +Index: WindowMaker-0.95.6/src/rootmenu.c =================================================================== ---- WindowMaker-0.95.5.orig/src/rootmenu.c -+++ WindowMaker-0.95.5/src/rootmenu.c +--- WindowMaker-0.95.6.orig/src/rootmenu.c ++++ WindowMaker-0.95.6/src/rootmenu.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1855,10 +1854,10 @@ Index: WindowMaker-0.95.5/src/rootmenu.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/screen.c +Index: WindowMaker-0.95.6/src/screen.c =================================================================== ---- WindowMaker-0.95.5.orig/src/screen.c -+++ WindowMaker-0.95.5/src/screen.c +--- WindowMaker-0.95.6.orig/src/screen.c ++++ WindowMaker-0.95.6/src/screen.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1870,10 +1869,10 @@ Index: WindowMaker-0.95.5/src/screen.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/session.c +Index: WindowMaker-0.95.6/src/session.c =================================================================== ---- WindowMaker-0.95.5.orig/src/session.c -+++ WindowMaker-0.95.5/src/session.c +--- WindowMaker-0.95.6.orig/src/session.c ++++ WindowMaker-0.95.6/src/session.c @@ -57,6 +57,10 @@ * if the Die message is received, exit. */ @@ -1885,10 +1884,10 @@ Index: WindowMaker-0.95.5/src/session.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/shutdown.c +Index: WindowMaker-0.95.6/src/shutdown.c =================================================================== ---- WindowMaker-0.95.5.orig/src/shutdown.c -+++ WindowMaker-0.95.5/src/shutdown.c +--- WindowMaker-0.95.6.orig/src/shutdown.c ++++ WindowMaker-0.95.6/src/shutdown.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1900,10 +1899,10 @@ Index: WindowMaker-0.95.5/src/shutdown.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/stacking.c +Index: WindowMaker-0.95.6/src/stacking.c =================================================================== ---- WindowMaker-0.95.5.orig/src/stacking.c -+++ WindowMaker-0.95.5/src/stacking.c +--- WindowMaker-0.95.6.orig/src/stacking.c ++++ WindowMaker-0.95.6/src/stacking.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1915,10 +1914,10 @@ Index: WindowMaker-0.95.5/src/stacking.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/startup.c +Index: WindowMaker-0.95.6/src/startup.c =================================================================== ---- WindowMaker-0.95.5.orig/src/startup.c -+++ WindowMaker-0.95.5/src/startup.c +--- WindowMaker-0.95.6.orig/src/startup.c ++++ WindowMaker-0.95.6/src/startup.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1930,10 +1929,10 @@ Index: WindowMaker-0.95.5/src/startup.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/superfluous.c +Index: WindowMaker-0.95.6/src/superfluous.c =================================================================== ---- WindowMaker-0.95.5.orig/src/superfluous.c -+++ WindowMaker-0.95.5/src/superfluous.c +--- WindowMaker-0.95.6.orig/src/superfluous.c ++++ WindowMaker-0.95.6/src/superfluous.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1945,10 +1944,10 @@ Index: WindowMaker-0.95.5/src/superfluous.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/switchmenu.c +Index: WindowMaker-0.95.6/src/switchmenu.c =================================================================== ---- WindowMaker-0.95.5.orig/src/switchmenu.c -+++ WindowMaker-0.95.5/src/switchmenu.c +--- WindowMaker-0.95.6.orig/src/switchmenu.c ++++ WindowMaker-0.95.6/src/switchmenu.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1960,10 +1959,10 @@ Index: WindowMaker-0.95.5/src/switchmenu.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/switchpanel.c +Index: WindowMaker-0.95.6/src/switchpanel.c =================================================================== ---- WindowMaker-0.95.5.orig/src/switchpanel.c -+++ WindowMaker-0.95.5/src/switchpanel.c +--- WindowMaker-0.95.6.orig/src/switchpanel.c ++++ WindowMaker-0.95.6/src/switchpanel.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1975,10 +1974,10 @@ Index: WindowMaker-0.95.5/src/switchpanel.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/texture.c +Index: WindowMaker-0.95.6/src/texture.c =================================================================== ---- WindowMaker-0.95.5.orig/src/texture.c -+++ WindowMaker-0.95.5/src/texture.c +--- WindowMaker-0.95.6.orig/src/texture.c ++++ WindowMaker-0.95.6/src/texture.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -1990,10 +1989,10 @@ Index: WindowMaker-0.95.5/src/texture.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/usermenu.c +Index: WindowMaker-0.95.6/src/usermenu.c =================================================================== ---- WindowMaker-0.95.5.orig/src/usermenu.c -+++ WindowMaker-0.95.5/src/usermenu.c +--- WindowMaker-0.95.6.orig/src/usermenu.c ++++ WindowMaker-0.95.6/src/usermenu.c @@ -56,6 +56,10 @@ * */ @@ -2005,10 +2004,10 @@ Index: WindowMaker-0.95.5/src/usermenu.c #include "wconfig.h" #ifdef USER_MENU -Index: WindowMaker-0.95.5/src/wcore.c +Index: WindowMaker-0.95.6/src/wcore.c =================================================================== ---- WindowMaker-0.95.5.orig/src/wcore.c -+++ WindowMaker-0.95.5/src/wcore.c +--- WindowMaker-0.95.6.orig/src/wcore.c ++++ WindowMaker-0.95.6/src/wcore.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2020,10 +2019,10 @@ Index: WindowMaker-0.95.5/src/wcore.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/wdefaults.c +Index: WindowMaker-0.95.6/src/wdefaults.c =================================================================== ---- WindowMaker-0.95.5.orig/src/wdefaults.c -+++ WindowMaker-0.95.5/src/wdefaults.c +--- WindowMaker-0.95.6.orig/src/wdefaults.c ++++ WindowMaker-0.95.6/src/wdefaults.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2035,10 +2034,10 @@ Index: WindowMaker-0.95.5/src/wdefaults.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/window.c +Index: WindowMaker-0.95.6/src/window.c =================================================================== ---- WindowMaker-0.95.5.orig/src/window.c -+++ WindowMaker-0.95.5/src/window.c +--- WindowMaker-0.95.6.orig/src/window.c ++++ WindowMaker-0.95.6/src/window.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2050,10 +2049,10 @@ Index: WindowMaker-0.95.5/src/window.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/winmenu.c +Index: WindowMaker-0.95.6/src/winmenu.c =================================================================== ---- WindowMaker-0.95.5.orig/src/winmenu.c -+++ WindowMaker-0.95.5/src/winmenu.c +--- WindowMaker-0.95.6.orig/src/winmenu.c ++++ WindowMaker-0.95.6/src/winmenu.c @@ -19,6 +19,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2065,10 +2064,10 @@ Index: WindowMaker-0.95.5/src/winmenu.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/winspector.c +Index: WindowMaker-0.95.6/src/winspector.c =================================================================== ---- WindowMaker-0.95.5.orig/src/winspector.c -+++ WindowMaker-0.95.5/src/winspector.c +--- WindowMaker-0.95.6.orig/src/winspector.c ++++ WindowMaker-0.95.6/src/winspector.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2080,10 +2079,10 @@ Index: WindowMaker-0.95.5/src/winspector.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/wmspec.c +Index: WindowMaker-0.95.6/src/wmspec.c =================================================================== ---- WindowMaker-0.95.5.orig/src/wmspec.c -+++ WindowMaker-0.95.5/src/wmspec.c +--- WindowMaker-0.95.6.orig/src/wmspec.c ++++ WindowMaker-0.95.6/src/wmspec.c @@ -28,6 +28,10 @@ * return to be Success is not enough. -Dan */ @@ -2095,10 +2094,10 @@ Index: WindowMaker-0.95.5/src/wmspec.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/workspace.c +Index: WindowMaker-0.95.6/src/workspace.c =================================================================== ---- WindowMaker-0.95.5.orig/src/workspace.c -+++ WindowMaker-0.95.5/src/workspace.c +--- WindowMaker-0.95.6.orig/src/workspace.c ++++ WindowMaker-0.95.6/src/workspace.c @@ -18,6 +18,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -2110,11 +2109,12 @@ Index: WindowMaker-0.95.5/src/workspace.c #include "wconfig.h" #include -Index: WindowMaker-0.95.5/src/xdnd.c +Index: WindowMaker-0.95.6/src/xdnd.c =================================================================== ---- WindowMaker-0.95.5.orig/src/xdnd.c -+++ WindowMaker-0.95.5/src/xdnd.c -@@ -1,5 +1,9 @@ +--- WindowMaker-0.95.6.orig/src/xdnd.c ++++ WindowMaker-0.95.6/src/xdnd.c +@@ -20,6 +20,10 @@ + /* Many part of code are ripped of an example from JX's site */ +#ifdef HAVE_CONFIG_H @@ -2124,10 +2124,10 @@ Index: WindowMaker-0.95.5/src/xdnd.c #include "wconfig.h" #ifdef XDND -Index: WindowMaker-0.95.5/src/xinerama.c +Index: WindowMaker-0.95.6/src/xinerama.c =================================================================== ---- WindowMaker-0.95.5.orig/src/xinerama.c -+++ WindowMaker-0.95.5/src/xinerama.c +--- WindowMaker-0.95.6.orig/src/xinerama.c ++++ WindowMaker-0.95.6/src/xinerama.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2139,10 +2139,10 @@ Index: WindowMaker-0.95.5/src/xinerama.c #include "wconfig.h" #include "xinerama.h" -Index: WindowMaker-0.95.5/src/xmodifier.c +Index: WindowMaker-0.95.6/src/xmodifier.c =================================================================== ---- WindowMaker-0.95.5.orig/src/xmodifier.c -+++ WindowMaker-0.95.5/src/xmodifier.c +--- WindowMaker-0.95.6.orig/src/xmodifier.c ++++ WindowMaker-0.95.6/src/xmodifier.c @@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph -Index: WindowMaker-0.95.5/src/xutil.c +Index: WindowMaker-0.95.6/src/xutil.c =================================================================== ---- WindowMaker-0.95.5.orig/src/xutil.c -+++ WindowMaker-0.95.5/src/xutil.c +--- WindowMaker-0.95.6.orig/src/xutil.c ++++ WindowMaker-0.95.6/src/xutil.c @@ -19,6 +19,10 @@ * MA 02110-1301, USA. */ @@ -2169,10 +2169,10 @@ Index: WindowMaker-0.95.5/src/xutil.c #include #include #include -Index: WindowMaker-0.95.5/test/notest.c +Index: WindowMaker-0.95.6/test/notest.c =================================================================== ---- WindowMaker-0.95.5.orig/test/notest.c -+++ WindowMaker-0.95.5/test/notest.c +--- WindowMaker-0.95.6.orig/test/notest.c ++++ WindowMaker-0.95.6/test/notest.c @@ -3,6 +3,10 @@ * TODO: remake */ @@ -2184,13 +2184,13 @@ Index: WindowMaker-0.95.5/test/notest.c #include #include #include -Index: WindowMaker-0.95.5/test/wtest.c +Index: WindowMaker-0.95.6/test/wtest.c =================================================================== ---- WindowMaker-0.95.5.orig/test/wtest.c -+++ WindowMaker-0.95.5/test/wtest.c -@@ -8,6 +8,10 @@ - * TODO: remake - */ +--- WindowMaker-0.95.6.orig/test/wtest.c ++++ WindowMaker-0.95.6/test/wtest.c +@@ -10,6 +10,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2199,13 +2199,13 @@ Index: WindowMaker-0.95.5/test/wtest.c #include #include #include -Index: WindowMaker-0.95.5/util/convertfonts.c +Index: WindowMaker-0.95.6/util/convertfonts.c =================================================================== ---- WindowMaker-0.95.5.orig/util/convertfonts.c -+++ WindowMaker-0.95.5/util/convertfonts.c -@@ -23,6 +23,10 @@ - #define _GNU_SOURCE /* getopt_long */ - #endif +--- WindowMaker-0.95.6.orig/util/convertfonts.c ++++ WindowMaker-0.95.6/util/convertfonts.c +@@ -25,6 +25,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2214,10 +2214,10 @@ Index: WindowMaker-0.95.5/util/convertfonts.c #include #include -Index: WindowMaker-0.95.5/util/fontconv.c +Index: WindowMaker-0.95.6/util/fontconv.c =================================================================== ---- WindowMaker-0.95.5.orig/util/fontconv.c -+++ WindowMaker-0.95.5/util/fontconv.c +--- WindowMaker-0.95.6.orig/util/fontconv.c ++++ WindowMaker-0.95.6/util/fontconv.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -2227,13 +2227,13 @@ Index: WindowMaker-0.95.5/util/fontconv.c #include #include #include -Index: WindowMaker-0.95.5/util/geticonset.c +Index: WindowMaker-0.95.6/util/geticonset.c =================================================================== ---- WindowMaker-0.95.5.orig/util/geticonset.c -+++ WindowMaker-0.95.5/util/geticonset.c -@@ -23,6 +23,10 @@ - #define _GNU_SOURCE /* getopt_long */ - #endif +--- WindowMaker-0.95.6.orig/util/geticonset.c ++++ WindowMaker-0.95.6/util/geticonset.c +@@ -25,6 +25,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2242,13 +2242,13 @@ Index: WindowMaker-0.95.5/util/geticonset.c #include #include #include -Index: WindowMaker-0.95.5/util/getstyle.c +Index: WindowMaker-0.95.6/util/getstyle.c =================================================================== ---- WindowMaker-0.95.5.orig/util/getstyle.c -+++ WindowMaker-0.95.5/util/getstyle.c -@@ -23,6 +23,10 @@ - #define _GNU_SOURCE /* getopt_long */ - #endif +--- WindowMaker-0.95.6.orig/util/getstyle.c ++++ WindowMaker-0.95.6/util/getstyle.c +@@ -25,6 +25,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2257,13 +2257,13 @@ Index: WindowMaker-0.95.5/util/getstyle.c #include #include -Index: WindowMaker-0.95.5/util/seticons.c +Index: WindowMaker-0.95.6/util/seticons.c =================================================================== ---- WindowMaker-0.95.5.orig/util/seticons.c -+++ WindowMaker-0.95.5/util/seticons.c -@@ -23,6 +23,10 @@ - #define _GNU_SOURCE /* getopt_long */ - #endif +--- WindowMaker-0.95.6.orig/util/seticons.c ++++ WindowMaker-0.95.6/util/seticons.c +@@ -25,6 +25,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2272,13 +2272,13 @@ Index: WindowMaker-0.95.5/util/seticons.c #include #include #include -Index: WindowMaker-0.95.5/util/setstyle.c +Index: WindowMaker-0.95.6/util/setstyle.c =================================================================== ---- WindowMaker-0.95.5.orig/util/setstyle.c -+++ WindowMaker-0.95.5/util/setstyle.c -@@ -23,6 +23,10 @@ - #define _GNU_SOURCE /* getopt_long */ - #endif +--- WindowMaker-0.95.6.orig/util/setstyle.c ++++ WindowMaker-0.95.6/util/setstyle.c +@@ -25,6 +25,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2287,13 +2287,13 @@ Index: WindowMaker-0.95.5/util/setstyle.c #include #include -Index: WindowMaker-0.95.5/util/wdread.c +Index: WindowMaker-0.95.6/util/wdread.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wdread.c -+++ WindowMaker-0.95.5/util/wdread.c -@@ -28,6 +28,10 @@ - * WindowMaker defaults DB reader +--- WindowMaker-0.95.6.orig/util/wdread.c ++++ WindowMaker-0.95.6/util/wdread.c +@@ -29,6 +29,10 @@ */ + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2302,13 +2302,13 @@ Index: WindowMaker-0.95.5/util/wdread.c #include #include #include -Index: WindowMaker-0.95.5/util/wdwrite.c +Index: WindowMaker-0.95.6/util/wdwrite.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wdwrite.c -+++ WindowMaker-0.95.5/util/wdwrite.c +--- WindowMaker-0.95.6.orig/util/wdwrite.c ++++ WindowMaker-0.95.6/util/wdwrite.c @@ -28,6 +28,10 @@ */ - + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2317,10 +2317,10 @@ Index: WindowMaker-0.95.5/util/wdwrite.c #include #include #include -Index: WindowMaker-0.95.5/util/wmagnify.c +Index: WindowMaker-0.95.6/util/wmagnify.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wmagnify.c -+++ WindowMaker-0.95.5/util/wmagnify.c +--- WindowMaker-0.95.6.orig/util/wmagnify.c ++++ WindowMaker-0.95.6/util/wmagnify.c @@ -7,6 +7,10 @@ */ #include @@ -2332,13 +2332,13 @@ Index: WindowMaker-0.95.5/util/wmagnify.c #include #include -Index: WindowMaker-0.95.5/util/wmgenmenu.c +Index: WindowMaker-0.95.6/util/wmgenmenu.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wmgenmenu.c -+++ WindowMaker-0.95.5/util/wmgenmenu.c -@@ -4,6 +4,10 @@ - #define _GNU_SOURCE /* getopt_long */ - #endif +--- WindowMaker-0.95.6.orig/util/wmgenmenu.c ++++ WindowMaker-0.95.6/util/wmgenmenu.c +@@ -6,6 +6,10 @@ + + #include "config.h" +#ifdef HAVE_CONFIG_H +#include "config.h" @@ -2347,10 +2347,10 @@ Index: WindowMaker-0.95.5/util/wmgenmenu.c #include #include #include -Index: WindowMaker-0.95.5/util/wmmenugen.c +Index: WindowMaker-0.95.6/util/wmmenugen.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wmmenugen.c -+++ WindowMaker-0.95.5/util/wmmenugen.c +--- WindowMaker-0.95.6.orig/util/wmmenugen.c ++++ WindowMaker-0.95.6/util/wmmenugen.c @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2362,10 +2362,10 @@ Index: WindowMaker-0.95.5/util/wmmenugen.c #include #include -Index: WindowMaker-0.95.5/util/wmmenugen_misc.c +Index: WindowMaker-0.95.6/util/wmmenugen_misc.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wmmenugen_misc.c -+++ WindowMaker-0.95.5/util/wmmenugen_misc.c +--- WindowMaker-0.95.6.orig/util/wmmenugen_misc.c ++++ WindowMaker-0.95.6/util/wmmenugen_misc.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2377,10 +2377,10 @@ Index: WindowMaker-0.95.5/util/wmmenugen_misc.c #include #include #include -Index: WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c +Index: WindowMaker-0.95.6/util/wmmenugen_parse_wmconfig.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wmmenugen_parse_wmconfig.c -+++ WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c +--- WindowMaker-0.95.6.orig/util/wmmenugen_parse_wmconfig.c ++++ WindowMaker-0.95.6/util/wmmenugen_parse_wmconfig.c @@ -20,6 +20,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ @@ -2392,10 +2392,10 @@ Index: WindowMaker-0.95.5/util/wmmenugen_parse_wmconfig.c #include #include -Index: WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c +Index: WindowMaker-0.95.6/util/wmmenugen_parse_xdg.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wmmenugen_parse_xdg.c -+++ WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c +--- WindowMaker-0.95.6.orig/util/wmmenugen_parse_xdg.c ++++ WindowMaker-0.95.6/util/wmmenugen_parse_xdg.c @@ -36,6 +36,10 @@ * Basic validation of the .desktop file is done. */ @@ -2407,10 +2407,10 @@ Index: WindowMaker-0.95.5/util/wmmenugen_parse_xdg.c #include #include -Index: WindowMaker-0.95.5/util/wxcopy.c +Index: WindowMaker-0.95.6/util/wxcopy.c =================================================================== ---- WindowMaker-0.95.5.orig/util/wxcopy.c -+++ WindowMaker-0.95.5/util/wxcopy.c +--- WindowMaker-0.95.6.orig/util/wxcopy.c ++++ WindowMaker-0.95.6/util/wxcopy.c @@ -18,6 +18,10 @@ * MA 02110-1301, USA. */ @@ -2422,10 +2422,10 @@ Index: WindowMaker-0.95.5/util/wxcopy.c #include #include #include -Index: WindowMaker-0.95.5/wmlib/app.c +Index: WindowMaker-0.95.6/wmlib/app.c =================================================================== ---- WindowMaker-0.95.5.orig/wmlib/app.c -+++ WindowMaker-0.95.5/wmlib/app.c +--- WindowMaker-0.95.6.orig/wmlib/app.c ++++ WindowMaker-0.95.6/wmlib/app.c @@ -20,6 +20,10 @@ * MA 02110-1301, USA. */ @@ -2437,10 +2437,10 @@ Index: WindowMaker-0.95.5/wmlib/app.c #include #include #include -Index: WindowMaker-0.95.5/wmlib/command.c +Index: WindowMaker-0.95.6/wmlib/command.c =================================================================== ---- WindowMaker-0.95.5.orig/wmlib/command.c -+++ WindowMaker-0.95.5/wmlib/command.c +--- WindowMaker-0.95.6.orig/wmlib/command.c ++++ WindowMaker-0.95.6/wmlib/command.c @@ -20,6 +20,10 @@ * MA 02110-1301, USA. */ @@ -2452,10 +2452,10 @@ Index: WindowMaker-0.95.5/wmlib/command.c #include #include -Index: WindowMaker-0.95.5/wmlib/event.c +Index: WindowMaker-0.95.6/wmlib/event.c =================================================================== ---- WindowMaker-0.95.5.orig/wmlib/event.c -+++ WindowMaker-0.95.5/wmlib/event.c +--- WindowMaker-0.95.6.orig/wmlib/event.c ++++ WindowMaker-0.95.6/wmlib/event.c @@ -20,6 +20,10 @@ * MA 02110-1301, USA. */ @@ -2467,10 +2467,10 @@ Index: WindowMaker-0.95.5/wmlib/event.c #include #include #include -Index: WindowMaker-0.95.5/wmlib/menu.c +Index: WindowMaker-0.95.6/wmlib/menu.c =================================================================== ---- WindowMaker-0.95.5.orig/wmlib/menu.c -+++ WindowMaker-0.95.5/wmlib/menu.c +--- WindowMaker-0.95.6.orig/wmlib/menu.c ++++ WindowMaker-0.95.6/wmlib/menu.c @@ -20,6 +20,10 @@ * MA 02110-1301, USA. */ @@ -2482,10 +2482,10 @@ Index: WindowMaker-0.95.5/wmlib/menu.c #include #include #include -Index: WindowMaker-0.95.5/wrlib/alpha_combine.c +Index: WindowMaker-0.95.6/wrlib/alpha_combine.c =================================================================== ---- WindowMaker-0.95.5.orig/wrlib/alpha_combine.c -+++ WindowMaker-0.95.5/wrlib/alpha_combine.c +--- WindowMaker-0.95.6.orig/wrlib/alpha_combine.c ++++ WindowMaker-0.95.6/wrlib/alpha_combine.c @@ -18,6 +18,10 @@ * MA 02110-1301, USA. */ @@ -2497,80 +2497,10 @@ Index: WindowMaker-0.95.5/wrlib/alpha_combine.c #include "wraster.h" void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, -Index: WindowMaker-0.95.5/wrlib/gif.c +Index: WindowMaker-0.95.6/wrlib/tests/testdraw.c =================================================================== ---- WindowMaker-0.95.5.orig/wrlib/gif.c -+++ WindowMaker-0.95.5/wrlib/gif.c -@@ -52,17 +52,24 @@ RImage *RLoadGIF(const char *file, int i - unsigned char rmap[256]; - unsigned char gmap[256]; - unsigned char bmap[256]; -+ int dgiferr; - - if (index < 0) - index = 0; - - /* default error message */ - RErrorCode = RERR_BADINDEX; -- -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) -+ gif = DGifOpenFileName(file, &dgiferr); -+#else - gif = DGifOpenFileName(file); -- -+#endif - if (!gif) { -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) -+ switch (dgiferr) { -+#else - switch (GifLastError()) { -+#endif - case D_GIF_ERR_OPEN_FAILED: - RErrorCode = RERR_OPEN; - break; -@@ -77,7 +84,11 @@ RImage *RLoadGIF(const char *file, int i - } - - if (gif->SWidth < 1 || gif->SHeight < 1) { -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile(gif, NULL); -+#else - DGifCloseFile(gif); -+#endif - RErrorCode = RERR_BADIMAGEFILE; - return NULL; - } -@@ -199,7 +210,11 @@ RImage *RLoadGIF(const char *file, int i - /* yuck! */ - goto did_not_get_any_errors; - giferr: -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) -+ switch (gif->Error) { -+#else - switch (GifLastError()) { -+#endif - case D_GIF_ERR_OPEN_FAILED: - RErrorCode = RERR_OPEN; - break; -@@ -219,8 +234,13 @@ RImage *RLoadGIF(const char *file, int i - if (buffer) - free(buffer); - -- if (gif) -+ if (gif) { -+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5) -+ DGifCloseFile(gif, NULL); -+#else - DGifCloseFile(gif); -+#endif -+ } - - return image; - } -Index: WindowMaker-0.95.5/wrlib/tests/testdraw.c -=================================================================== ---- WindowMaker-0.95.5.orig/wrlib/tests/testdraw.c -+++ WindowMaker-0.95.5/wrlib/tests/testdraw.c +--- WindowMaker-0.95.6.orig/wrlib/tests/testdraw.c ++++ WindowMaker-0.95.6/wrlib/tests/testdraw.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -2580,10 +2510,10 @@ Index: WindowMaker-0.95.5/wrlib/tests/testdraw.c #include #include "wraster.h" #include -Index: WindowMaker-0.95.5/wrlib/tests/testgrad.c +Index: WindowMaker-0.95.6/wrlib/tests/testgrad.c =================================================================== ---- WindowMaker-0.95.5.orig/wrlib/tests/testgrad.c -+++ WindowMaker-0.95.5/wrlib/tests/testgrad.c +--- WindowMaker-0.95.6.orig/wrlib/tests/testgrad.c ++++ WindowMaker-0.95.6/wrlib/tests/testgrad.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -2593,10 +2523,10 @@ Index: WindowMaker-0.95.5/wrlib/tests/testgrad.c #include #include "wraster.h" #include -Index: WindowMaker-0.95.5/wrlib/tests/testrot.c +Index: WindowMaker-0.95.6/wrlib/tests/testrot.c =================================================================== ---- WindowMaker-0.95.5.orig/wrlib/tests/testrot.c -+++ WindowMaker-0.95.5/wrlib/tests/testrot.c +--- WindowMaker-0.95.6.orig/wrlib/tests/testrot.c ++++ WindowMaker-0.95.6/wrlib/tests/testrot.c @@ -1,4 +1,8 @@ +#ifdef HAVE_CONFIG_H @@ -2606,10 +2536,10 @@ Index: WindowMaker-0.95.5/wrlib/tests/testrot.c #include #include "wraster.h" #include -Index: WindowMaker-0.95.5/wrlib/tests/view.c +Index: WindowMaker-0.95.6/wrlib/tests/view.c =================================================================== ---- WindowMaker-0.95.5.orig/wrlib/tests/view.c -+++ WindowMaker-0.95.5/wrlib/tests/view.c +--- WindowMaker-0.95.6.orig/wrlib/tests/view.c ++++ WindowMaker-0.95.6/wrlib/tests/view.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h"