Date: Tue, 17 Dec 2013 02:49:31 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184868: graphics/gsculpt: Fix build with clang Message-ID: <20131217024931.ee286b6119c7a44296dc8c28@yahoo.com> Resent-Message-ID: <201312161810.rBGIAJ41016354@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184868
>Category: ports
>Synopsis: graphics/gsculpt: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 18:10:18 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add DESKTOP_ENTRIES
New file:
files/patch-cpp__Util__Pool.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/gsculpt/Makefile graphics/gsculpt/Makefile
--- /usr/ports/graphics/gsculpt/Makefile 2013-12-12 21:50:20.000000000 +0900
+++ graphics/gsculpt/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -3,13 +3,13 @@
PORTNAME= gsculpt
PORTVERSION= 0.99.47
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,}
DISTNAME= gSculpt-${PORTVERSION}-alpha-src
MAINTAINER= ports@FreeBSD.org
-COMMENT= An Opensource 3D modelling application
+COMMENT= Opensource 3D modelling application
LICENSE= GPLv2
@@ -19,18 +19,19 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S,-src,,}
-USES= pkgconfig
+USES= pkgconfig scons
USE_GNOME= pygtk2
USE_GL= glu
USE_XORG= x11
-USE_PYTHON= 2.4+
-USE_SCONS= yes
-SCONS_BUILDENV= ${SCONS_ENV}
+USE_PYTHON= 2
USE_LDCONFIG= ${PREFIX}/lib/gSculpt
DATADIR= ${PREFIX}/share/gSculpt
-NO_STAGE= yes
+DESKTOP_ENTRIES="gSculpt" "" \
+ "${DATADIR}/gsimages/gSculpt_Glass_Master_by_Gary_Rose.png" \
+ "${PORTNAME}" "Graphics;GTK;" ""
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
@@ -53,11 +54,13 @@
/^cppLibs/s|BackgroundModel|BackgroundMesh|" \
${WRKSRC}/SConstruct
@${REINPLACE_CMD} -e \
- "/^prefix/s|=.*|= '${PREFIX}'| ; \
+ "/^prefix/s|=.*|= '${STAGEDIR}${PREFIX}'| ; \
/^gSculptStartDir/s|=.*|= os.path.join( pysitelibdir )|" \
${WRKSRC}/SConstruct-install
do-install:
- @cd ${WRKSRC} && ${SCONS_BIN} -f SConstruct-install ${PREFIX}
+ @(cd ${WRKSRC} && ${SCONS} -f SConstruct-install install)
+ @(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
+ -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
.include <bsd.port.post.mk>
diff -urN /usr/ports/graphics/gsculpt/files/patch-cpp__Util__Pool.h graphics/gsculpt/files/patch-cpp__Util__Pool.h
--- /usr/ports/graphics/gsculpt/files/patch-cpp__Util__Pool.h 1970-01-01 09:00:00.000000000 +0900
+++ graphics/gsculpt/files/patch-cpp__Util__Pool.h 2013-12-17 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- cpp/Util/Pool.h.orig
++++ cpp/Util/Pool.h
+@@ -8,6 +8,7 @@
+ #ifndef POOL_H__
+ #define POOL_H__
+
++#include <cstdlib>
+ #include <memory.h>
+
+ #include <Util/Array.h>
diff -urN /usr/ports/graphics/gsculpt/pkg-plist graphics/gsculpt/pkg-plist
--- /usr/ports/graphics/gsculpt/pkg-plist 2013-11-06 22:01:31.000000000 +0900
+++ graphics/gsculpt/pkg-plist 2013-12-17 00:00:00.000000000 +0900
@@ -486,6 +486,7 @@
%%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/gSculptConfig.pyc
%%PYTHON_SITELIBDIR%%/Britefury/gSculptConfig/gSculptUserConfig.pyc
%%PYTHON_SITELIBDIR%%/gsculpt.py
+%%PYTHON_SITELIBDIR%%/gsculpt.pyc
%%DATADIR%%/gsimages/background_images.png
%%DATADIR%%/gsimages/background_models.png
%%DATADIR%%/gsimages/draw_backg_transparent.png
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024931.ee286b6119c7a44296dc8c28>