Fix compilation with ICU 68.

This commit is contained in:
chen-jan 2022-05-09 02:12:28 +00:00
parent 8b056f0e43
commit fc8bd5a7ec
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From 06fa7792a51cb970e5d010a393cb88eb127830d7 Mon Sep 17 00:00:00 2001
From: Frederik Seiffert <frederik@algoriddim.com>
Date: Thu, 12 Nov 2020 17:18:09 +0100
Subject: [PATCH] Fix compilation with ICU 68.
---
Source/GSICUString.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Source/GSICUString.h b/Source/GSICUString.h
index a82447a51..15c21491d 100644
--- a/Source/GSICUString.h
+++ b/Source/GSICUString.h
@@ -2,6 +2,17 @@
#import <Foundation/NSException.h>
#include <unicode/utext.h>
+/*
+ * Define TRUE/FALSE to be used with UBool parameters, as these are no longer
+ * defined in ICU as of ICU 68.
+ */
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
/**
* Initialises a UText structure with an NSString. If txt is NULL, then this
* allocates a new structure on the heap, otherwise it fills in the existing
--
2.30.0

View File

@ -1,11 +1,13 @@
Name: gnustep-base Name: gnustep-base
Version: 1.27.0 Version: 1.27.0
Release: 1 Release: 2
License: GPLv3+ and LGPLv2+ License: GPLv3+ and LGPLv2+
Summary: GNUstep Base library package Summary: GNUstep Base library package
URL: http://www.gnustep.org/ URL: http://www.gnustep.org/
Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
Patch0: %{name}-use_system-wide_crypto-policies.patch Patch0: %{name}-use_system-wide_crypto-policies.patch
#Patch from: https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7
Patch1: Fix-compilation-with-ICU-68.patch
BuildRequires: gcc-objc libffi-devel >= 3.0.9 gnutls-devel libxml2-devel libxslt-devel BuildRequires: gcc-objc libffi-devel >= 3.0.9 gnutls-devel libxml2-devel libxslt-devel
BuildRequires: pkgconfig gnustep-make >= 2.0.0 avahi-compat-libdns_sd-devel gmp-devel BuildRequires: pkgconfig gnustep-make >= 2.0.0 avahi-compat-libdns_sd-devel gmp-devel
BuildRequires: texi2html texinfo-tex libicu-devel texi2html BuildRequires: texi2html texinfo-tex libicu-devel texi2html
@ -106,5 +108,8 @@ export GNUSTEP_CONFIG_FILE=$(pwd)/GNUstep.conf
%{_datadir}/GNUstep/Documentation/* %{_datadir}/GNUstep/Documentation/*
%changelog %changelog
* Mon May 09 2022 chenchen <chen_aka_jan@163.com> - 1.27.0-2
- Fix compilation with ICU 68.
* Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.27.0-1 * Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.27.0-1
- package init - package init