commit cf168368d499c36ea93bf8060331a345ee9f43a1
Author: Jan Palus <[email protected]>
Date: Mon Aug 16 20:42:13 2021 +0200
fix build with icu >= 68
gnustep-gui.spec | 2 ++
icu68.patch | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
---
diff --git a/gnustep-gui.spec b/gnustep-gui.spec
index 7868359..3211e31 100644
--- a/gnustep-gui.spec
+++ b/gnustep-gui.spec
@@ -18,6 +18,7 @@ Patch0: %{name}-nocompressdocs.patch
Patch1: %{name}-doc.patch
Patch2: %{name}-giflib.patch
Patch3: imagemagick7.patch
+Patch4: icu68.patch
URL: http://www.gnustep.org/
%{?with_magick:BuildRequires: ImageMagick-devel}
BuildRequires: aspell-devel
@@ -82,6 +83,7 @@ biblioteki GNUstep GUI.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
export GNUSTEP_MAKEFILES=%{_datadir}/GNUstep/Makefiles
diff --git a/icu68.patch b/icu68.patch
new file mode 100644
index 0000000..a649bc7
--- /dev/null
+++ b/icu68.patch
@@ -0,0 +1,81 @@
+diff -ru gnustep-gui-0.24.0.orig/Source/GSCharacterPanel.m
gnustep-gui-0.24.0/Source/GSCharacterPanel.m
+--- gnustep-gui-0.24.0.orig/Source/GSCharacterPanel.m 2012-12-16
23:51:23.000000000 +0100
++++ gnustep-gui-0.24.0/Source/GSCharacterPanel.m 2021-08-16
20:39:11.913095999 +0200
+@@ -78,7 +78,7 @@
+ static UBool enumCharNamesFn(void *context, UChar32 code, UCharNameChoice
nameChoice, const char *name, int32_t length)
+ {
+ [(NSMutableIndexSet*)context addIndex: (NSUInteger)code];
+- return TRUE;
++ return 1;
+ }
+
+ static NSIndexSet *AssignedCodepoints()
+@@ -103,7 +103,7 @@
+ {
+ [ctx->set addIndex: (NSUInteger)code];
+ }
+- return TRUE;
++ return 1;
+ }
+
+ static NSIndexSet *CodepointsWithNameContainingSubstring(NSString *str)
+diff -ru gnustep-gui-0.24.0.orig/Source/NSBitmapImageRep+JPEG.m
gnustep-gui-0.24.0/Source/NSBitmapImageRep+JPEG.m
+--- gnustep-gui-0.24.0.orig/Source/NSBitmapImageRep+JPEG.m 2013-12-06
18:45:37.000000000 +0100
++++ gnustep-gui-0.24.0/Source/NSBitmapImageRep+JPEG.m 2021-08-16
20:39:51.238754691 +0200
+@@ -149,7 +149,7 @@
+ src->parent.next_input_byte = src->data;
+ src->parent.bytes_in_buffer = src->length;
+
+- return TRUE;
++ return 1;
+ }
+
+
+@@ -278,7 +278,7 @@
+ dest->pub.next_output_byte = dest->buffer;
+ dest->pub.free_in_buffer = imageSize * cinfo->input_components;
+
+- return TRUE;
++ return 1;
+ }
+
+ /*
+@@ -372,7 +372,7 @@
+ /* Establish our own data source manager */
+ gs_jpeg_memory_src_create(&cinfo, imageData);
+
+- jpeg_read_header(&cinfo, TRUE);
++ jpeg_read_header(&cinfo, 1);
+ gs_jpeg_memory_src_destroy(&cinfo);
+ jpeg_destroy_decompress(&cinfo);
+
+@@ -427,7 +427,7 @@
+ /* Establish our own data source manager */
+ gs_jpeg_memory_src_create(&cinfo, imageData);
+
+- jpeg_read_header(&cinfo, TRUE);
++ jpeg_read_header(&cinfo, 1);
+
+ /* we use RGB as target color space; others are not yet supported */
+ cinfo.out_color_space = JCS_RGB;
+@@ -622,8 +622,8 @@
+
+ // compress the image
+
+- jpeg_set_quality (&cinfo, quality, TRUE);
+- jpeg_start_compress (&cinfo, TRUE);
++ jpeg_set_quality (&cinfo, quality, 1);
++ jpeg_start_compress (&cinfo, 1);
+
+ if (isRGB && [self hasAlpha]) // strip alpha channel before encoding
+ {
+diff -ru gnustep-gui-0.24.0.orig/Source/win32-entry.c
gnustep-gui-0.24.0/Source/win32-entry.c
+--- gnustep-gui-0.24.0.orig/Source/win32-entry.c 2008-06-10
06:01:49.000000000 +0200
++++ gnustep-gui-0.24.0/Source/win32-entry.c 2021-08-16 20:39:15.659666577
+0200
+@@ -77,5 +77,5 @@
+ {
+ }
+
+- return TRUE;
++ return 1;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnustep-gui.git/commitdiff/cf168368d499c36ea93bf8060331a345ee9f43a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
