Changes 0.9.5:

   * Beginnings of CUPS interface were added.
   * Added new control colors and methods from 10.3 version of Cocoa.
   * Added new font methods from 10.3 version of Cocoa.
   * NSApplication -runModalSession behavior changed.
   * You can find the GUI library's version using the Info.plist

4 files changed, 73 insertions, 70 deletions

diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 27c7560ab40..9e9db59fc43 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/04/12 15:54:21 adam Exp $
 
-DISTNAME=	gnustep-gui-0.9.4
-PKGREVISION=	2
+DISTNAME=	gnustep-gui-0.9.5
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/x11/gnustep-gui/PLIST b/x11/gnustep-gui/PLIST
index 337f231a83c..4a934badc90 100644
--- a/x11/gnustep-gui/PLIST
+++ b/x11/gnustep-gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/27 01:07:23 rh Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/04/12 15:54:21 adam Exp $
 share/GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
 share/GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
@@ -259,6 +259,7 @@ share/GNUstep/System/Library/Headers/gnustep/gui/IMLoading.h
 share/GNUstep/System/Library/Images/GNUstep.tiff
 share/GNUstep/System/Library/Images/GNUstepMenuImage.tiff
 share/GNUstep/System/Library/Images/GNUstep_Images_Copyright
+share/GNUstep/System/Library/Images/MagnifyGlass.tiff
 share/GNUstep/System/Library/Images/NSComboArrow.tiff
 share/GNUstep/System/Library/Images/common_2DCheckMark.tiff
 share/GNUstep/System/Library/Images/common_2DDash.tiff
@@ -278,6 +279,7 @@ share/GNUstep/System/Library/Images/common_Close.tiff
 share/GNUstep/System/Library/Images/common_CloseBroken.tiff
 share/GNUstep/System/Library/Images/common_CloseBrokenH.tiff
 share/GNUstep/System/Library/Images/common_CloseH.tiff
+share/GNUstep/System/Library/Images/common_ClosedHandCursor.tiff
 share/GNUstep/System/Library/Images/common_ColorSwatch.tiff
 share/GNUstep/System/Library/Images/common_ComboBoxEllipsis.tiff
 share/GNUstep/System/Library/Images/common_DecimalTabStop.tiff
@@ -293,6 +295,7 @@ share/GNUstep/System/Library/Images/common_Miniaturize.tiff
 share/GNUstep/System/Library/Images/common_MiniaturizeH.tiff
 share/GNUstep/System/Library/Images/common_Mount.tiff
 share/GNUstep/System/Library/Images/common_Nibble.tiff
+share/GNUstep/System/Library/Images/common_OpenHandCursor.tiff
 share/GNUstep/System/Library/Images/common_Printer.tiff
 share/GNUstep/System/Library/Images/common_RadioOff.tiff
 share/GNUstep/System/Library/Images/common_RadioOn.tiff
@@ -355,6 +358,7 @@ share/GNUstep/System/Library/Libraries/Resources/gnustep-gui/English.lproj/GSPri
 share/GNUstep/System/Library/Libraries/Resources/gnustep-gui/English.lproj/GSSpellPanel.gorm/data.classes
 share/GNUstep/System/Library/Libraries/Resources/gnustep-gui/English.lproj/GSSpellPanel.gorm/objects.gorm
 share/GNUstep/System/Library/Libraries/Resources/gnustep-gui/English.lproj/Localizable.strings
+share/GNUstep/System/Library/Libraries/Resources/gnustep-gui/Info-gnustep.plist
 share/GNUstep/System/Library/Libraries/Resources/gnustep-gui/Italian.lproj/Localizable.strings
 share/GNUstep/System/Library/Libraries/libgnustep-gui.so
 share/GNUstep/System/Library/Libraries/libgnustep-gui.so.${PKGVERSION}
diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index 9f83007f642..31fb01844cc 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:11 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/04/12 15:54:21 adam Exp $
 
-SHA1 (gnustep-gui-0.9.4.tar.gz) = 84dcc79c4a2f278b8cc838a62d5dd0298488632b
-RMD160 (gnustep-gui-0.9.4.tar.gz) = db1eb83bf930a0c102a68d83e78acdbd04e0a1ea
-Size (gnustep-gui-0.9.4.tar.gz) = 1839593 bytes
-SHA1 (patch-aa) = 91c54d7e0fb728c349fba963f86704d0d933b88d
+SHA1 (gnustep-gui-0.9.5.tar.gz) = 43081179826d08651a21ddb3a84a2edd9eff8a80
+RMD160 (gnustep-gui-0.9.5.tar.gz) = 1a185500af2708deb94a575ef6513e8cbef406fa
+Size (gnustep-gui-0.9.5.tar.gz) = 1876715 bytes
+SHA1 (patch-aa) = 90a11283fdfe30abbf6205a40c62054a3b80f840
 SHA1 (patch-ab) = 3a0aad91274707c1f935db754dda90b1f6f04d3b
 SHA1 (patch-ac) = 3e30333d462613faf2cedcc6a0b92638aabdc1d6
diff --git a/x11/gnustep-gui/patches/patch-aa b/x11/gnustep-gui/patches/patch-aa
index 016d41d9925..fd3dbf93260 100644
--- a/x11/gnustep-gui/patches/patch-aa
+++ b/x11/gnustep-gui/patches/patch-aa
@@ -1,73 +1,73 @@
-$NetBSD: patch-aa,v 1.2 2003/12/05 10:06:39 adam Exp $
+$NetBSD: patch-aa,v 1.3 2005/04/12 15:54:21 adam Exp $
 
---- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig	2003-07-20 04:08:22.000000000 +0200
+--- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig	2005-03-21 16:25:28.000000000 +0000
 +++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c
