update to 0.14.6

changes:
-bugfixes
-translation updates
-Isolated the X11 dependency, making easier to support others graphical
 environments
-Improved the magnifier compositor performance, through the elimination of
 X11 sync calls
-Create an applet to apply colorblind filters

5 files changed, 33 insertions, 202 deletions

diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 75458f5df8a..7a74c7eaab4 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2007/04/13 17:36:58 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/07/17 10:48:32 drochner Exp $
 #
 
-DISTNAME=		gnome-mag-0.14.3
+DISTNAME=		gnome-mag-0.14.6
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mag/0.14/}
 EXTRACT_SUFX=		.tar.bz2
@@ -30,4 +30,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-mag/PLIST b/x11/gnome-mag/PLIST
index be3b5b9472b..67d0443e619 100644
--- a/x11/gnome-mag/PLIST
+++ b/x11/gnome-mag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/04/13 17:36:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/07/17 10:48:32 drochner Exp $
 bin/magnifier
 include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
 lib/bonobo/servers/GNOME_Magnifier.server
@@ -6,193 +6,6 @@ lib/libgnome-mag.la
 lib/orbit-2.0/GNOME_Magnifier_module.la
 lib/pkgconfig/gnome-mag-1.0.pc
 man/man1/magnifier.1
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-common_8c-source.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-common_8c.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-imodule_8c-source.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-imodule_8c.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-skels_8c-source.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-skels_8c.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-stubs_8c-source.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier-stubs_8c.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier_8h-source.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier_8h.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier_8idl-source.html
-share/doc/${PKGNAME}/reference/html/GNOME__Magnifier_8idl.html
-share/doc/${PKGNAME}/reference/html/annotated.html
-share/doc/${PKGNAME}/reference/html/dir_6873ac4aad386abfe4dc85b1c4c7162f.html
-share/doc/${PKGNAME}/reference/html/dir_ed2a549a3a7169145b90da06827de1bb.html
-share/doc/${PKGNAME}/reference/html/dirs.html
-share/doc/${PKGNAME}/reference/html/doxygen.css
-share/doc/${PKGNAME}/reference/html/doxygen.png
-share/doc/${PKGNAME}/reference/html/files.html
-share/doc/${PKGNAME}/reference/html/functions.html
-share/doc/${PKGNAME}/reference/html/functions_0x61.html
-share/doc/${PKGNAME}/reference/html/functions_0x62.html
-share/doc/${PKGNAME}/reference/html/functions_0x63.html
-share/doc/${PKGNAME}/reference/html/functions_0x64.html
-share/doc/${PKGNAME}/reference/html/functions_0x65.html
-share/doc/${PKGNAME}/reference/html/functions_0x66.html
-share/doc/${PKGNAME}/reference/html/functions_0x67.html
-share/doc/${PKGNAME}/reference/html/functions_0x68.html
-share/doc/${PKGNAME}/reference/html/functions_0x69.html
-share/doc/${PKGNAME}/reference/html/functions_0x6c.html
-share/doc/${PKGNAME}/reference/html/functions_0x6d.html
-share/doc/${PKGNAME}/reference/html/functions_0x6e.html
-share/doc/${PKGNAME}/reference/html/functions_0x6f.html
-share/doc/${PKGNAME}/reference/html/functions_0x70.html
-share/doc/${PKGNAME}/reference/html/functions_0x71.html
-share/doc/${PKGNAME}/reference/html/functions_0x72.html
-share/doc/${PKGNAME}/reference/html/functions_0x73.html
-share/doc/${PKGNAME}/reference/html/functions_0x74.html
-share/doc/${PKGNAME}/reference/html/functions_0x75.html
-share/doc/${PKGNAME}/reference/html/functions_0x76.html
-share/doc/${PKGNAME}/reference/html/functions_0x77.html
-share/doc/${PKGNAME}/reference/html/functions_0x78.html
-share/doc/${PKGNAME}/reference/html/functions_0x79.html
-share/doc/${PKGNAME}/reference/html/functions_0x7a.html
-share/doc/${PKGNAME}/reference/html/functions_enum.html
-share/doc/${PKGNAME}/reference/html/functions_eval.html
-share/doc/${PKGNAME}/reference/html/functions_func.html
-share/doc/${PKGNAME}/reference/html/functions_vars.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x61.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x62.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x63.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x64.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x65.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x66.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x67.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x68.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x69.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x6c.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x6d.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x6e.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x6f.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x70.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x71.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x72.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x73.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x74.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x75.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x76.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x77.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x78.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x79.html
-share/doc/${PKGNAME}/reference/html/functions_vars_0x7a.html
-share/doc/${PKGNAME}/reference/html/globals.html
-share/doc/${PKGNAME}/reference/html/globals_0x61.html
-share/doc/${PKGNAME}/reference/html/globals_0x62.html
-share/doc/${PKGNAME}/reference/html/globals_0x63.html
-share/doc/${PKGNAME}/reference/html/globals_0x64.html
-share/doc/${PKGNAME}/reference/html/globals_0x65.html
-share/doc/${PKGNAME}/reference/html/globals_0x66.html
-share/doc/${PKGNAME}/reference/html/globals_0x67.html
-share/doc/${PKGNAME}/reference/html/globals_0x69.html
-share/doc/${PKGNAME}/reference/html/globals_0x6c.html
-share/doc/${PKGNAME}/reference/html/globals_0x6d.html
-share/doc/${PKGNAME}/reference/html/globals_0x6e.html
-share/doc/${PKGNAME}/reference/html/globals_0x6f.html
-share/doc/${PKGNAME}/reference/html/globals_0x70.html
-share/doc/${PKGNAME}/reference/html/globals_0x72.html
-share/doc/${PKGNAME}/reference/html/globals_0x73.html
-share/doc/${PKGNAME}/reference/html/globals_0x74.html
-share/doc/${PKGNAME}/reference/html/globals_0x75.html
-share/doc/${PKGNAME}/reference/html/globals_0x7a.html
-share/doc/${PKGNAME}/reference/html/globals_defs.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x62.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x63.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x64.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x65.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x67.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x69.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x6d.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x6f.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x70.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x74.html
-share/doc/${PKGNAME}/reference/html/globals_defs_0x7a.html
-share/doc/${PKGNAME}/reference/html/globals_enum.html
-share/doc/${PKGNAME}/reference/html/globals_eval.html
-share/doc/${PKGNAME}/reference/html/globals_func.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x62.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x63.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x67.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x69.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x6d.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x70.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x72.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x74.html
-share/doc/${PKGNAME}/reference/html/globals_func_0x7a.html
-share/doc/${PKGNAME}/reference/html/globals_type.html
-share/doc/${PKGNAME}/reference/html/globals_vars.html
-share/doc/${PKGNAME}/reference/html/gmag-events_8c-source.html
-share/doc/${PKGNAME}/reference/html/gmag-events_8c.html
-share/doc/${PKGNAME}/reference/html/gmag-events_8h-source.html
-share/doc/${PKGNAME}/reference/html/gmag-events_8h.html
-share/doc/${PKGNAME}/reference/html/index.html
-share/doc/${PKGNAME}/reference/html/interfaceGNOME_1_1Magnifier_1_1Magnifier.html
-share/doc/${PKGNAME}/reference/html/interfaceGNOME_1_1Magnifier_1_1ZoomRegion.html
-share/doc/${PKGNAME}/reference/html/magnifier-main_8c-source.html
-share/doc/${PKGNAME}/reference/html/magnifier-main_8c.html
-share/doc/${PKGNAME}/reference/html/magnifier-private_8h-source.html
-share/doc/${PKGNAME}/reference/html/magnifier-private_8h.html
-share/doc/${PKGNAME}/reference/html/magnifier_8c-source.html
-share/doc/${PKGNAME}/reference/html/magnifier_8c.html
-share/doc/${PKGNAME}/reference/html/magnifier_8h-source.html
-share/doc/${PKGNAME}/reference/html/magnifier_8h.html
-share/doc/${PKGNAME}/reference/html/namespaceGNOME.html
-share/doc/${PKGNAME}/reference/html/namespaceGNOME_1_1Magnifier.html
-share/doc/${PKGNAME}/reference/html/namespacemembers.html
-share/doc/${PKGNAME}/reference/html/namespacemembers_type.html
-share/doc/${PKGNAME}/reference/html/namespaces.html
-share/doc/${PKGNAME}/reference/html/structBonobo__EventSource__UnknownListener__type.html
-share/doc/${PKGNAME}/reference/html/structBonobo__Pair__type.html
-share/doc/${PKGNAME}/reference/html/structBonobo__PropertyBag__BackendFailed__type.html
-share/doc/${PKGNAME}/reference/html/structBonobo__PropertyBag__InvalidType__type.html
-share/doc/${PKGNAME}/reference/html/structBonobo__PropertyBag__NotFound__type.html
-share/doc/${PKGNAME}/reference/html/structBonobo__PropertyBag__ReadOnly__type.html
-share/doc/${PKGNAME}/reference/html/structCORBA__sequence__Bonobo__Pair.html
-share/doc/${PKGNAME}/reference/html/structCORBA__sequence__CORBA__Object.html
-share/doc/${PKGNAME}/reference/html/structCORBA__sequence__CORBA__string.html
-share/doc/${PKGNAME}/reference/html/structGNOME_1_1Magnifier_1_1Point.html
-share/doc/${PKGNAME}/reference/html/structGNOME_1_1Magnifier_1_1RectBounds.html
-share/doc/${PKGNAME}/reference/html/structGNOME__Magnifier__Point__type.html
-share/doc/${PKGNAME}/reference/html/structGNOME__Magnifier__RectBounds__type.html
-share/doc/${PKGNAME}/reference/html/structMagLoginHelper.html
-share/doc/${PKGNAME}/reference/html/structMagLoginHelperClass.html
-share/doc/${PKGNAME}/reference/html/structMagnifier.html
-share/doc/${PKGNAME}/reference/html/structMagnifierClass.html
-share/doc/${PKGNAME}/reference/html/structMagnifierOptions.html
-share/doc/${PKGNAME}/reference/html/structMagnifierZoomRegionSaveProps.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__ConfigDatabase.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__ConfigDatabase____epv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__ConfigDatabase____vepv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__EventSource.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__EventSource____epv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__EventSource____vepv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__Listener.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__Listener____epv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__Listener____vepv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__PropertyBag.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__PropertyBag____epv.html
-share/doc/${PKGNAME}/reference/html/structPOA__Bonobo__PropertyBag____vepv.html
-share/doc/${PKGNAME}/reference/html/structPOA__GNOME__Magnifier__Magnifier.html
-share/doc/${PKGNAME}/reference/html/structPOA__GNOME__Magnifier__Magnifier____epv.html
-share/doc/${PKGNAME}/reference/html/structPOA__GNOME__Magnifier__Magnifier____vepv.html
-share/doc/${PKGNAME}/reference/html/structPOA__GNOME__Magnifier__ZoomRegion.html
-share/doc/${PKGNAME}/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____epv.html
-share/doc/${PKGNAME}/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____vepv.html
-share/doc/${PKGNAME}/reference/html/structZoomRegion.html
-share/doc/${PKGNAME}/reference/html/structZoomRegionClass.html
-share/doc/${PKGNAME}/reference/html/struct__GmagWin.html
-share/doc/${PKGNAME}/reference/html/struct__MagnifierPrivate.html
-share/doc/${PKGNAME}/reference/html/struct__ZoomRegionPrivate.html
-share/doc/${PKGNAME}/reference/html/structtiming.html
-share/doc/${PKGNAME}/reference/html/tabs.css
-share/doc/${PKGNAME}/reference/html/zoom-region-private_8h-source.html
-share/doc/${PKGNAME}/reference/html/zoom-region-private_8h.html
-share/doc/${PKGNAME}/reference/html/zoom-region_8c-source.html
-share/doc/${PKGNAME}/reference/html/zoom-region_8c.html
-share/doc/${PKGNAME}/reference/html/zoom-region_8h-source.html
-share/doc/${PKGNAME}/reference/html/zoom-region_8h.html
 share/gnome-mag/1_32/appstart.xpm
 share/gnome-mag/1_32/bottom_left_corner.xpm
 share/gnome-mag/1_32/bottom_side.xpm
