From owner-svn-ports-head@freebsd.org Sun Nov 25 20:10:59 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE8141140A43; Sun, 25 Nov 2018 20:10:58 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EB6C75600; Sun, 25 Nov 2018 20:10:58 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4FEA5219AC; Sun, 25 Nov 2018 20:10:58 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAPKAwHm052798; Sun, 25 Nov 2018 20:10:58 GMT (envelope-from arved@FreeBSD.org) Received: (from arved@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAPKAvxp052794; Sun, 25 Nov 2018 20:10:57 GMT (envelope-from arved@FreeBSD.org) Message-Id: <201811252010.wAPKAvxp052794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arved set sender to arved@FreeBSD.org using -f From: Tilman Keskinoz Date: Sun, 25 Nov 2018 20:10:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485899 - in head/graphics/inventor: . files X-SVN-Group: ports-head X-SVN-Commit-Author: arved X-SVN-Commit-Paths: in head/graphics/inventor: . files X-SVN-Commit-Revision: 485899 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6EB6C75600 X-Spamd-Result: default: False [1.60 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.66)[0.661,0]; NEURAL_SPAM_MEDIUM(0.66)[0.657,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.28)[0.283,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Nov 2018 20:10:59 -0000 Author: arved Date: Sun Nov 25 20:10:57 2018 New Revision: 485899 URL: https://svnweb.freebsd.org/changeset/ports/485899 Log: Unbreak build PR: 233003 Submitted by: w.schwarzenfeld@utanet.at Added: head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ (contents, props changed) head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ (contents, props changed) Modified: head/graphics/inventor/Makefile head/graphics/inventor/files/patch-SbTime.c++ Modified: head/graphics/inventor/Makefile ============================================================================== --- head/graphics/inventor/Makefile Sun Nov 25 19:51:37 2018 (r485898) +++ head/graphics/inventor/Makefile Sun Nov 25 20:10:57 2018 (r485899) @@ -3,7 +3,7 @@ PORTNAME= inventor PORTVERSION= 2.1.5.p10 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/} @@ -14,17 +14,16 @@ COMMENT= SGI's Open Inventor (TM) LICENSE= LGPL21 -BROKEN= fails to build +ONLY_FOR_ARCHS= amd64 i386 +CONFLICTS= Coin-[0-9]* SoXt-[0-9]* LIB_DEPENDS= libfreetype.so:print/freetype2 -CONFLICTS= Coin-[0-9]* SoXt-[0-9]* - +USES= gl gmake iconv jpeg motif USE_XORG= x11 xext xi xp xt -USE_GL= glu glw -USES= gmake iconv jpeg motif +USE_GL= gl glu glw USE_LDCONFIG= yes -ONLY_FOR_ARCHS= i386 amd64 + MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -46,6 +45,7 @@ DEBUG_MAKE_ENV= LIBTYPE=debug LDFLAGS+= -Wl,--add-needed LLD_UNSAFE= yes +CFLAGS+= -Wno-c++11-narrowing # cause of "lib/interaction/src/draggers/geom/SoCenterballDraggerGeom.h" post-patch: # Fix for print/freetype2 v2.7, where FT_Done_GlyphSlot function is not exported @@ -55,5 +55,4 @@ post-patch: ${WRKSRC}/libFL/ang/GNUmakefile @${REINPLACE_CMD} -e 's|%%ICONV_LIB%%|${ICONV_LIB}|' \ ${WRKSRC}/lib/GNUmakefile - .include Modified: head/graphics/inventor/files/patch-SbTime.c++ ============================================================================== --- head/graphics/inventor/files/patch-SbTime.c++ Sun Nov 25 19:51:37 2018 (r485898) +++ head/graphics/inventor/files/patch-SbTime.c++ Sun Nov 25 20:10:57 2018 (r485899) @@ -1,3 +1,70 @@ +--- lib/database/src/sb/SbTime.c++.orig 2018-11-05 18:10:14 UTC ++++ lib/database/src/sb/SbTime.c++ +@@ -190,52 +190,52 @@ SbTime::format(const char *fmt) const + + case 'D': + if (negative) *s++ = '-'; +- s += sprintf(s, "%ld", tday); ++ s += sprintf(s, "%d", tday); + break; + + case 'H': + if (negative) *s++ = '-'; +- s += sprintf(s, "%ld", thour); ++ s += sprintf(s, "%d", thour); + break; + + case 'M': + if (negative) *s++ = '-'; +- s += sprintf(s, "%ld", tmin); ++ s += sprintf(s, "%d", tmin); + break; + + case 'S': + if (negative) *s++ = '-'; +- s += sprintf(s, "%ld", tsec); ++ s += sprintf(s, "%d", tsec); + break; + + case 'I': + if (negative) *s++ = '-'; +- s += sprintf(s, "%ld", tmilli); ++ s += sprintf(s, "%d", tmilli); + break; + + case 'U': + if (negative) *s++ = '-'; +- s += sprintf(s, "%ld", tmicro); ++ s += sprintf(s, "%d", tmicro); + break; + + case 'h': +- s += sprintf(s, "%.2ld", rhour); ++ s += sprintf(s, "%.2d", rhour); + break; + + case 'm': +- s += sprintf(s, "%.2ld", rmin); ++ s += sprintf(s, "%.2d", rmin); + break; + + case 's': +- s += sprintf(s, "%.2ld", rsec); ++ s += sprintf(s, "%.2d", rsec); + break; + + case 'i': +- s += sprintf(s, "%.3ld", rmilli); ++ s += sprintf(s, "%.3d", rmilli); + break; + + case 'u': +- s += sprintf(s, "%.6ld", rmicro); ++ s += sprintf(s, "%.6d", rmicro); + break; + + default: + *** lib/database/src/sb/SbTime.c++ Sat Dec 14 18:06:53 2002 --- lib/database/src/sb/SbTime.c++.new Sat Dec 14 17:15:06 2002 *************** Added: head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-src__so_nodes-SoText2.c++ Sun Nov 25 20:10:57 2018 (r485899) @@ -0,0 +1,12 @@ +--- lib/database/src/so/nodes/SoText2.c++.orig 2018-11-05 17:54:41 UTC ++++ lib/database/src/so/nodes/SoText2.c++ +SoText2.c++ +@@ -889,7 +889,7 @@ SoBitmapFontCache::createUniFontList(con + fontNums = new SbPList; + + while (s1 = (char *)strchr(s, ';')) { +- *s1 = (char)NULL; /* font name is pointed to s */ ++ *s1 = 0; /* font name is pointed to s */ + + if ((fn = flCreateFont((const GLubyte*)s, mat, 0, NULL)) == (FLfontNumber)0) { + #ifdef DEBUG Added: head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/inventor/files/patch-src__so_nodes-SoText3.c++ Sun Nov 25 20:10:57 2018 (r485899) @@ -0,0 +1,11 @@ +--- lib/database/src/so/nodes/SoText3.c++.orig 2018-11-05 17:54:33 UTC ++++ lib/database/src/so/nodes/SoText3.c++ +@@ -1473,7 +1473,7 @@ SoOutlineFontCache::createUniFontList(co + fontNums = new SbPList; + + while (s1 = (char *)strchr(s, ';')) { +- *s1 = (char)NULL; /* font name is pointed to s */ ++ *s1 = 0; /* font name is pointed to s */ + + if ((fn = flCreateFont((const GLubyte*)s, mat, 0, NULL)) == (FLfontNumber)0) { + #ifdef DEBUG