Changes 0.95.6:

* Window Maker can now load WebP images and support ImageMagick library to support even more formats like SVG, BMP, TGA, ...
* Add mini-window apercu , a small preview of window contents
* Support for up to 9-buttons mouse added
* Many configuration options added to WPrefs.app
* Add wmiv, an image viewer application
* Bug fixes and code cleanups by various people.

8 files changed, 53 insertions, 92 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index d12abbd2f2a..efde6ff7e53 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2014/05/31 15:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2014/10/07 16:11:11 adam Exp $
 
-DISTNAME=	WindowMaker-0.95.5
+DISTNAME=	WindowMaker-0.95.6
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	3
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://windowmaker.info/pub/source/release/
 
@@ -98,6 +97,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index 90ca31345fa..cdaa72af37b 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2014/01/17 08:48:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2014/10/07 16:11:11 adam Exp $
 bin/convertfonts
 bin/get-wings-flags
 bin/get-wraster-flags
@@ -15,6 +15,7 @@ bin/wmagnify
 bin/wmaker
 bin/wmaker.inst
 bin/wmgenmenu
+bin/wmiv
 bin/wmmenugen
 bin/wmsetbg
 bin/wxcopy
@@ -29,6 +30,7 @@ lib/libWMaker.la
 lib/libWUtil.la
 lib/libwraster.la
 lib/pkgconfig/WINGs.pc
+lib/pkgconfig/WUtil.pc
 lib/pkgconfig/wrlib.pc
 man/cs/man1/geticonset.1
 man/cs/man1/getstyle.1
@@ -158,7 +160,8 @@ share/WindowMaker/Backgrounds/BlueImage.jpeg
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
-share/WindowMaker/Icons/Drawer.png
+share/WindowMaker/Icons/Drawer.tiff
+share/WindowMaker/Icons/Drawer.xpm
 share/WindowMaker/Icons/Ear.png
 share/WindowMaker/Icons/Ftp.png
 share/WindowMaker/Icons/GNUstep.tiff
@@ -317,6 +320,7 @@ share/WindowMaker/plmenu.hr
 share/WindowMaker/plmenu.it
 share/WindowMaker/plmenu.ja
 share/WindowMaker/plmenu.ko
+share/WindowMaker/plmenu.nl
 share/WindowMaker/plmenu.pl
 share/WindowMaker/plmenu.ro
 share/WindowMaker/plmenu.sk
@@ -361,6 +365,7 @@ share/locale/fr/LC_MESSAGES/wmgenmenu.mo
 share/locale/gl/LC_MESSAGES/WindowMaker.mo
 share/locale/hr/LC_MESSAGES/WPrefs.mo
 share/locale/hr/LC_MESSAGES/WindowMaker.mo
+share/locale/hu/LC_MESSAGES/WINGs.mo
 share/locale/hu/LC_MESSAGES/WPrefs.mo
 share/locale/hu/LC_MESSAGES/WindowMaker.mo
 share/locale/it/LC_MESSAGES/WPrefs.mo
@@ -370,7 +375,10 @@ share/locale/ja/LC_MESSAGES/WindowMaker.mo
 share/locale/ko/LC_MESSAGES/WPrefs.mo
 share/locale/ko/LC_MESSAGES/WindowMaker.mo
 share/locale/ms/LC_MESSAGES/WindowMaker.mo
+share/locale/nl/LC_MESSAGES/WINGs.mo
+share/locale/nl/LC_MESSAGES/WPrefs.mo
 share/locale/nl/LC_MESSAGES/WindowMaker.mo
+share/locale/nl/LC_MESSAGES/wmgenmenu.mo
 share/locale/no/LC_MESSAGES/WindowMaker.mo
 share/locale/pl/LC_MESSAGES/WindowMaker.mo
 share/locale/pt/LC_MESSAGES/WPrefs.mo
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index c5372fc2db9..19a770b57a6 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,18 +1,17 @@
-$NetBSD: distinfo,v 1.37 2014/05/16 09:29:39 tron Exp $
+$NetBSD: distinfo,v 1.38 2014/10/07 16:11:11 adam Exp $
 
