From 58075a32d663a7906133c173384686639063f8c8 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 9 Nov 2013 08:14:57 +0100
Subject: [PATCH] - updated to 0.23.1 - removed obsolete segv patch - dropped
 outdated themes patch (camelon no longer needs it it seems)

---
 gnustep-gui-segv.patch   |  15 -----
 gnustep-gui-themes.patch | 119 ---------------------------------------
 gnustep-gui.spec         | 113 +++++++++++++++++++++++++++----------
 3 files changed, 83 insertions(+), 164 deletions(-)
 delete mode 100644 gnustep-gui-segv.patch
 delete mode 100644 gnustep-gui-themes.patch

diff --git a/gnustep-gui-segv.patch b/gnustep-gui-segv.patch
deleted file mode 100644
index c4ac0b5..0000000
--- a/gnustep-gui-segv.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnustep-gui-0.9.1/Tools/make_services.m.orig	2003-10-10 05:55:11.000000000 +0200
-+++ gnustep-gui-0.9.1/Tools/make_services.m	2003-12-29 16:08:38.987141624 +0100
-@@ -199,6 +199,12 @@
-   usrRoot = [NSSearchPathForDirectoriesInDomains(NSUserDirectory,
-     NSUserDomainMask, YES) lastObject];
- 
-+  /* don't SEGV if ~/GNUstep doesn't exist */
-+  if(usrRoot == nil)
-+    {
-+      exit(EXIT_FAILURE);
-+    }
-+
-   mgr = [NSFileManager defaultManager];
-   if (([mgr fileExistsAtPath: usrRoot isDirectory: &isDir] && isDir) == 0)
-     {
diff --git a/gnustep-gui-themes.patch b/gnustep-gui-themes.patch
deleted file mode 100644
index d4be9fe..0000000
--- a/gnustep-gui-themes.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -ur gnustep-gui-0.8.7-orig/Source/Functions.m gnustep-gui-0.8.7/Source/Functions.m
---- gnustep-gui-0.8.7-orig/Source/Functions.m	2003-06-13 09:01:10.000000000 -0600
-+++ gnustep-gui-0.8.7/Source/Functions.m	2003-07-24 17:47:22.000000000 -0600
-@@ -566,9 +566,9 @@
- 			       up_sides, grays, 6);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void
-@@ -602,9 +602,9 @@
-       DPSrectfill(ctxt, NSMaxX(aRect) - 2., NSMaxY(aRect) - 2., 1., 1.);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-@@ -630,9 +630,9 @@
- 			       up_sides, grays, 8);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-@@ -658,9 +658,9 @@
- 			       up_sides, grays, 8);
-     }
- 
--  DPSsetgray(ctxt, NSWhite);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSWhite);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-@@ -700,9 +700,9 @@
- 			       up_sides, grays, 6);
-     }
- 
--  DPSsetgray(ctxt, NSLightGray);
--  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
--	      NSWidth(rect), NSHeight(rect));
-+//  DPSsetgray(ctxt, NSLightGray);
-+//  DPSrectfill(ctxt, NSMinX(rect), NSMinY(rect), 
-+//	      NSWidth(rect), NSHeight(rect));
- }
- 
- void 
-diff -ur gnustep-gui-0.8.7-orig/Source/NSApplication.m gnustep-gui-0.8.7/Source/NSApplication.m
---- gnustep-gui-0.8.7-orig/Source/NSApplication.m	2003-06-13 09:01:11.000000000 -0600
-+++ gnustep-gui-0.8.7/Source/NSApplication.m	2003-07-24 17:48:30.000000000 -0600
-@@ -221,7 +221,27 @@
- 	  _(@"Backend at path %@ doesn't contain the GSBackend class"), path);
- 	[backend initializeBackend];
-       }
--
-+ 
-+       /* hack to load arbitrary bundles - Alexander Malmberg 2002-05-09 */
-+       {
-+           NSUserDefaults *defs=[NSUserDefaults standardUserDefaults];
-+           NSString *s=[defs stringForKey: @"GUIThemeBundles"];
-+           NSArray *a=[s componentsSeparatedByString: @" "];
-+           int i,c=[a count];
-+           NSLog(@"try loading '%@'",s);
-+           for (i=0;i<c;i++)
-+           {
-+              NSLog(@"try '%@'\n",[a objectAtIndex: i]);
-+              NSBundle *b=[NSBundle bundleWithPath: [a objectAtIndex: i]];
-+              if (!b)
-+              {
-+                  NSLog(@"Couldn't load theme bundle '%@'!",[a objectAtIndex: i]);
-+                  continue;
-+              }
-+              [[[b principalClass] alloc] init];
-+           }
-+       }
-+ 
- #else
-       /* GSBackend will be in a separate library, so use the runtime
- 	 to find the class and avoid an unresolved reference problem */
-Only in gnustep-gui-0.8.7/Source: NSApplication.m~
-Only in gnustep-gui-0.8.7/Source: NSApplication.m.orig
-diff -ur gnustep-gui-0.8.7-orig/Source/NSColor.m gnustep-gui-0.8.7/Source/NSColor.m
---- gnustep-gui-0.8.7-orig/Source/NSColor.m	2003-06-13 09:01:11.000000000 -0600
-+++ gnustep-gui-0.8.7/Source/NSColor.m	2003-07-24 17:47:22.000000000 -0600
-@@ -698,6 +698,13 @@
-   return systemColorWithName(@"windowFrameTextColor");
- }
- 
-++ (void) setColor: (NSColor*) color forKey: (NSString*) key
-+{
-+        [systemColors setColor: color forKey: key];
-+	[[systemDict objectForKey: key] recache];
-+}
-+
-+
- ////////////////////////////////////////////////////////////
- //
- // Instance methods
diff --git a/gnustep-gui.spec b/gnustep-gui.spec
index 865444c..c55b8ac 100644
--- a/gnustep-gui.spec
+++ b/gnustep-gui.spec
@@ -1,32 +1,38 @@
 #
 # Conditional build:
 %bcond_without	cups		# GSCUPS bundle
