From owner-svn-ports-head@freebsd.org Mon Apr 2 20:19:07 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14611F82ACD; Mon, 2 Apr 2018 20:19:07 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AEA9F701F1; Mon, 2 Apr 2018 20:19:06 +0000 (UTC) (envelope-from adridg@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 A12EA1A612; Mon, 2 Apr 2018 20:19:06 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w32KJ6NY072246; Mon, 2 Apr 2018 20:19:06 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w32KJ6w2072244; Mon, 2 Apr 2018 20:19:06 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804022019.w32KJ6w2072244@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 2 Apr 2018 20:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466261 - in head/astro/qmapshack: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/astro/qmapshack: . files X-SVN-Commit-Revision: 466261 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Apr 2018 20:19:07 -0000 Author: adridg Date: Mon Apr 2 20:19:06 2018 New Revision: 466261 URL: https://svnweb.freebsd.org/changeset/ports/466261 Log: Fix astro/qmapshack ahead of CMake 3.11. Because of the way CMake 3.11 orders includes in mocs_compilation.cpp, it shows up cases where headers don't have all of the necessary includes or forward-type-declarations in place. Add one here to fix the build. The error message is in the patch. Also reported upstream, https://bitbucket.org/maproom/qmapshack/issues/325/cmake-311-build-fix but it had already been (unrelatedly) fixed upstream in https://bitbucket.org/maproom/qmapshack/commits/2968b238 Approved by: tcberner (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D14932 Added: head/astro/qmapshack/files/patch-src_qmapshack_dem_IDem.h (contents, props changed) Modified: head/astro/qmapshack/Makefile Modified: head/astro/qmapshack/Makefile ============================================================================== --- head/astro/qmapshack/Makefile Mon Apr 2 20:12:15 2018 (r466260) +++ head/astro/qmapshack/Makefile Mon Apr 2 20:19:06 2018 (r466261) @@ -3,6 +3,7 @@ PORTNAME= qmapshack PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/ Added: head/astro/qmapshack/files/patch-src_qmapshack_dem_IDem.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/qmapshack/files/patch-src_qmapshack_dem_IDem.h Mon Apr 2 20:19:06 2018 (r466261) @@ -0,0 +1,13 @@ +Provide full definition of IDrawContext, needed when #including +this file in a context (ha!) without that definition already. + +--- src/qmapshack/dem/IDem.h.orig 2018-02-23 16:39:15 UTC ++++ src/qmapshack/dem/IDem.h +@@ -19,6 +19,7 @@ + #ifndef IDEM_H + #define IDEM_H + ++#include "canvas/IDrawContext.h" + #include "canvas/IDrawObject.h" + #include + #include