- Patches so that it builds with clang60.

This commit is contained in:
Stephen Montgomery-Smith 2018-07-02 02:59:12 +00:00
parent 3ad060a5ba
commit 08b32a0f4b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=473695
2 changed files with 19 additions and 2 deletions

View file

@ -16,8 +16,6 @@ LICENSE_NAME= IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BROKEN_FreeBSD_12_amd64= fails to build: gmake[1]: *** No rule to make target 'Makefile'. Stop.
LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \
libtiff.so:graphics/tiff \
libcdf.so:science/cdf \
@ -85,6 +83,14 @@ post-patch:
${WRKSRC}/src/uipp/java/server/Makefile.in
@${REINPLACE_CMD} -e 's|$$(ARCH)|@ARCH@|' \
${WRKSRC}/src/misc/Makefile.*
@${REINPLACE_CMD} -e 's/void exit (int);/[[noreturn]] void exit (int);/' \
${WRKSRC}/configure
for f in `find ${WRKSRC} -name "*.bm"`; do \
if [ $${f%/*} != "${WRKSRC}/src/uipp/widgets" ]; then \
${REINPLACE_CMD} -E 's/0x(..)/static_cast<char>(0x\1)/g' $$f; \
${REINPLACE_CMD} -E 's/static unsigned char/static char/g' $$f; \
fi; \
done
post-install:
@${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}

View file

@ -0,0 +1,11 @@
--- src/uipp/dxuilib/EditorWindow.C.orig 2018-07-02 02:13:46 UTC
+++ src/uipp/dxuilib/EditorWindow.C
@@ -5997,7 +5997,7 @@ char msg[128];
//
const char *tmpdir = theDXApplication->getTmpDirectory();
int tmpdirlen = STRLEN(tmpdir);
- if (!tmpdirlen) return FALSE;
+ if (!tmpdirlen) return (char*) FALSE;
if (tmpdir[tmpdirlen-1] == '/') {
sprintf(netfilename, "%sdx%d.net", tmpdir, getpid());
sprintf(cfgfilename, "%sdx%d.cfg", tmpdir, getpid());