From owner-svn-ports-all@freebsd.org Tue Aug 13 18:13:25 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 30C2BB7F33; Tue, 13 Aug 2019 18:13:25 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 467LS50TYnz4C4j; Tue, 13 Aug 2019 18:13:25 +0000 (UTC) (envelope-from jgh@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E64D01B755; Tue, 13 Aug 2019 18:13:24 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7DIDOV1012246; Tue, 13 Aug 2019 18:13:24 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7DIDOVx012244; Tue, 13 Aug 2019 18:13:24 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201908131813.x7DIDOVx012244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Tue, 13 Aug 2019 18:13:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r508842 - in branches/2019Q3/graphics/glfw: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jgh X-SVN-Commit-Paths: in branches/2019Q3/graphics/glfw: . files X-SVN-Commit-Revision: 508842 X-SVN-Commit-Repository: ports 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.29 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, 13 Aug 2019 18:13:25 -0000 Author: jgh Date: Tue Aug 13 18:13:24 2019 New Revision: 508842 URL: https://svnweb.freebsd.org/changeset/ports/508842 Log: MFH: r508841 - address WAYLAND build PR: 238085 Submitted by: list1@gjunka.com Approved by: neel@neelc.org (maintainer) Approved by: ports-secteam (with hat) Added: branches/2019Q3/graphics/glfw/files/patch-src-wl_init.c - copied unchanged from r508841, head/graphics/glfw/files/patch-src-wl_init.c Modified: branches/2019Q3/graphics/glfw/Makefile Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/graphics/glfw/Makefile ============================================================================== --- branches/2019Q3/graphics/glfw/Makefile Tue Aug 13 18:08:40 2019 (r508841) +++ branches/2019Q3/graphics/glfw/Makefile Tue Aug 13 18:13:24 2019 (r508842) @@ -3,6 +3,7 @@ PORTNAME= glfw PORTVERSION= 3.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF Copied: branches/2019Q3/graphics/glfw/files/patch-src-wl_init.c (from r508841, head/graphics/glfw/files/patch-src-wl_init.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q3/graphics/glfw/files/patch-src-wl_init.c Tue Aug 13 18:13:24 2019 (r508842, copy of r508841, head/graphics/glfw/files/patch-src-wl_init.c) @@ -0,0 +1,26 @@ +--- src/wl_init.c.orig 2019-08-03 17:40:05 UTC ++++ src/wl_init.c +@@ -29,7 +29,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -37,6 +36,15 @@ + #include + #include + #include ++#ifdef __has_include ++#if __has_include() ++#include ++#elif __has_include() ++#include ++#endif ++#else ++#include ++#endif + + + static inline int min(int n1, int n2)