@@ -219,6 +32,7 @@ share/locale/ar/LC_MESSAGES/gnome-mag.mo
 share/locale/as/LC_MESSAGES/gnome-mag.mo
 share/locale/az/LC_MESSAGES/gnome-mag.mo
 share/locale/be/LC_MESSAGES/gnome-mag.mo
+share/locale/be@latin/LC_MESSAGES/gnome-mag.mo
 share/locale/bg/LC_MESSAGES/gnome-mag.mo
 share/locale/bn/LC_MESSAGES/gnome-mag.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-mag.mo
@@ -269,6 +83,7 @@ share/locale/nb/LC_MESSAGES/gnome-mag.mo
 share/locale/ne/LC_MESSAGES/gnome-mag.mo
 share/locale/nl/LC_MESSAGES/gnome-mag.mo
 share/locale/nn/LC_MESSAGES/gnome-mag.mo
+share/locale/oc/LC_MESSAGES/gnome-mag.mo
 share/locale/or/LC_MESSAGES/gnome-mag.mo
 share/locale/pa/LC_MESSAGES/gnome-mag.mo
 share/locale/pl/LC_MESSAGES/gnome-mag.mo
@@ -298,9 +113,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @comment in ORBit2: @dirrm share/idl
 @dirrm share/gnome-mag/1_32
 @dirrm share/gnome-mag