-@@ -584,8 +584,10 @@ static int PaHost_CanaryProc( PaHostSoun
- static PaError PaHost_WatchDogProc( PaHostSoundControl   *pahsc )

- {

-     PaError               result = 0;

+@@ -580,8 +580,10 @@ static int PaHost_CanaryProc( PaHostSoun
+ static PaError PaHost_WatchDogProc( PaHostSoundControl   *pahsc )
+ {
+     PaError               result = 0;
 +#ifndef _PTH_PTHREAD_H_
-     struct sched_param    schp = { 0 };

-     int                   maxPri;

+     struct sched_param    schp = { 0 };
+     int                   maxPri;
 +#endif
- 

- #ifdef GNUSTEP

-     GSRegisterCurrentThread(); /* SB20010904 */

-@@ -593,6 +595,7 @@ static PaError PaHost_WatchDogProc( PaHo
-     

- /* Run at a priority level above audio thread so we can still run if it hangs. */

- /* Rise more than 1 because of rumored off-by-one scheduler bugs. */

+ 
+ #ifdef GNUSTEP
+     GSRegisterCurrentThread(); /* SB20010904 */
+@@ -589,6 +591,7 @@ static PaError PaHost_WatchDogProc( PaHo
+     
+ /* Run at a priority level above audio thread so we can still run if it hangs. */
+ /* Rise more than 1 because of rumored off-by-one scheduler bugs. */
 +#ifndef _PTH_PTHREAD_H_
-     schp.sched_priority = pahsc->pahsc_AudioPriority + 4;

-     maxPri = sched_get_priority_max(SCHEDULER_POLICY);

-     if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;

-@@ -602,6 +605,7 @@ static PaError PaHost_WatchDogProc( PaHo
-         ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));

-         goto killAudio;

-     }

+     schp.sched_priority = pahsc->pahsc_AudioPriority + 4;
+     maxPri = sched_get_priority_max(SCHEDULER_POLICY);
+     if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
+@@ -598,6 +601,7 @@ static PaError PaHost_WatchDogProc( PaHo
+         ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
+         goto killAudio;
+     }
 +#endif
-     

-     /* Compare watchdog time with audio and canary thread times. */

-     /* Sleep for a while or until thread cancelled. */

-@@ -637,6 +641,7 @@ static PaError PaHost_WatchDogProc( PaHo
-     return 0;

-     

- lowerAudio:

+     
+     /* Compare watchdog time with audio and canary thread times. */
+     /* Sleep for a while or until thread cancelled. */
+@@ -633,6 +637,7 @@ static PaError PaHost_WatchDogProc( PaHo
+     return 0;
+     
+ lowerAudio:
 +#ifndef _PTH_PTHREAD_H_
-     {

-         struct sched_param    schat = { 0 };

-         if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)

-@@ -650,6 +655,7 @@ lowerAudio:

-             goto cleanup;

-         }

-     }

+     {
+         struct sched_param    schat = { 0 };
+         if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
+@@ -646,6 +651,7 @@ lowerAudio:
+             goto cleanup;
+         }
+     }
 +#endif
-     

- killAudio:

-     ERR_RPT(("PaHost_WatchDogProc: killing hung audio thread!\n"));

-@@ -744,7 +750,9 @@ static PaError PaHost_BoostPriority( int
- {

-     PaHostSoundControl  *pahsc;

-     PaError              result = paNoError;

+     
+ killAudio:
+     ERR_RPT(("PaHost_WatchDogProc: killing hung audio thread!\n"));
+@@ -740,7 +746,9 @@ static PaError PaHost_BoostPriority( int
+ {
+     PaHostSoundControl  *pahsc;
+     PaError              result = paNoError;
 +#ifndef _PTH_PTHREAD_H_
-     struct sched_param   schp = { 0 };

+     struct sched_param   schp = { 0 };
 +#endif
-     

-     pahsc = (PaHostSoundControl *) past->past_DeviceData;

-     if( pahsc == NULL ) return paInternalError;

-@@ -752,6 +760,7 @@ static PaError PaHost_BoostPriority( int
-     pahsc->pahsc_AudioThreadPID = getpid();

-     DBUG(("PaHost_BoostPriority: audio PID = %d\n", pahsc->pahsc_AudioThreadPID ));

-     

+     
+     pahsc = (PaHostSoundControl *) past->past_DeviceData;
+     if( pahsc == NULL ) return paInternalError;
+@@ -748,6 +756,7 @@ static PaError PaHost_BoostPriority( int
+     pahsc->pahsc_AudioThreadPID = getpid();
+     DBUG(("PaHost_BoostPriority: audio PID = %d\n", pahsc->pahsc_AudioThreadPID ));
+     
 +#ifndef _PTH_PTHREAD_H_
-     /* Choose a priority in the middle of the range. */

-     pahsc->pahsc_AudioPriority = (sched_get_priority_max(SCHEDULER_POLICY) -

-                                   sched_get_priority_min(SCHEDULER_POLICY)) / 2;

-@@ -767,6 +776,7 @@ static PaError PaHost_BoostPriority( int
-         /* We are running at high priority so we should have a watchdog in case audio goes wild. */

-         result = PaHost_StartWatchDog( pahsc );

-     }

+     /* Choose a priority in the middle of the range. */
+     pahsc->pahsc_AudioPriority = (sched_get_priority_max(SCHEDULER_POLICY) -
+                                   sched_get_priority_min(SCHEDULER_POLICY)) / 2;
+@@ -763,6 +772,7 @@ static PaError PaHost_BoostPriority( int
+         /* We are running at high priority so we should have a watchdog in case audio goes wild. */
+         result = PaHost_StartWatchDog( pahsc );
+     }
 +#endif
-     

-     return result;

- }

+     
+     return result;
+ }