Update gnustep-gui to 0.22.0

Noteworthy changes in version `0.22.0'
======================================

   * This version is binary incompatible with previous versions due to
     the change of NSNotFound in GNUstep base.

   * Support for drawing the GUI with a scale factor, for high-DPI
     monitors.

   * Character panel

   * Color picker "Magnifier" tool, for grabbing the color of arbitrary
     parts of the screen

   Many NSImage improvements (Mac OS X 10.6 drawing methods, better
selection of image reps, better support for icons). Many bugfixes,
including in Xib loading, printing, and NSView geometry.

Noteworthy changes in version `0.20.0'
======================================

A new stable release. Many improvments with Nib loading, documents and
document controllers. Fixed many drawing issues, particularly ones
related to flipping. Much improved theming.

5 files changed, 68 insertions, 68 deletions

diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 0cd9883ca65..575da30b7b3 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2012/02/06 12:41:58 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2012/10/22 02:21:21 rh Exp $
 
-DISTNAME=	gnustep-gui-0.18.0
-PKGREVISION=	2
+DISTNAME=	gnustep-gui-0.22.0
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -19,8 +18,8 @@ MAKE_FILE=		GNUmakefile
 
 INSTALLATION_DIRS+=	share/GNUstep/Applications
 
-.include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gnustep-base/buildlink3.mk"
+.include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/giflib.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/x11/gnustep-gui/PLIST b/x11/gnustep-gui/PLIST
index 8822e280f25..3b0c352ab3e 100644
--- a/x11/gnustep-gui/PLIST
+++ b/x11/gnustep-gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2011/04/07 02:07:19 rh Exp $
+@comment $NetBSD: PLIST,v 1.23 2012/10/22 02:21:21 rh Exp $
 bin/gclose
 bin/gcloseall
 bin/gopen
@@ -15,9 +15,9 @@ include/AppKit/GSDisplayServer.h
 include/AppKit/GSDragView.h
 include/AppKit/GSEPSPrintOperation.h
 include/AppKit/GSFontInfo.h
-include/AppKit/GSFusedSilica.h
 include/AppKit/GSGormLoading.h
 include/AppKit/GSHbox.h
+include/AppKit/GSHelpAttachment.h
 include/AppKit/GSHelpManagerPanel.h
 include/AppKit/GSHorizontalTypesetter.h
 include/AppKit/GSInfoPanel.h
@@ -46,6 +46,7 @@ include/AppKit/GSTypesetter.h
 include/AppKit/GSVbox.h
 include/AppKit/GSVersion.h
 include/AppKit/GSWindowDecorationView.h
+include/AppKit/GSXibLoading.h
 include/AppKit/IMConnectors.h
 include/AppKit/IMCustomObject.h
 include/AppKit/IMLoading.h
@@ -187,6 +188,7 @@ include/AppKit/NSToolbarItemGroup.h
 include/AppKit/NSUserDefaultsController.h
 include/AppKit/NSUserInterfaceValidation.h
 include/AppKit/NSView.h
+include/AppKit/NSViewController.h
 include/AppKit/NSWindow.h
 include/AppKit/NSWindowController.h
 include/AppKit/NSWorkspace.h
@@ -199,9 +201,9 @@ include/GNUstepGUI/GSDisplayServer.h
 include/GNUstepGUI/GSDragView.h
 include/GNUstepGUI/GSEPSPrintOperation.h
 include/GNUstepGUI/GSFontInfo.h
-include/GNUstepGUI/GSFusedSilica.h
 include/GNUstepGUI/GSGormLoading.h
 include/GNUstepGUI/GSHbox.h
+include/GNUstepGUI/GSHelpAttachment.h
 include/GNUstepGUI/GSHelpManagerPanel.h
 include/GNUstepGUI/GSHorizontalTypesetter.h
 include/GNUstepGUI/GSInfoPanel.h
@@ -230,6 +232,7 @@ include/GNUstepGUI/GSTypesetter.h
 include/GNUstepGUI/GSVbox.h
 include/GNUstepGUI/GSVersion.h
 include/GNUstepGUI/GSWindowDecorationView.h
+include/GNUstepGUI/GSXibLoading.h
 include/GNUstepGUI/IMConnectors.h
 include/GNUstepGUI/IMCustomObject.h
 include/GNUstepGUI/IMLoading.h
@@ -240,9 +243,9 @@ include/gnustep/gui/GSDisplayServer.h
 include/gnustep/gui/GSDragView.h
 include/gnustep/gui/GSEPSPrintOperation.h
 include/gnustep/gui/GSFontInfo.h
-include/gnustep/gui/GSFusedSilica.h
 include/gnustep/gui/GSGormLoading.h
 include/gnustep/gui/GSHbox.h
+include/gnustep/gui/GSHelpAttachment.h
 include/gnustep/gui/GSHelpManagerPanel.h
 include/gnustep/gui/GSHorizontalTypesetter.h
 include/gnustep/gui/GSInfoPanel.h
@@ -271,6 +274,7 @@ include/gnustep/gui/GSTypesetter.h
 include/gnustep/gui/GSVbox.h
 include/gnustep/gui/GSVersion.h
 include/gnustep/gui/GSWindowDecorationView.h
+include/gnustep/gui/GSXibLoading.h
 include/gnustep/gui/IMConnectors.h
 include/gnustep/gui/IMCustomObject.h
 include/gnustep/gui/IMLoading.h