+%bcond_without	magick		# ImageMagick support
 %bcond_without	portaudio	# gsnd tool
 #
 Summary:	GNUstep GUI library package
 Summary(pl.UTF-8):	Biblioteka GNUstep GUI
 Name:		gnustep-gui
-%define	ver	0.16
-Version:	%{ver}.0
-Release:	3
-License:	LGPL/GPL
+%define	ver	0.23
+Version:	%{ver}.1
+Release:	1
+License:	LGPL v2+ (library), GPL v3+ (applications)
 Group:		Libraries
 Source0:	ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
-# Source0-md5:	464b80094e438fe0cc8e6ae691b3384c
-Patch0:		%{name}-themes.patch
-Patch1:		%{name}-nocompressdocs.patch
-Patch2:		%{name}-segv.patch
-Patch3:		%{name}-doc.patch
+# Source0-md5:	1771bdb42f27ee946b17bf60fef5eb2e
+Patch0:		%{name}-nocompressdocs.patch
+Patch1:		%{name}-doc.patch
 URL:		http://www.gnustep.org/
+%{?with_magick:BuildRequires:	ImageMagick-devel}
 BuildRequires:	aspell-devel
 BuildRequires:	audiofile-devel
 %{?with_cups:BuildRequires:	cups-devel}
+BuildRequires:	flite-devel
 BuildRequires:	gcc-objc
 BuildRequires:	giflib-devel
 BuildRequires:	gnustep-base-devel >= 1.13.0
+BuildRequires:	gnustep-make-devel
+BuildRequires:	libao-devel
+BuildRequires:	libicu-devel >= 4.0
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libsndfile-devel
 BuildRequires:	libtiff-devel
+BuildRequires:	pkgconfig
 %{?with_portaudio:BuildRequires:	portaudio-devel >= 19}
 BuildRequires:	zlib-devel
 Requires:	gnustep-base >= 1.13.0
@@ -75,8 +81,6 @@ biblioteki GNUstep GUI.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
@@ -84,7 +88,10 @@ export GNUSTEP_FLATTENED=yes
 # disable gsnd - not ready for current portaudio
 %configure \
 	%{!?with_cups:--disable-cups} \
-	%{!?with_portaudio:--disable-gsnd}
+	%{!?with_portaudio:--disable-gsnd} \
+	%{?with_magick:--enable-imagemagick} \
+	--enable-libgif \
+	--disable-ungif
 
 # with __make -jN we can got non-deterministic errors
 %{__make} -j1 \