-SHA1 (WindowMaker-0.95.5.tar.gz) = b04aef6a9076dd31a4e819275a78ece1784db28e
-RMD160 (WindowMaker-0.95.5.tar.gz) = 40b7782e1c86c0f850a48daad23cdcdb13f74785
-Size (WindowMaker-0.95.5.tar.gz) = 2927995 bytes
+SHA1 (WindowMaker-0.95.6.tar.gz) = e39c9d1bb012a087de5791c9474ff8776b2d230b
+RMD160 (WindowMaker-0.95.6.tar.gz) = 6faba86fb79190fe1e9de0192e1003603dbcf4ac
+Size (WindowMaker-0.95.6.tar.gz) = 3004856 bytes
 SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f
 SHA1 (patch-ab) = f954dadf7863a0ffc5eb4fb31bfadc218570324d
 SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18
 SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a
 SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3
 SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12
-SHA1 (patch-ag) = 4447310218e73ab0b78e563dabc9ce9614d68cfd
-SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b
-SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9
+SHA1 (patch-ai) = e13349dcdf08a332d8979a21b45c2a8be4951ce2
+SHA1 (patch-aj) = 14636a50f9cb1a2353f813cd7873de0e6c31ddb4
 SHA1 (patch-ak) = 40221313ce3456f4357082caec17991390607159
 SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
 SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
-SHA1 (patch-wrlib_gif.c) = 90fc1019391846983cb5e021c4bbea1d8afb0f99
+SHA1 (patch-wrlib_load__gif.c) = 039c342b99d8cc4edf4ce6ee93c9d1a1a2ac1f5d
diff --git a/wm/windowmaker/patches/patch-ag b/wm/windowmaker/patches/patch-ag
deleted file mode 100644
index 47d450c2ab7..00000000000
--- a/wm/windowmaker/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2013/05/21 14:38:40 hans Exp $
-
---- WINGs/Examples/Makefile.in.orig	2013-01-09 21:43:06.000000000 +0000
-+++ WINGs/Examples/Makefile.in
-@@ -262,9 +262,9 @@ colorpick_DEPENDENCIES = $(top_builddir)
- fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
--connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
-+connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@ @XLIBS@
- server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
--server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@
-+server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ @INTLIBS@ @XLIBS@
- AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
- 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
- 
diff --git a/wm/windowmaker/patches/patch-ai b/wm/windowmaker/patches/patch-ai
index 9bc0f4c4f58..b160c3d74f1 100644
--- a/wm/windowmaker/patches/patch-ai
+++ b/wm/windowmaker/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2005/07/08 09:47:02 adam Exp $
+$NetBSD: patch-ai,v 1.3 2014/10/07 16:11:11 adam Exp $
 
---- WINGs/dragsource.c.orig	2004-10-28 09:29:59.000000000 +0000
+--- WINGs/dragsource.c.orig	2014-08-30 12:29:09.000000000 +0000
 +++ WINGs/dragsource.c
-@@ -3,6 +3,8 @@
+@@ -2,6 +2,8 @@
  #include "wconfig.h"
  #include "WINGsP.h"
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ai,v 1.2 2005/07/08 09:47:02 adam Exp $
 +#include <X11/Xutil.h>
  #include <X11/Xatom.h>
  #include <X11/cursorfont.h>
- #ifdef SHAPE
+ #ifdef USE_XSHAPE
diff --git a/wm/windowmaker/patches/patch-aj b/wm/windowmaker/patches/patch-aj
index f7cdce4affd..783e0ec2cf1 100644
--- a/wm/windowmaker/patches/patch-aj
+++ b/wm/windowmaker/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.3 2013/05/21 14:38:40 hans Exp $
+$NetBSD: patch-aj,v 1.4 2014/10/07 16:11:11 adam Exp $
 
