svn commit: r485899 - in head/graphics/inventor: . files
Tilman Keskinoz
arved at FreeBSD.org
Sun Nov 25 20:10:59 UTC 2018
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 at 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 <bsd.port.mk>
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
More information about the svn-ports-head
mailing list