Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Jul 2018 02:59:12 +0000 (UTC)
From:      Stephen Montgomery-Smith <stephen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r473695 - in head/graphics/opendx: . files
Message-ID:  <201807020259.w622xC8q095983@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: stephen
Date: Mon Jul  2 02:59:12 2018
New Revision: 473695
URL: https://svnweb.freebsd.org/changeset/ports/473695

Log:
  - Patches so that it builds with clang60.

Added:
  head/graphics/opendx/files/patch-src_uipp_dxuilib_EditorWindow.C   (contents, props changed)
Modified:
  head/graphics/opendx/Makefile

Modified: head/graphics/opendx/Makefile
==============================================================================
--- head/graphics/opendx/Makefile	Mon Jul  2 02:51:57 2018	(r473694)
+++ head/graphics/opendx/Makefile	Mon Jul  2 02:59:12 2018	(r473695)
@@ -16,8 +16,6 @@ LICENSE_NAME=	IBM PUBLIC LICENSE - Open Visualization 
 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}

Added: head/graphics/opendx/files/patch-src_uipp_dxuilib_EditorWindow.C
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/opendx/files/patch-src_uipp_dxuilib_EditorWindow.C	Mon Jul  2 02:59:12 2018	(r473695)
@@ -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());



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807020259.w622xC8q095983>