---- src/switchpanel.c.orig	2013-01-09 21:42:49.000000000 +0000
+--- src/switchpanel.c.orig	2014-08-30 12:29:09.000000000 +0000
 +++ src/switchpanel.c
 @@ -37,6 +37,8 @@
- extern Atom _XA_WM_IGNORE_FOCUS_EVENTS;
  
- #ifdef SHAPE
+ 
+ #ifdef USE_XSHAPE
 +#include <X11/Xlib.h>
 +#include <X11/Xutil.h>
  #include <X11/extensions/shape.h>
+ #endif
  
- extern Bool wShapeSupported;
diff --git a/wm/windowmaker/patches/patch-wrlib_gif.c b/wm/windowmaker/patches/patch-wrlib_gif.c
deleted file mode 100644
index ffc6ec779b3..00000000000
--- a/wm/windowmaker/patches/patch-wrlib_gif.c
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-wrlib_gif.c,v 1.2 2014/05/16 09:29:39 tron Exp $
-
-Fix build with giflib 5.1 and newer.
-
---- wrlib/gif.c.orig	2013-09-12 22:43:54.000000000 +0100
-+++ wrlib/gif.c	2014-05-16 10:10:04.000000000 +0100
-@@ -52,6 +52,7 @@
- 	unsigned char rmap[256];
- 	unsigned char gmap[256];
- 	unsigned char bmap[256];
-+	int gif_error;
- 
- 	if (index < 0)
- 		index = 0;
-@@ -59,10 +60,10 @@
- 	/* default error message */
- 	RErrorCode = RERR_BADINDEX;
- 
--	gif = DGifOpenFileName(file);
-+	gif = DGifOpenFileName(file, &gif_error);
- 
- 	if (!gif) {
--		switch (GifLastError()) {
-+		switch (gif_error) {
- 		case D_GIF_ERR_OPEN_FAILED:
- 			RErrorCode = RERR_OPEN;
- 			break;
-@@ -77,7 +78,7 @@
- 	}
- 
- 	if (gif->SWidth < 1 || gif->SHeight < 1) {
--		DGifCloseFile(gif);
-+		DGifCloseFile(gif, NULL);
- 		RErrorCode = RERR_BADIMAGEFILE;
- 		return NULL;
- 	}
-@@ -199,7 +200,7 @@
- 	/* yuck! */
- 	goto did_not_get_any_errors;
-  giferr:
--	switch (GifLastError()) {
-+	switch (gif->Error) {
- 	case D_GIF_ERR_OPEN_FAILED:
- 		RErrorCode = RERR_OPEN;
- 		break;
-@@ -220,7 +221,7 @@
- 		free(buffer);
- 
- 	if (gif)
--		DGifCloseFile(gif);
-+		DGifCloseFile(gif, NULL);
- 
- 	return image;
- }
diff --git a/wm/windowmaker/patches/patch-wrlib_load__gif.c b/wm/windowmaker/patches/patch-wrlib_load__gif.c
new file mode 100644
index 00000000000..8e4ec736ae9
--- /dev/null
+++ b/wm/windowmaker/patches/patch-wrlib_load__gif.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-wrlib_load__gif.c,v 1.1 2014/10/07 16:11:11 adam Exp $
+
+Fix build with giflib 5.1 and newer.
+
+--- wrlib/load_gif.c.orig	2014-10-07 12:55:29.000000000 +0000
++++ wrlib/load_gif.c
+@@ -81,7 +81,7 @@ RImage *RLoadGIF(const char *file, int i
+ 	}
+ 
+ 	if (gif->SWidth < 1 || gif->SHeight < 1) {
+-		DGifCloseFile(gif);
++		DGifCloseFile(gif, NULL);
+ 		RErrorCode = RERR_BADIMAGEFILE;
+ 		return NULL;
+ 	}
+@@ -216,7 +216,7 @@ RImage *RLoadGIF(const char *file, int i
+ 		free(buffer);
+ 
+ 	if (gif)
+-		DGifCloseFile(gif);
++		DGifCloseFile(gif, NULL);
+ 
+ 	return image;
+ }