@@ -124,46 +131,86 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/GNUstep/Documentation/Developer/Gui/ReleaseNotes
 %{_datadir}/GNUstep/Documentation/User
 
-%{_mandir}/man1/*
+%{_mandir}/man1/gclose.1*
+%{_mandir}/man1/gcloseall.1*
+%{_mandir}/man1/gopen.1*
+%{_mandir}/man1/make_services.1*
+%{_mandir}/man1/set_show_service.1*
 
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libgnustep-gui.so.*
+%attr(755,root,root) %{_bindir}/GSSpeechServer
+%attr(755,root,root) %{_bindir}/gclose
+%attr(755,root,root) %{_bindir}/gcloseall
+%attr(755,root,root) %{_bindir}/gopen
+%attr(755,root,root) %{_bindir}/make_services
+%attr(755,root,root) %{_bindir}/say
+%attr(755,root,root) %{_bindir}/set_show_service
+%attr(755,root,root) %{_libdir}/libgnustep-gui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnustep-gui.so.%{ver}
+
+%dir %{_libdir}/GNUstep/Applications
+%dir %{_libdir}/GNUstep/Applications/GSSpeechServer.app
+%attr(755,root,root) %{_libdir}/GNUstep/Applications/GSSpeechServer.app/GSSpeechServer
+%{_libdir}/GNUstep/Applications/GSSpeechServer.app/Resources
+%{_libdir}/GNUstep/Applications/GSSpeechServer.app/stamp.make
 
 %dir %{_libdir}/GNUstep/Bundles
+
+%dir %{_libdir}/GNUstep/Bundles/AudioOutput.nssound
+%attr(755,root,root) %{_libdir}/GNUstep/Bundles/AudioOutput.nssound/AudioOutput
+%{_libdir}/GNUstep/Bundles/AudioOutput.nssound/Resources
+%{_libdir}/GNUstep/Bundles/AudioOutput.nssound/stamp.make
+
 %dir %{_libdir}/GNUstep/Bundles/GSPrinting
 %dir %{_libdir}/GNUstep/Bundles/GSPrinting/GSLPR.bundle
+%attr(755,root,root) %{_libdir}/GNUstep/Bundles/GSPrinting/GSLPR.bundle/GSLPR
 %{_libdir}/GNUstep/Bundles/GSPrinting/GSLPR.bundle/Resources
-%{_libdir}/GNUstep/Bundles/GSPrinting/GSLPR.bundle/GSLPR
+%{_libdir}/GNUstep/Bundles/GSPrinting/GSLPR.bundle/stamp.make
 %if %{with cups}
 # R: cups-lib - separate?
 %dir %{_libdir}/GNUstep/Bundles/GSPrinting/GSCUPS.bundle
+%attr(755,root,root) %{_libdir}/GNUstep/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS
 %{_libdir}/GNUstep/Bundles/GSPrinting/GSCUPS.bundle/Resources
-%{_libdir}/GNUstep/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS
+%{_libdir}/GNUstep/Bundles/GSPrinting/GSCUPS.bundle/stamp.make
 %endif
 
+%dir %{_libdir}/GNUstep/Bundles/Sndfile.nssound
+%attr(755,root,root) %{_libdir}/GNUstep/Bundles/Sndfile.nssound/Sndfile
+%{_libdir}/GNUstep/Bundles/Sndfile.nssound/Resources
+%{_libdir}/GNUstep/Bundles/Sndfile.nssound/stamp.make
+
 %dir %{_libdir}/GNUstep/Bundles/TextConverters
 %dir %{_libdir}/GNUstep/Bundles/TextConverters/RTFConverter.bundle
-%{_libdir}/GNUstep/Bundles/TextConverters/RTFConverter.bundle/Resources
 %attr(755,root,root) %{_libdir}/GNUstep/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
+%{_libdir}/GNUstep/Bundles/TextConverters/RTFConverter.bundle/Resources
+%{_libdir}/GNUstep/Bundles/TextConverters/RTFConverter.bundle/stamp.make
+
 %dir %{_libdir}/GNUstep/Bundles/libgmodel.bundle
-%{_libdir}/GNUstep/Bundles/libgmodel.bundle/Resources
 %attr(755,root,root) %{_libdir}/GNUstep/Bundles/libgmodel.bundle/libgmodel
+%{_libdir}/GNUstep/Bundles/libgmodel.bundle/Resources
+%{_libdir}/GNUstep/Bundles/libgmodel.bundle/stamp.make
 
 %dir %{_libdir}/GNUstep/ColorPickers
+
 %dir %{_libdir}/GNUstep/ColorPickers/NamedPicker.bundle
-%{_libdir}/GNUstep/ColorPickers/NamedPicker.bundle/Resources
 %attr(755,root,root) %{_libdir}/GNUstep/ColorPickers/NamedPicker.bundle/NamedPicker
+%{_libdir}/GNUstep/ColorPickers/NamedPicker.bundle/Resources
+%{_libdir}/GNUstep/ColorPickers/NamedPicker.bundle/stamp.make
+
 %dir %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle
+%attr(755,root,root) %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/StandardPicker
 %dir %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources
 %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources/*.tiff
 %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources/*.plist
 %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources/English.lproj
 %lang(fr) %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources/French.lproj
+%lang(es) %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj
 %lang(sv) %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj
-%attr(755,root,root) %{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/StandardPicker
+%{_libdir}/GNUstep/ColorPickers/StandardPicker.bundle/stamp.make
+
 %dir %{_libdir}/GNUstep/ColorPickers/WheelPicker.bundle
-%{_libdir}/GNUstep/ColorPickers/WheelPicker.bundle/Resources
 %attr(755,root,root) %{_libdir}/GNUstep/ColorPickers/WheelPicker.bundle/WheelPicker
+%{_libdir}/GNUstep/ColorPickers/WheelPicker.bundle/Resources
+%{_libdir}/GNUstep/ColorPickers/WheelPicker.bundle/stamp.make
 
 %{_libdir}/GNUstep/Images
 %{_libdir}/GNUstep/KeyBindings
@@ -175,32 +222,38 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/*.plist
 %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/English.lproj
 %lang(eo) %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/Esperanto.lproj
+%lang(fr) %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/French.lproj
 %lang(de) %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/German.lproj
 %lang(it) %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/Italian.lproj
 %lang(jbo) %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/Lojban.lproj
+%lang(es) %{_libdir}/GNUstep/Libraries/gnustep-gui/Versions/%{ver}/Resources/Spanish.lproj
 
 %dir %{_libdir}/GNUstep/PostScript
 %{_libdir}/GNUstep/PostScript/GSProlog.ps
 %dir %{_libdir}/GNUstep/PostScript/PPD
 %{_libdir}/GNUstep/PostScript/PPD/English.lproj
+
 %dir %{_libdir}/GNUstep/Services
+
 %dir %{_libdir}/GNUstep/Services/GSspell.service
-%{_libdir}/GNUstep/Services/GSspell.service/Resources
 %attr(755,root,root) %{_libdir}/GNUstep/Services/GSspell.service/GSspell
+%{_libdir}/GNUstep/Services/GSspell.service/Resources
+
+%{_libdir}/GNUstep/Sounds
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnustep-gui.so
+%{_includedir}/AppKit
+%{_includedir}/Cocoa
+%{_includedir}/GNUstepGUI
+%{_includedir}/gnustep/gui
+
 %docdir %{_datadir}/GNUstep/Documentation
 %{_datadir}/GNUstep/Documentation/Developer/Gui/Additions
 %{_datadir}/GNUstep/Documentation/Developer/Gui/General
 %{_datadir}/GNUstep/Documentation/Developer/Gui/ProgrammingManual
 %{_datadir}/GNUstep/Documentation/Developer/Gui/Reference
-%{_infodir}/*.info*
-
-%{_includedir}/AppKit
-%{_includedir}/Cocoa
-%{_includedir}/GNUstepGUI
-%{_includedir}/gnustep/gui
+%{_infodir}/AppKit.info*
 
-%attr(755,root,root) %{_libdir}/libgnustep-gui.so
 %{_datadir}/GNUstep/Makefiles/Additional/gui.make
-- 
2.44.0