From b8acbc3289f52e1be54361308115dcf85c4c3326 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 12 Dec 2020 10:57:01 +0100
Subject: 20201212.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 development/gnustep-base/gnustep-base.SlackBuild |  4 ++-
 development/gnustep-base/gnustep-base.info       |  6 ++---
 development/gnustep-base/icu68.patch             | 31 ++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 development/gnustep-base/icu68.patch

(limited to 'development/gnustep-base')

diff --git a/development/gnustep-base/gnustep-base.SlackBuild b/development/gnustep-base/gnustep-base.SlackBuild
index e94f944f05..a8c5115451 100644
--- a/development/gnustep-base/gnustep-base.SlackBuild
+++ b/development/gnustep-base/gnustep-base.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnustep-base
-VERSION=${VERSION:-1.25.1}
+VERSION=${VERSION:-1.27.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,6 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+patch -p1 <$CWD/icu68.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/development/gnustep-base/gnustep-base.info b/development/gnustep-base/gnustep-base.info
index 7858c5c43c..2025df0b15 100644
--- a/development/gnustep-base/gnustep-base.info
+++ b/development/gnustep-base/gnustep-base.info
@@ -1,8 +1,8 @@
 PRGNAM="gnustep-base"
-VERSION="1.25.1"
+VERSION="1.27.0"
 HOMEPAGE="http://www.gnustep.org"
-DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.1.tar.gz"
-MD5SUM="757130f80a31e9ee30d8c2b83b0c226a"
+DOWNLOAD="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.27.0.tar.gz"
+MD5SUM="6f1876a867d1862267a562d4cbb9ede3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnustep-make"
diff --git a/development/gnustep-base/icu68.patch b/development/gnustep-base/icu68.patch
new file mode 100644
index 0000000000..2374d8e249
--- /dev/null
+++ b/development/gnustep-base/icu68.patch
@@ -0,0 +1,31 @@
+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
-- 
cgit v1.2.3