CVS commit: pkgsrc/x11/gnustep-gui

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Fri Nov 13 02:47:45 UTC 2020

Modified Files:
        pkgsrc/x11/gnustep-gui: Makefile distinfo
Added Files:
        pkgsrc/x11/gnustep-gui/patches: patch-Source_GSCharacterPanel.m

Log Message:
(x11/gnustep-gui) Add patch for icu-68 fallout (TRUE -> true)


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/x11/gnustep-gui/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/gnustep-gui/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/gnustep-gui/patches/patch-Source_GSCharacterPanel.m

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gnustep-gui/Makefile
diff -u pkgsrc/x11/gnustep-gui/Makefile:1.80 pkgsrc/x11/gnustep-gui/Makefile:1.81
--- pkgsrc/x11/gnustep-gui/Makefile:1.80        Thu Nov  5 09:07:14 2020
+++ pkgsrc/x11/gnustep-gui/Makefile     Fri Nov 13 02:47:45 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2020/11/05 09:07:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2020/11/13 02:47:45 mef Exp $
 
 GITHUB_PROJECT=        libs-gui
 GITHUB_TAG=    gui-0_28_0
@@ -21,7 +21,7 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --exec-prefix=${PREFIX}/libexec/GNUstep
 MAKE_FILE=             GNUmakefile
 
-PLIST_SUBST=   API_VERSION=${PKGVERSION:C/\.[0-9]$//}
+PLIST_SUBST=   API_VERSION=${PKGVERSION:C/\.[0-9][nb]*[0-9]*$//}
 
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/x11/gnustep-gui/distinfo
diff -u pkgsrc/x11/gnustep-gui/distinfo:1.29 pkgsrc/x11/gnustep-gui/distinfo:1.30
--- pkgsrc/x11/gnustep-gui/distinfo:1.29        Fri Oct  2 23:47:28 2020
+++ pkgsrc/x11/gnustep-gui/distinfo     Fri Nov 13 02:47:45 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.29 2020/10/02 23:47:28 mef Exp $
+$NetBSD: distinfo,v 1.30 2020/11/13 02:47:45 mef Exp $
 
 SHA1 (gnustep-gui/gui-0_28_0.tar.gz) = 32496c4ebc5260358b65e3b02f422ad20b9915b3
 RMD160 (gnustep-gui/gui-0_28_0.tar.gz) = 53106237f12251b3f5d62c1acc503abb5c23ee75
 SHA512 (gnustep-gui/gui-0_28_0.tar.gz) = ccef19bbdf7bf51b992b941ed1bbd2e1aeabe83e2fd040a75b9fbfd77c90722f80de416e61ac37ee5d6eb5ced26efe0a1aeec49374db9c8c4237bc5b59182371
 Size (gnustep-gui/gui-0_28_0.tar.gz) = 2933423 bytes
+SHA1 (patch-Source_GSCharacterPanel.m) = 05a2d7e252f5134e37f71dd0f27c8e15b6f38a5e

Added files:

Index: pkgsrc/x11/gnustep-gui/patches/patch-Source_GSCharacterPanel.m
diff -u /dev/null pkgsrc/x11/gnustep-gui/patches/patch-Source_GSCharacterPanel.m:1.1
--- /dev/null   Fri Nov 13 02:47:45 2020
+++ pkgsrc/x11/gnustep-gui/patches/patch-Source_GSCharacterPanel.m      Fri Nov 13 02:47:45 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-Source_GSCharacterPanel.m,v 1.1 2020/11/13 02:47:45 mef Exp $
+
+Adhoc patch to adapt icu-68 Fallout
+
+--- Source/GSCharacterPanel.m.orig     2020-04-05 20:04:40.000000000 +0000
++++ Source/GSCharacterPanel.m
+@@ -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 true;
+ }
+ 
+ static NSIndexSet *AssignedCodepoints()
+@@ -103,7 +103,7 @@ static UBool searchCharNamesFn(void *con
+     {
+       [ctx->set addIndex: (NSUInteger)code];
+     }
+-  return TRUE;
++  return true;
+ }
+ 
+ static NSIndexSet *CodepointsWithNameContainingSubstring(NSString *str)