Date: Tue, 21 Jan 2014 03:26:04 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185938: graphics/truevision: Fix build with clang Message-ID: <20140121032604.f09306d0099e2e2cbcc21cd2@yahoo.com> Resent-Message-ID: <201401201840.s0KIe44c005285@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185938
>Category: ports
>Synopsis: graphics/truevision: 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 Jan 20 18:40:04 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Support desktop-files-utils USES macro
- Support shared-mime-info USES macro
New file:
files/patch-include__objparam.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/truevision/Makefile graphics/truevision/Makefile
--- /usr/ports/graphics/truevision/Makefile 2013-11-06 22:01:29.000000000 +0900
+++ graphics/truevision/Makefile 2014-01-21 00:00:00.000000000 +0900
@@ -3,33 +3,33 @@
PORTNAME= truevision
PORTVERSION= 0.5.5.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/0.5.5
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
-COMMENT= The GNOME 3D modeler
+COMMENT= GNOME 3D modeler
-LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+LICENSE= GPLv2 # (or later)
+
+LIB_DEPENDS= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
USE_BZIP2= yes
-USES= pathfix gettext gmake pkgconfig
+USES= desktop-file-utils gettext gmake pathfix pkgconfig \
+ shared-mime-info
USE_GNOME= gnomeprefix intlhack libgnomeui
USE_GL= gl
USE_PYTHON= yes
GNU_CONFIGURE= yes
-MAN1= truevision.1
-
-CPPFLAGS+= -I${LOCALBASE}/include \
- `pkg-config --cflags gtkglext-1.0`
-LDFLAGS+= -L${LOCALBASE}/lib \
- `pkg-config --libs gtkglext-1.0`
+CPPFLAGS+= $$(pkg-config --cflags gtkglext-1.0) \
+ -I${LOCALBASE}/include
+LDFLAGS+= $$(pkg-config --libs gtkglext-1.0) \
+ -L${LOCALBASE}/lib
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|CXXFLAGS=""||g ; \
s|-I/usr/include/gtkglext-1.0/||g ; \
@@ -45,6 +45,7 @@
s|-L/usr/local/lib||g ; \
s|-L/usr/X11R6/lib||g ; \
s|-O2||g ; \
- s|^truevisiondoc|#truevisiondoc|g'
+ s|^truevisiondoc|#truevisiondoc|g ; \
+ /update-mime-database/s|^|#|'
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/truevision/files/patch-include__objparam.h graphics/truevision/files/patch-include__objparam.h
--- /usr/ports/graphics/truevision/files/patch-include__objparam.h 1970-01-01 09:00:00.000000000 +0900
+++ graphics/truevision/files/patch-include__objparam.h 2014-01-21 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- include/objparam.h.orig
++++ include/objparam.h
+@@ -465,7 +465,7 @@
+ TvWidget_entry( name, sname, tooltip, appref, val) {}
+ ObjParam_entry( ObjParam_entry & ref ) : ObjParam( ref ), TvWidget_entry( ref ) {}
+ void get_widget( GtkWidget *box, bool tt );
+- void get_widget( GtkWidget *row, bool tt, int row );
++ void get_widget( GtkWidget *tab, bool tt, int row );
+ void flush();
+ void swap_data( ObjParam *param );
+ };
diff -urN /usr/ports/graphics/truevision/pkg-plist graphics/truevision/pkg-plist
--- /usr/ports/graphics/truevision/pkg-plist 2013-11-06 22:01:29.000000000 +0900
+++ graphics/truevision/pkg-plist 2014-01-21 00:00:00.000000000 +0900
@@ -1,5 +1,6 @@
bin/truevision
lib/libftgltv.a
+man/man1/truevision.1.gz
share/applications/truevision.desktop
share/application-registry/truevision.applications
share/gnome/help/truevision/C/athmospherics.xml
@@ -51,6 +52,10 @@
share/gnome/help/truevision/C/legal.xml
share/gnome/help/truevision/C/truevision.xml
share/gnome/help/truevision/C/welcome.xml
+share/locale/de/LC_MESSAGES/truevision.mo
+share/locale/fr/LC_MESSAGES/truevision.mo
+share/locale/ru/LC_MESSAGES/truevision.mo
+share/mime/packages/truevision.xml
share/mime-info/truevision.keys
share/mime-info/truevision.mime
share/pixmaps/truevision/create_icon.png
@@ -102,6 +107,7 @@
share/pixmaps/truevision/warning.xpm
share/truevision/materials/Effects/Fire1.tvm
share/truevision/materials/Effects/water.tvm
+@exec mkdir -p %D/%%DATADIR%%/materials/Glass
share/truevision/materials/Metals/Brass/Brass1A.tvm
share/truevision/materials/Metals/Brass/Brass1B.tvm
share/truevision/materials/Metals/Brass/Brass1C.tvm
@@ -120,10 +126,6 @@
share/truevision/python/plug-ins/about_python.py
share/truevision/python/plug-ins/starfield.py
share/truevision/python/tv_classes.py
-share/locale/de/LC_MESSAGES/truevision.mo
-share/locale/fr/LC_MESSAGES/truevision.mo
-share/locale/ru/LC_MESSAGES/truevision.mo
-share/mime/packages/truevision.xml
@dirrm share/truevision/python/plug-ins
@dirrm share/truevision/python
@dirrm share/truevision/materials/Woods
@@ -141,5 +143,3 @@
@dirrm share/gnome/help/truevision/C/figures
@dirrm share/gnome/help/truevision/C
@dirrm share/gnome/help/truevision
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140121032604.f09306d0099e2e2cbcc21cd2>