update Window Maker to 0.65.1

- Fixed crash with long titles in the window list menu (buffer overflow) - fixed crash when removing menu entry for Window List or Workspace submenu - Replaced almost all sprintf() calls with snprintf() - Fixed some non-portable shell constructs used in installed scripts - removed FocusFollowMouse from wmaker and WPrefs - fixed problem with alpha images showing a blue tint on big endian machines - fixed problem with WINGs based apps exiting with a "X_RotateProperties" related error when text was selected in a textfiled (including WPrefs.app and Window Maker itself). - fixed bug with maximization of windows with fixed resize increments - added None geometry display type - fixed window enumeration bug - removed GNUisms from wsetfont - added slovakian translations - added WINGs i18n patch - fixed wmsetbg.c to work in servers capable of multiple depths (overlay) - added HMaximizeKey - fixed bad SIGPIPE handling setup across forks - added workaround for bug in locale handling on font set creation
2001-08-01 09:04:41 +00:00 · 2001-08-01 09:04:41 +00:00 · 3f4fa4c6b9
commit 3f4fa4c6b9
parent 7aae984078
12 changed files with 69 additions and 91 deletions
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.41 2001/06/05 09:22:56 wilfried Exp $
+# $OpenBSD: Makefile,v 1.42 2001/08/01 09:04:41 wilfried Exp $

 COMMENT=		'window manager that emulates NEXTSTEP(tm)'

-DISTNAME=		WindowMaker-0.65.0
+DISTNAME=		WindowMaker-0.65.1
 PKGNAME=		${DISTNAME:L}
 CATEGORIES=		x11 x11/windowmaker
-NEED_VERSION=		1.409
+NEED_VERSION=		1.433

 HOMEPAGE=		http://www.windowmaker.org/

--- a/x11/windowmaker/files/md5
+++ b/x11/windowmaker/files/md5
@ -1,3 +1,3 @@
-MD5 (WindowMaker-0.65.0.tar.bz2) = d17f6b206db4c4157248e36422fc9cbb
-RMD160 (WindowMaker-0.65.0.tar.bz2) = 2adeb8701b10407d02857b8e99b20cef1d041673
-SHA1 (WindowMaker-0.65.0.tar.bz2) = acc08353dbdbd0af26b0fa653322f60347c5a6fe
+MD5 (WindowMaker-0.65.1.tar.bz2) = ab1d08b08366be74275aa38ff09d809b
+RMD160 (WindowMaker-0.65.1.tar.bz2) = 8e35a6ae7e804230f07b86aac8b8b05184cca913
+SHA1 (WindowMaker-0.65.1.tar.bz2) = 2600498e72ba3fc5a8fd9fb27ac1261b89c42826
--- a/x11/windowmaker/patches/patch-WINGs_Examples_Makefile_in
+++ b/x11/windowmaker/patches/patch-WINGs_Examples_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-WINGs_Examples_Makefile_in,v 1.1 2001/05/21 14:05:59 wilfried Exp $
--- WINGs/Examples/Makefile.in.orig	Mon Apr 30 00:17:53 2001
-+++ WINGs/Examples/Makefile.in	Wed May 16 16:44:30 2001
-@@ -112,7 +112,7 @@ server_DEPENDENCIES = $(top_builddir)/WI
- server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @LIBPL@
- 
- 
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
-+INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../src/config.h
--- a/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_in
+++ b/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-WINGs_Extras_Makefile_in,v 1.3 2001/05/21 14:05:59 wilfried Exp $
--- WINGs/Extras/Makefile.in.orig	Mon Apr 30 00:17:54 2001
-+++ WINGs/Extras/Makefile.in	Wed May 16 16:44:51 2001
-@@ -106,7 +106,7 @@ EXTRA_DIST = 
+$OpenBSD: patch-WINGs_Extras_Makefile_in,v 1.4 2001/08/01 09:04:41 wilfried Exp $
+--- WINGs/Extras/Makefile.in.orig	Mon Jul 23 22:03:05 2001
+++ WINGs/Extras/Makefile.in	Wed Aug  1 10:12:42 2001
+@@ -109,10 +109,10 @@ EXTRA_DIST = 
 libExtraWINGs_a_SOURCES =  	wtableview.c 	wtabledelegates.c 	wtableview.h 	wtabledelegates.h 
 
 
