Received: by mail.netbsd.org (Postfix, from userid 605) id EC42284D76; Mon, 29 Oct 2018 13:55:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 00E0084D6F for ; Mon, 29 Oct 2018 13:55:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id M00_iQm41Oaj for ; Mon, 29 Oct 2018 13:55:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2F4F384D50 for ; Mon, 29 Oct 2018 13:55:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 28B41FBEE; Mon, 29 Oct 2018 13:55:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154082131532390" MIME-Version: 1.0 Date: Mon, 29 Oct 2018 13:55:15 +0000 From: "David Brownlee" Subject: CVS commit: pkgsrc/fonts/harfbuzz To: pkgsrc-changes@NetBSD.org Reply-To: abs@netbsd.org X-Mailer: log_accum Message-Id: <20181029135515.28B41FBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154082131532390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: abs Date: Mon Oct 29 13:55:15 UTC 2018 Modified Files: pkgsrc/fonts/harfbuzz: Makefile distinfo Added Files: pkgsrc/fonts/harfbuzz/patches: patch-src_hb-blob.cc Log Message: Fix _POSIX_C_SOURCE abuse for at least NetBSD to fix gcc6/7/8 build Also add USE_GCC_RUNTIME Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 pkgsrc/fonts/harfbuzz/Makefile cvs rdiff -u -r1.77 -r1.78 pkgsrc/fonts/harfbuzz/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/harfbuzz/patches/patch-src_hb-blob.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154082131532390 Content-Disposition: inline Content-Length: 2888 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/harfbuzz/Makefile diff -u pkgsrc/fonts/harfbuzz/Makefile:1.98 pkgsrc/fonts/harfbuzz/Makefile:1.99 --- pkgsrc/fonts/harfbuzz/Makefile:1.98 Sun Aug 19 17:24:55 2018 +++ pkgsrc/fonts/harfbuzz/Makefile Mon Oct 29 13:55:14 2018 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.98 2018/08/19 17:24:55 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2018/10/29 13:55:14 abs Exp $ DISTNAME= harfbuzz-1.8.8 +PKGREVISION= 1 CATEGORIES= fonts MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/ EXTRACT_SUFX= .tar.bz2 @@ -16,6 +17,7 @@ USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-cairo=no CONFIGURE_ARGS+= --with-graphite2=no +USE_GCC_RUNTIME= yes PKGCONFIG_OVERRIDE+= src/harfbuzz.pc.in PKGCONFIG_OVERRIDE+= src/harfbuzz-icu.pc.in Index: pkgsrc/fonts/harfbuzz/distinfo diff -u pkgsrc/fonts/harfbuzz/distinfo:1.77 pkgsrc/fonts/harfbuzz/distinfo:1.78 --- pkgsrc/fonts/harfbuzz/distinfo:1.77 Sun Aug 19 17:24:55 2018 +++ pkgsrc/fonts/harfbuzz/distinfo Mon Oct 29 13:55:14 2018 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.77 2018/08/19 17:24:55 wiz Exp $ +$NetBSD: distinfo,v 1.78 2018/10/29 13:55:14 abs Exp $ SHA1 (harfbuzz-1.8.8.tar.bz2) = be496408b2bb3dc794891e8b0e977cd75f02d71d RMD160 (harfbuzz-1.8.8.tar.bz2) = 3b4a94557770bc0aeb7a0a1d7fb3ac2c92830fc5 SHA512 (harfbuzz-1.8.8.tar.bz2) = eb96cd710571a96473b20bc9a01dadf2a3c11224497e52c63368e8edec64a8eb7085dd847c78111b798a1e8a6a950f0a04c930209822aabf13cf86d7a53b1f79 Size (harfbuzz-1.8.8.tar.bz2) = 3862626 bytes +SHA1 (patch-src_hb-blob.cc) = 9f2858357d2a1fc8bf58c98b02041640557f6593 Added files: Index: pkgsrc/fonts/harfbuzz/patches/patch-src_hb-blob.cc diff -u /dev/null pkgsrc/fonts/harfbuzz/patches/patch-src_hb-blob.cc:1.1 --- /dev/null Mon Oct 29 13:55:15 2018 +++ pkgsrc/fonts/harfbuzz/patches/patch-src_hb-blob.cc Mon Oct 29 13:55:14 2018 @@ -0,0 +1,27 @@ +$NetBSD: patch-src_hb-blob.cc,v 1.1 2018/10/29 13:55:14 abs Exp $ + +Quoting the URL given in the source: + + The POSIX standard states that a strictly conforming application + "for the C programming language, shall define _POSIX_C_SOURCE to + be 200112L before any header is included." + +Asserting this for only one file out of an application is not defined, +and the standards also explicitly do not apply to c++. + +Its quite possible that some operating systems need _POSIX_C_SOURCE +set to build this file, but its not a general solution, and lets +not do it on NetBSD where is interacts badly with at least gcc-6.4 +7.3 and 8.2 on NetBSD-8/amd64 + +--- src/hb-blob.cc.orig 2018-06-05 22:13:36.000000000 +0000 ++++ src/hb-blob.cc +@@ -26,7 +26,7 @@ + */ + + /* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ +-#ifndef _POSIX_C_SOURCE ++#if !defined(_POSIX_C_SOURCE) && !defined(__NetBSD__) + #define _POSIX_C_SOURCE 200809L + #endif + --_----------=_154082131532390--