Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Apr 2018 20:19:06 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r466261 - in head/astro/qmapshack: . files
Message-ID:  <201804022019.w32KJ6w2072244@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <QObject>
+ #include <QPointer>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804022019.w32KJ6w2072244>