@ -9,4 +9,8 @@ $OpenBSD: patch-WINGs_Extras_Makefile_in,v 1.3 2001/05/21 14:05:59 wilfried Exp
 +INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
 
 
- LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la         @LIBPL@ 
+-LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la         @LIBPL@ 
+LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la         @LIBPL@ @INTLIBS@
+ 
+ 
+ test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
--- a/x11/windowmaker/patches/patch-WINGs_Makefile_in
+++ b/x11/windowmaker/patches/patch-WINGs_Makefile_in
@ -1,9 +1,18 @@
-$OpenBSD: patch-WINGs_Makefile_in,v 1.3 2001/05/21 14:05:59 wilfried Exp $
--- WINGs/Makefile.in.orig	Mon Apr 30 00:17:52 2001
-+++ WINGs/Makefile.in	Wed May 16 16:44:17 2001
-@@ -112,7 +112,7 @@ libWINGs_a_SOURCES =  	array.c 	bagtree.
- libWUtil_a_SOURCES =  	array.c 	bagtree.c 	connection.c 	data.c 	error.c 	findfile.c 	handlers.c 	hashtable.c 	host.c 	international.c 	memory.c 	misc.c 	notification.c 	string.c 	tree.c 	userdefaults.c 	usleep.c 	wapplication.c 	wutil.c
+$OpenBSD: patch-WINGs_Makefile_in,v 1.4 2001/08/01 09:04:41 wilfried Exp $
+--- WINGs/Makefile.in.orig	Mon Jul 23 22:02:59 2001
+++ WINGs/Makefile.in	Wed Aug  1 10:01:13 2001
+@@ -96,7 +96,7 @@ wprefsdir = @wprefsdir@
 
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+-SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
+SUBDIRS = WINGs . po Documentation Resources Extras
+ 
+ #libWINGs_la_LDFLAGS = -version-info 1:1:0
+ 
+@@ -117,7 +117,7 @@ libWUtil_a_SOURCES =  	array.c 	bagtree.
+ 
+ CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
 
 -INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
 +INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
--- a/x11/windowmaker/patches/patch-WINGs_Tests_Makefile_in
+++ b/x11/windowmaker/patches/patch-WINGs_Tests_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-WINGs_Tests_Makefile_in,v 1.1 2001/05/21 14:05:59 wilfried Exp $
--- WINGs/Tests/Makefile.in.orig	Mon Apr 30 00:17:53 2001
-+++ WINGs/Tests/Makefile.in	Wed May 16 16:44:38 2001
-@@ -104,7 +104,7 @@ wtest_DEPENDENCIES = $(top_builddir)/WIN
- 
- EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
- 
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
-+INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../src/config.h
--- a/x11/windowmaker/patches/patch-WINGs_string_c
+++ b/x11/windowmaker/patches/patch-WINGs_string_c
@ -0,0 +1,9 @@
+$OpenBSD: patch-WINGs_string_c,v 1.1 2001/08/01 09:04:41 wilfried Exp $
+--- WINGs/string.c.orig	Sat Jul 28 13:32:38 2001
+++ WINGs/string.c	Sat Jul 28 13:32:53 2001
+@@ -1,4 +1,4 @@
+-
+#include <assert.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
--- a/x11/windowmaker/patches/patch-WindowMaker_Makefile_in
+++ b/x11/windowmaker/patches/patch-WindowMaker_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-WindowMaker_Makefile_in,v 1.1 2001/05/21 14:06:00 wilfried Exp $
--- WindowMaker/Makefile.in.orig	Mon Apr 30 00:17:55 2001
-+++ WindowMaker/Makefile.in	Wed May 16 22:14:50 2001
-@@ -95,7 +95,7 @@ SUBDIRS = Backgrounds Defaults IconSets 
+$OpenBSD: patch-WindowMaker_Makefile_in,v 1.2 2001/08/01 09:04:41 wilfried Exp $
+--- WindowMaker/Makefile.in.orig	Sat Jul 28 14:06:07 2001
+++ WindowMaker/Makefile.in	Sat Jul 28 14:06:33 2001
+@@ -98,7 +98,7 @@ SUBDIRS = Backgrounds Defaults IconSets 
 
 prefsdatadir = $(pkgdatadir)
 
-prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.bg 	menu.ca 	menu.cz 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pl 	menu.pt 	menu.ro 	menu.ru 	menu.se 	menu.sk 	menu.sl 	menu.tr 	menu.zh_CN 	menu.zh_TW.Big5 	plmenu 	plmenu.bg 	plmenu.da 	plmenu.de 	plmenu.es 	plmenu.fi 	plmenu.fr 	plmenu.hr 	plmenu.it 	plmenu.ko 	plmenu.pl 	plmenu.ro 	plmenu.sk 	plmenu.zh_CN 	wmmacros 	xtree.dat
-+prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.bg 	menu.ca 	menu.cs 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pl 	menu.pt 	menu.ro 	menu.ru 	menu.sv 	menu.sk 	menu.sl 	menu.tr 	menu.zh_CN 	menu.zh_TW.Big5 	plmenu 	plmenu.bg 	plmenu.da 	plmenu.de 	plmenu.es 	plmenu.fi 	plmenu.fr 	plmenu.hr 	plmenu.it 	plmenu.ko 	plmenu.pl 	plmenu.ro 	plmenu.sk 	plmenu.zh_CN 	wmmacros 	xtree.dat
+-prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.bg 	menu.ca 	menu.cz 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pl 	menu.pt 	menu.ro 	menu.ru 	menu.se 	menu.sk 	menu.sl 	menu.tr 	menu.zh_CN 	menu.zh_TW.Big5 	plmenu 	plmenu.bg 	plmenu.da 	plmenu.de 	plmenu.es 	plmenu.fi 	plmenu.fr 	plmenu.hr 	plmenu.it 	plmenu.ja 	plmenu.ko 	plmenu.pl 	plmenu.ro 	plmenu.sk 	plmenu.zh_CN 	wmmacros 	xtree.dat
+prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.bg 	menu.ca 	menu.cs 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pl 	menu.pt 	menu.ro 	menu.ru 	menu.sv 	menu.sk 	menu.sl 	menu.tr 	menu.zh_CN 	menu.zh_TW.Big5 	plmenu 	plmenu.bg 	plmenu.da 	plmenu.de 	plmenu.es 	plmenu.fi 	plmenu.fr 	plmenu.hr 	plmenu.it 	plmenu.ja 	plmenu.ko 	plmenu.pl 	plmenu.ro 	plmenu.sk 	plmenu.zh_CN 	wmmacros 	xtree.dat
 
 
 EXTRA_DIST = $(prefsdata_DATA) mkMakefile
