From owner-svn-ports-all@freebsd.org Tue Feb 7 18:39:13 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23308CD5DB3; Tue, 7 Feb 2017 18:39:13 +0000 (UTC) (envelope-from lifanov@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 mx1.freebsd.org (Postfix) with ESMTPS id D7EDFD0B; Tue, 7 Feb 2017 18:39:12 +0000 (UTC) (envelope-from lifanov@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v17IdBsE010088; Tue, 7 Feb 2017 18:39:11 GMT (envelope-from lifanov@FreeBSD.org) Received: (from lifanov@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17IdBdu010085; Tue, 7 Feb 2017 18:39:11 GMT (envelope-from lifanov@FreeBSD.org) Message-Id: <201702071839.v17IdBdu010085@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lifanov set sender to lifanov@FreeBSD.org using -f From: Nikolai Lifanov Date: Tue, 7 Feb 2017 18:39:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433579 - in head/net-im/uTox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2017 18:39:13 -0000 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@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@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 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