CVS commit: pkgsrc/devel/gnustep-base

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed Nov 11 10:45:52 UTC 2020

Modified Files:
        pkgsrc/devel/gnustep-base: Makefile distinfo
        pkgsrc/devel/gnustep-base/patches: patch-aa patch-ab patch-ad
Added Files:
        pkgsrc/devel/gnustep-base/patches: patch-Source_common.h

Log Message:
(devel/gnustep-base) Adhoc build fix for icu-68, pkglint -F


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/devel/gnustep-base/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/gnustep-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gnustep-base/patches/patch-Source_common.h
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/gnustep-base/patches/patch-aa
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/gnustep-base/patches/patch-ab
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gnustep-base/patches/patch-ad

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

Modified files:

Index: pkgsrc/devel/gnustep-base/Makefile
diff -u pkgsrc/devel/gnustep-base/Makefile:1.90 pkgsrc/devel/gnustep-base/Makefile:1.91
--- pkgsrc/devel/gnustep-base/Makefile:1.90     Thu Nov  5 09:06:47 2020
+++ pkgsrc/devel/gnustep-base/Makefile  Wed Nov 11 10:45:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2020/11/05 09:06:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.91 2020/11/11 10:45:52 mef Exp $
 
 DISTNAME=      gnustep-base-1.27.0
 #PKGREVISION=  1
@@ -42,7 +42,7 @@ PTHREAD_LIBS+=                -lpth
 SUBST_CLASSES+=                pthread
 SUBST_STAGE.pthread=   pre-configure
 SUBST_FILES.pthread=   configure
-SUBST_SED.pthread=     -e 's,@PTHREAD_LIBS@,${PTHREAD_LIBS},'
+SUBST_VARS.pthread=    PTHREAD_LIBS
 SUBST_MESSAGE.pthread= Fix @PTHREAD_LIBS@ left out in file configure
 
 CONFIGURE_ARGS+=       --with-library-flags=${GNUSTEP_LDFLAGS:Q}

Index: pkgsrc/devel/gnustep-base/distinfo
diff -u pkgsrc/devel/gnustep-base/distinfo:1.33 pkgsrc/devel/gnustep-base/distinfo:1.34
--- pkgsrc/devel/gnustep-base/distinfo:1.33     Thu Apr 16 09:35:36 2020
+++ pkgsrc/devel/gnustep-base/distinfo  Wed Nov 11 10:45:52 2020
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.33 2020/04/16 09:35:36 manu Exp $
+$NetBSD: distinfo,v 1.34 2020/11/11 10:45:52 mef Exp $
 
 SHA1 (gnustep-base-1.27.0.tar.gz) = fea6c63ac901bd60a2d7a42ff8e4b54d385e220f
 RMD160 (gnustep-base-1.27.0.tar.gz) = a21e4ea86bdb4eb2094012654e22e24a1b4a53e6
 SHA512 (gnustep-base-1.27.0.tar.gz) = bbdf45379dbb684f6bdb507b645e0f611cefb05caadff1bf620c2e85f104396cf91782bcce05ff2173078603b76b8a0ba2ea3b71bc56a84c220310910dbcb705
 Size (gnustep-base-1.27.0.tar.gz) = 4141163 bytes
-SHA1 (patch-aa) = 5b2b61058fcc8f4c8073598d61cccb3c23429a7c
-SHA1 (patch-ab) = 1eb9746ae2cb8ba9c02d6131c4d797b210318851
+SHA1 (patch-Source_common.h) = ed8a68a023b01b1562793678b7ddbd641e3a40d8
+SHA1 (patch-aa) = aa69fb26675201a44952fb3430a542cb5d69e952
+SHA1 (patch-ab) = 7ec07e7cca784fa4f9275d99adcd4a66a56bbff6
 SHA1 (patch-ac) = 4e8e209ad202385948d0f4b0d29e5e61e01da410
-SHA1 (patch-ad) = 16442b907021c0e490ed6f2072887d7849b5df40
+SHA1 (patch-ad) = 1e1952027e1a9dae9d54e2446dc3f0c53baa8c20

Index: pkgsrc/devel/gnustep-base/patches/patch-aa
diff -u pkgsrc/devel/gnustep-base/patches/patch-aa:1.17 pkgsrc/devel/gnustep-base/patches/patch-aa:1.18
--- pkgsrc/devel/gnustep-base/patches/patch-aa:1.17     Thu Apr 16 09:35:36 2020
+++ pkgsrc/devel/gnustep-base/patches/patch-aa  Wed Nov 11 10:45:52 2020
@@ -1,14 +1,12 @@
-$NetBSD: patch-aa,v 1.17 2020/04/16 09:35:36 manu Exp $
+$NetBSD: patch-aa,v 1.18 2020/11/11 10:45:52 mef Exp $
 