--- a/x11/windowmaker/patches/patch-po_zh_CN_po
+++ b/x11/windowmaker/patches/patch-po_zh_CN_po
@ -1,12 +0,0 @@
-$OpenBSD: patch-po_zh_CN_po,v 1.1 2001/05/21 14:06:01 wilfried Exp $
--- po/zh_CN.po.orig	Sat Feb 24 01:35:16 2001
-+++ po/zh_CN.po	Mon May 21 15:37:12 2001
-@@ -10,7 +10,7 @@ msgstr ""
- "Last-Translator: Wang Jian <larkw@263.net>\n"
- "Language-Team: chinese <zh@li.org>\n"
- "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312-80\n"
-+"Content-Type: text/plain; charset=gb2312\n"
- "Content-Transfer-Encoding: 8-bit\n"
- "Translator: Wang Jian <larkw@263.net>\n"
- 
--- a/x11/windowmaker/patches/patch-po_zh_TW_Big5_po
+++ b/x11/windowmaker/patches/patch-po_zh_TW_Big5_po
@ -1,30 +0,0 @@
-$OpenBSD: patch-po_zh_TW_Big5_po,v 1.1 2001/05/21 14:06:01 wilfried Exp $
--- po/zh_TW.Big5.po.orig	Wed Feb 17 12:06:47 1999
-+++ po/zh_TW.Big5.po	Mon May 21 15:09:42 2001
-@@ -704,7 +704,7 @@ msgstr "要求字串，字典，資料或陣列。"
- 
- #: ../src/proplist.c:434
- msgid "Comments are not allowed inside WindowMaker owned domain files."
-msgstr "在 WindowMaker 的定義域檔中不允許\註解。"
-+msgstr "在 WindowMaker 的定義域檔中不允許註解。"
- 
- #: ../src/proplist.c:453
- #, c-format
-@@ -833,7 +833,7 @@ msgstr "OPEN_MENU 中有太多參數: %s"
- msgid ""
- "There are more than one WORKSPACE_MENU commands in the applications menu. "
- "Only one is allowed."
-msgstr "應用程式選單中有超過一個 WORKSPACE_MENU 命令。只允許\有一個。"
-+msgstr "應用程式選單中有超過一個 WORKSPACE_MENU 命令。只允許有一個。"
- 
- #: ../src/rootmenu.c:775 ../src/rootmenu.c:793
- #, c-format
-@@ -1283,7 +1283,7 @@ msgid ""
- "mouse or keyboard events."
- msgstr ""
- "啟動 \"不要結合...\" 選項\n"
-"允許\應用程式接受所有滑鼠或鍵盤事件。"
-+"允許應用程式接受所有滑鼠或鍵盤事件。"
- 
- #: ../src/winspector.c:1223
- msgid "Miniwindow Image"
--- a/x11/windowmaker/patches/patch-util_Makefile_in
+++ b/x11/windowmaker/patches/patch-util_Makefile_in
@ -0,0 +1,20 @@
+$OpenBSD: patch-util_Makefile_in,v 1.1 2001/08/01 09:04:41 wilfried Exp $
+--- util/Makefile.in.orig	Mon Jul 23 22:03:14 2001
+++ util/Makefile.in	Wed Aug  1 10:18:21 2001
+@@ -127,13 +127,13 @@ seticons_LDADD = $(liblist)
+ 
+ geticonset_LDADD = $(liblist)
+ 
+-wmagnify_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@DLLIBS@
+wmagnify_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@INTLIBS@ 	@DLLIBS@
+ 
+ 
+-wmsetup_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@DLLIBS@
+wmsetup_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@INTLIBS@ 	@DLLIBS@
+ 
+ 
+-wmsetbg_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@DLLIBS@
+wmsetbg_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@LIBPL@ 	@INTLIBS@ 	@DLLIBS@
+ 
+ 
+ CLEANFILES = wmaker.inst wmchlocale
--- a/x11/windowmaker/pkg/PFRAG.i18n
+++ b/x11/windowmaker/pkg/PFRAG.i18n
@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.i18n,v 1.1 2001/05/21 14:06:02 wilfried Exp $
+@comment $OpenBSD: PFRAG.i18n,v 1.2 2001/08/01 09:04:42 wilfried Exp $
@comment Bulgarian
 share/WindowMaker/menu.bg
 share/WindowMaker/plmenu.bg
@ -60,6 +60,7 @@ share/locale/it/LC_MESSAGES/WPrefs.mo
 share/locale/it/LC_MESSAGES/WindowMaker.mo
@comment Japanese
 share/WindowMaker/menu.ja
+share/WindowMaker/plmenu.ja
 share/locale/ja/LC_MESSAGES/WPrefs.mo
 share/locale/ja/LC_MESSAGES/WindowMaker.mo
@comment Korean
@ -92,13 +93,14 @@ share/locale/ru/LC_MESSAGES/WindowMaker.mo
@comment Slovak
 share/WindowMaker/menu.sk
 share/WindowMaker/plmenu.sk
+share/locale/sk/LC_MESSAGES/WINGs.mo
 share/locale/sk/LC_MESSAGES/WPrefs.mo
 share/locale/sk/LC_MESSAGES/WindowMaker.mo
+@comment Slovene
+share/WindowMaker/menu.sl
@comment Swedish
 share/WindowMaker/menu.sv
 share/locale/sv/LC_MESSAGES/WindowMaker.mo
-@comment Slovene
-share/WindowMaker/menu.sl
@comment Turkish
 share/WindowMaker/menu.tr
 share/locale/tr/LC_MESSAGES/WindowMaker.mo