svn commit: r433579 - in head/net-im/uTox: . files
Nikolai Lifanov
lifanov at FreeBSD.org
Tue Feb 7 18:39:13 UTC 2017
Author: lifanov
Date: Tue Feb 7 18:39:11 2017
New Revision: 433579
URL: https://svnweb.freebsd.org/changeset/ports/433579
Log:
unbreak net-im/uTox on 10.3-RELEASE amd64
[ 83%] Building C object CMakeFiles/utox.dir/src/main.c.o
/usr/bin/cc -I/usr/local/include/freetype2 -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing -Wall -Wextra -fno-strict-aliasing -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing -std=gnu99 -o CMakeFiles/utox.dir/src/main.c.o -c /wrkdirs/usr/ports/net-im/uTox/work/uTox-1835eae/src/main.c
In file included from /wrkdirs/usr/ports/net-im/uTox/work/uTox-1835eae/src/main.c:5:
In file included from /wrkdirs/usr/ports/net-im/uTox/work/uTox-1835eae/src/main.h:282:
In file included from /wrkdirs/usr/ports/net-im/uTox/work/uTox-1835eae/src/stb_image.h:678:
/usr/include/clang/3.4.1/emmintrin.h:1444:21: error: expected '(' after 'asm'
__asm__ volatile ("pause");
^
/wrkdirs/usr/ports/net-im/uTox/work/uTox-1835eae/src/main.h:84:21: note: expanded from macro 'volatile'
#define volatile(x) x
^
PR: 216332
Submitted by: cpm, amdmi3
Reviewed by: matthew
Approved by: matthew (mentor), portmaster at BSDforge.com (maintainer timeout, 2 weeks)
Differential Revision: https://reviews.freebsd.org/D9477
Modified:
head/net-im/uTox/Makefile
head/net-im/uTox/files/patch-src_main.h
head/net-im/uTox/pkg-plist
Modified: head/net-im/uTox/Makefile
==============================================================================
--- head/net-im/uTox/Makefile Tue Feb 7 18:36:38 2017 (r433578)
+++ head/net-im/uTox/Makefile Tue Feb 7 18:39:11 2017 (r433579)
@@ -2,6 +2,7 @@
PORTNAME= uTox
PORTVERSION= 0.11.1
+PORTREVISION= 1
CATEGORIES= net-im net-p2p
MAINTAINER= portmaster at BSDforge.com
@@ -41,5 +42,6 @@ pre-configure:
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/utox
+ ${INSTALL_DATA} ${WRKSRC}/icons/utox-128x128.png ${STAGEDIR}${PREFIX}/share/pixmaps/utox.png
.include <bsd.port.mk>
Modified: head/net-im/uTox/files/patch-src_main.h
==============================================================================
--- head/net-im/uTox/files/patch-src_main.h Tue Feb 7 18:36:38 2017 (r433578)
+++ head/net-im/uTox/files/patch-src_main.h Tue Feb 7 18:39:11 2017 (r433579)
@@ -7,7 +7,7 @@
-#ifndef __OBJC__
-#define volatile(x)(x)
+#if !defined(__OBJC__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#define volatile(x) x
++#define volatile(x)(x)
#endif
#define SCALE(x) (((int)((ui_scale / 10.0) * ((double)x))) ?: 1)
Modified: head/net-im/uTox/pkg-plist
==============================================================================
--- head/net-im/uTox/pkg-plist Tue Feb 7 18:36:38 2017 (r433578)
+++ head/net-im/uTox/pkg-plist Tue Feb 7 18:39:11 2017 (r433579)
@@ -1,3 +1,4 @@
bin/utox
share/applications/utox.desktop
+share/pixmaps/utox.png
man/man1/utox.1.gz
More information about the svn-ports-all
mailing list