---- configure.orig     2020-04-05 20:00:40.000000000 +0200
-+++ configure  2020-04-14 14:56:23.350836708 +0200
-@@ -6029,8 +6029,9 @@
- if test "$LIBOBJC" = ""; then
+--- configure.orig     2020-04-05 18:00:40.000000000 +0000
++++ configure
+@@ -6030,6 +6030,7 @@ if test "$LIBOBJC" = ""; then
    as_fn_error $? "The command 'gnustep-config --objc-libs' (provided by the gnustep-make package) returned no Objective-C library.  Unable to continue configuring without Objective-C support." 
"$LINENO" 5
    exit 1
  fi
-+LIBOBJC="$LIBOBJC @PTHREAD_LIBS@"
++LIBOBJC="$LIBOBJC -lpthread"
  
  #--------------------------------------------------------------------
  # Miscellaneous flags
- #--------------------------------------------------------------------

Index: pkgsrc/devel/gnustep-base/patches/patch-ab
diff -u pkgsrc/devel/gnustep-base/patches/patch-ab:1.9 pkgsrc/devel/gnustep-base/patches/patch-ab:1.10
--- pkgsrc/devel/gnustep-base/patches/patch-ab:1.9      Thu Apr 16 09:35:36 2020
+++ pkgsrc/devel/gnustep-base/patches/patch-ab  Wed Nov 11 10:45:52 2020
@@ -1,16 +1,12 @@
-$NetBSD: patch-ab,v 1.9 2020/04/16 09:35:36 manu Exp $
+$NetBSD: patch-ab,v 1.10 2020/11/11 10:45:52 mef Exp $
 
---- base.make.in.orig  2020-04-05 20:00:40.000000000 +0200
-+++ base.make.in       2020-04-14 15:07:00.418458617 +0200
-@@ -40,9 +40,10 @@
-     GNUSTEP_BASE_MINOR_VERSION = @MINOR_VERSION@
-     GNUSTEP_BASE_SUBMINOR_VERSION = @SUBMINOR_VERSION@
+--- base.make.in.orig  2020-04-05 18:00:40.000000000 +0000
++++ base.make.in
+@@ -42,6 +42,7 @@ ifeq ($(BASE_MAKE_LOADED),)
  
      FND_LDFLAGS =
--    FND_LIBS = -lgnustep-base
-+    FND_LIBS = -lgnustep-base
+     FND_LIBS = -lgnustep-base
 +    OBJC_LIBS = -lpthread
      FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
      GNUSTEP_DEFINE = -DGNUSTEP
    else
-     #

Index: pkgsrc/devel/gnustep-base/patches/patch-ad
diff -u pkgsrc/devel/gnustep-base/patches/patch-ad:1.8 pkgsrc/devel/gnustep-base/patches/patch-ad:1.9
--- pkgsrc/devel/gnustep-base/patches/patch-ad:1.8      Thu Apr 16 09:35:36 2020
+++ pkgsrc/devel/gnustep-base/patches/patch-ad  Wed Nov 11 10:45:52 2020
@@ -1,9 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2020/04/16 09:35:36 manu Exp $
+$NetBSD: patch-ad,v 1.9 2020/11/11 10:45:52 mef Exp $
 
---- Source/GNUmakefile.orig    2020-04-05 20:00:40.000000000 +0200
-+++ Source/GNUmakefile 2020-04-14 15:07:59.290740281 +0200
-@@ -102,9 +102,9 @@
- GNU_MFILES = \
+--- Source/GNUmakefile.orig    2020-04-05 18:00:40.000000000 +0000
++++ Source/GNUmakefile
+@@ -103,7 +103,7 @@ GNU_MFILES = \
  GSLocale.m \
  preface.m
  
@@ -12,4 +11,3 @@ $NetBSD: patch-ad,v 1.8 2020/04/16 09:35
    OBJC_LIBS += -pthread
  endif
  
- ifeq ($(GNUSTEP_TARGET_OS), mingw32)

Added files:

Index: pkgsrc/devel/gnustep-base/patches/patch-Source_common.h
diff -u /dev/null pkgsrc/devel/gnustep-base/patches/patch-Source_common.h:1.1
--- /dev/null   Wed Nov 11 10:45:52 2020
+++ pkgsrc/devel/gnustep-base/patches/patch-Source_common.h     Wed Nov 11 10:45:52 2020
@@ -0,0 +1,28 @@
+$NetBSD: patch-Source_common.h,v 1.1 2020/11/11 10:45:52 mef Exp $
+
+Adhoc fix for icu-68 fall out
+
+GSICUString.m:71:18: error: use of undeclared identifier 'TRUE'
+          return TRUE;
+                 ^
+GSICUString.m:80:18: error: use of undeclared identifier 'FALSE'
+          return FALSE;
+                 ^
+
+--- Source/common.h.orig       2020-11-11 09:44:53.977561179 +0000
++++ Source/common.h
+@@ -7,6 +7,14 @@
+ #ifndef COMMON_H
+ #define COMMON_H
+ 
++#ifndef TRUE
++#define TRUE (1)
++#endif
++
++#ifndef FALSE
++#define FALSE (0)
++#endif
++
+ #include "config.h"
+ 
+ #if   defined(HAVE_STRING_H)