@@ -334,19 +338,27 @@ lib/GNUstep/Images/common_ClosedHandCursor.tiff
 lib/GNUstep/Images/common_ColorSwatch.tiff
 lib/GNUstep/Images/common_ComboBoxEllipsis.tiff
 lib/GNUstep/Images/common_DecimalTabStop.tiff
+lib/GNUstep/Images/common_Desktop.tiff
 lib/GNUstep/Images/common_Diamond.tiff
 lib/GNUstep/Images/common_Dimple.tiff
 lib/GNUstep/Images/common_DimpleHoriz.tiff
+lib/GNUstep/Images/common_DocsFolder.tiff
 lib/GNUstep/Images/common_DownArrowSmall.tiff
+lib/GNUstep/Images/common_DownloadFolder.tiff
 lib/GNUstep/Images/common_Folder.tiff
+lib/GNUstep/Images/common_GSFolder.tiff
 lib/GNUstep/Images/common_HelpCursor.tiff
+lib/GNUstep/Images/common_HelpLink.tiff
 lib/GNUstep/Images/common_Home.tiff
 lib/GNUstep/Images/common_HomeDirectory.tiff
+lib/GNUstep/Images/common_ImageFolder.tiff
 lib/GNUstep/Images/common_LeftTabStop.tiff
+lib/GNUstep/Images/common_LibraryFolder.tiff
 lib/GNUstep/Images/common_MiniWindowTile.tiff
 lib/GNUstep/Images/common_Miniaturize.tiff
 lib/GNUstep/Images/common_MiniaturizeH.tiff
 lib/GNUstep/Images/common_Mount.tiff
+lib/GNUstep/Images/common_MusicFolder.tiff
 lib/GNUstep/Images/common_Nibble.tiff
 lib/GNUstep/Images/common_OpenHandCursor.tiff
 lib/GNUstep/Images/common_Printer.tiff
@@ -416,43 +428,49 @@ lib/GNUstep/Images/nsmapping.strings
 lib/GNUstep/Images/page_landscape.tiff
 lib/GNUstep/Images/page_portrait.tiff
 lib/GNUstep/KeyBindings/DefaultKeyBindings.dict
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPageLayout.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPageLayout.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPrintPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPrintPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSSpellPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Esperanto.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/French.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/German.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Info-gnustep.plist
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Lojban.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSFindPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSFindPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPageLayout.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPageLayout.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPrintPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPrintPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSSpellPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Esperanto.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/French.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Info-gnustep.plist
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Lojban.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/Localizable.strings
 lib/GNUstep/PostScript/GSProlog.ps
 lib/GNUstep/PostScript/PPD/English.lproj/Generic-PostScript_Printer-Postscript.ppd
 lib/GNUstep/Services/GSspell.service/GSspell
diff --git a/x11/gnustep-gui/PLIST.SunOS b/x11/gnustep-gui/PLIST.SunOS
index 814b2e398af..86c0301338b 100644
--- a/x11/gnustep-gui/PLIST.SunOS
+++ b/x11/gnustep-gui/PLIST.SunOS
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2011/09/14 18:17:14 hans Exp $
-lib/libgnustep-gui.so.0.18
+@comment $NetBSD: PLIST.SunOS,v 1.2 2012/10/22 02:21:21 rh Exp $
+lib/libgnustep-gui.so.0.22
diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index 51ab0098d6c..218e8193f64 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.22 2011/04/07 02:07:19 rh Exp $
+$NetBSD: distinfo,v 1.23 2012/10/22 02:21:21 rh Exp $
 
-SHA1 (gnustep-gui-0.18.0.tar.gz) = f78e2b03c05bb6b5f40d6b1ec129835f758f1947
-RMD160 (gnustep-gui-0.18.0.tar.gz) = 38f938d1ed2d98e351eb5c6d325bd4782ef2c3fb
-Size (gnustep-gui-0.18.0.tar.gz) = 2520596 bytes
-SHA1 (patch-aa) = 6882f212b477971283b70464cc7f52502aad8d83
+SHA1 (gnustep-gui-0.22.0.tar.gz) = dc9654ea3437810a9b4bfd3d2193a25628a88b41
+RMD160 (gnustep-gui-0.22.0.tar.gz) = 20153480d712a148e9e504f09273f70e1ba2f6d2
+Size (gnustep-gui-0.22.0.tar.gz) = 2734733 bytes
diff --git a/x11/gnustep-gui/patches/patch-aa b/x11/gnustep-gui/patches/patch-aa
deleted file mode 100644
index 4cf81c3a285..00000000000
--- a/x11/gnustep-gui/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2011/01/29 12:40:14 wiz Exp $
-
-Fix build with png-1.5.
-https://savannah.gnu.org/bugs/index.php?32290
-
---- Source/NSBitmapImageRep+PNG.m.orig	2008-06-10 04:01:49.000000000 +0000
-+++ Source/NSBitmapImageRep+PNG.m
-@@ -225,7 +225,7 @@ static void reader_func(png_structp png_
-     initWithBytesNoCopy: buf
- 		 length: bytes_per_row * height];
- 
--  if (PNG_INFO_gAMA & png_info->valid)
-+  if (png_get_valid(png_struct, png_info, PNG_INFO_gAMA))
-   {
-     double file_gamma = 2.2;
-     if (PNG_FLOATING_POINT)