Mon Sep 21 03:43:22 2020 UTC ()
(x11/gnustep-gui) Some edit to make build go furthur: GS_GC_UNHIDE/GS_GC_HIDE issue


(mef)
diff -r1.77 -r1.78 pkgsrc/x11/gnustep-gui/Makefile

cvs diff -r1.77 -r1.78 pkgsrc/x11/gnustep-gui/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnustep-gui/Makefile 2020/06/05 12:49:17 1.77
+++ pkgsrc/x11/gnustep-gui/Makefile 2020/09/21 03:43:22 1.78
@@ -1,28 +1,43 @@ @@ -1,28 +1,43 @@
1# $NetBSD: Makefile,v 1.77 2020/06/05 12:49:17 jperkin Exp $ 1# $NetBSD: Makefile,v 1.78 2020/09/21 03:43:22 mef Exp $
2 2
3DISTNAME= gnustep-gui-0.22.0 3DISTNAME= gnustep-gui-0.22.0
4PKGREVISION= 23 4PKGREVISION= 23
5CATEGORIES= x11 gnustep 5CATEGORIES= x11 gnustep
6MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} 6MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnustep.org/ 9HOMEPAGE= http://www.gnustep.org/
10COMMENT= GNUstep AppKit Implementation 10COMMENT= GNUstep AppKit Implementation
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13USE_LANGUAGES= objc 13USE_LANGUAGES= objc
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep 15CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
16MAKE_FILE= GNUmakefile 16MAKE_FILE= GNUmakefile
17 17
 18# problem:
 19# | In file included from ../Headers/AppKit/AppKit.h:117:
 20# | ../Headers/AppKit/NSWorkspace.h:169:14: error: redefinition of 'NSAppleEventDescriptor' as different kind of symbol
 21# | typedef void NSAppleEventDescriptor;
 22# | ^
 23# | /tmp/x11/gnustep-gui/work/.buildlink/include/Foundation/NSAppleEventDescriptor.h:36:12: note: previous definition is here
 24# | @interface NSAppleEventDescriptor : NSObjec
 25
 26# hint: https://www.mail-archive.com/gnustep-cvs@gna.org/msg17908.html
 27SUBST_CLASSES+= gs
 28SUBST_FILES.gs= Source/NSAnimation.m
 29SUBST_STAGE.gs= pre-configure
 30SUBST_SED.gs= -e 's/GS_GC_UNHIDE//'
 31SUBST_SED.gs+= -e 's/GS_GC_HIDE//'
 32
18INSTALLATION_DIRS+= share/GNUstep/Applications 33INSTALLATION_DIRS+= share/GNUstep/Applications
19 34
20.include "../../devel/gnustep-base/buildlink3.mk" 35.include "../../devel/gnustep-base/buildlink3.mk"
21.include "../../audio/libaudiofile/buildlink3.mk" 36.include "../../audio/libaudiofile/buildlink3.mk"
22.include "../../mk/jpeg.buildlink3.mk" 37.include "../../mk/jpeg.buildlink3.mk"
23.include "../../graphics/giflib/buildlink3.mk" 38.include "../../graphics/giflib/buildlink3.mk"
24.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
25.include "../../graphics/tiff/buildlink3.mk" 40.include "../../graphics/tiff/buildlink3.mk"
26.include "../../textproc/libxml2/buildlink3.mk" 41.include "../../textproc/libxml2/buildlink3.mk"
27.include "../../mk/pthread.buildlink3.mk" 42.include "../../mk/pthread.buildlink3.mk"
28.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"