-@dirrm share/doc/${PKGNAME}/reference/html
-@dirrm share/doc/${PKGNAME}/reference
-@dirrm share/doc/${PKGNAME}
 @comment in ORBit2: @dirrm lib/orbit-2.0
 @comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/gnome-mag-1.0/magnifier
diff --git a/x11/gnome-mag/distinfo b/x11/gnome-mag/distinfo
index f75cf31344d..7dfa4fbcf34 100644
--- a/x11/gnome-mag/distinfo
+++ b/x11/gnome-mag/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.19 2007/04/13 17:36:58 wiz Exp $
+$NetBSD: distinfo,v 1.20 2007/07/17 10:48:32 drochner Exp $
 
-SHA1 (gnome-mag-0.14.3.tar.bz2) = 829a972ecbd0b5c046bb24899716961634b47913
-RMD160 (gnome-mag-0.14.3.tar.bz2) = ff9d6ec1bca8662e54593c0031701c5004d3af9c
-Size (gnome-mag-0.14.3.tar.bz2) = 789808 bytes
-SHA1 (patch-aa) = 3bcd2539ffc27e0814c0a1d5d547b11de6685018
+SHA1 (gnome-mag-0.14.6.tar.bz2) = 9fab986efc9779d449ba4154dcb72f3533efcc34
+RMD160 (gnome-mag-0.14.6.tar.bz2) = 51bf08b3a394f28b0aa915dc1abf308dc2173661
+Size (gnome-mag-0.14.6.tar.bz2) = 468841 bytes
+SHA1 (patch-aa) = cc1889919e77befcdb813775990807718b8ee371
+SHA1 (patch-ab) = 76bd98a187f995b3eaf230282c446047093c52fb
diff --git a/x11/gnome-mag/patches/patch-aa b/x11/gnome-mag/patches/patch-aa
index 8eeb066510c..1082b233d9b 100644
--- a/x11/gnome-mag/patches/patch-aa
+++ b/x11/gnome-mag/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2007/04/13 17:36:58 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2007/07/17 10:48:32 drochner Exp $
 
---- magnifier/zoom-region.c.orig	2007-03-09 16:53:32.000000000 +0000
+--- magnifier/zoom-region.c.orig	2007-06-18 18:52:39.000000000 +0200
 +++ magnifier/zoom-region.c
-@@ -22,6 +22,7 @@
- 
+@@ -23,6 +23,7 @@
  #include "config.h"
+ #include "gmag-graphical-server.h"
  
 +#include <sys/time.h>
  #include <stdlib.h>
diff --git a/x11/gnome-mag/patches/patch-ab b/x11/gnome-mag/patches/patch-ab
new file mode 100644
index 00000000000..99aad33f825
--- /dev/null
+++ b/x11/gnome-mag/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.3 2007/07/17 10:48:33 drochner Exp $
+
+--- docs/reference/Makefile.in.orig	2007-07-13 20:40:54.000000000 +0200
++++ docs/reference/Makefile.in
+@@ -466,9 +466,9 @@ uninstall-reference: html/index.html
+ 	  rm -f $(DESTDIR)$(referencedir)/$$f; \
+ 	done
+ 
+-all-local: html/index.html
++all-local: #html/index.html
+ 
+-install-data-local: install-reference
++install-data-local: #install-reference
+ 
+ uninstall-local: uninstall-reference
+