Attachment #197088 for bug #231359

View | Details | Raw Unified | Return to bug 231359
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	qmapshack
PORTVERSION=	1.12.0
PORTREVISION=	1
CATEGORIES=	astro
MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/


RUN_DEPENDS=	${LOCALBASE}/bin/bsdisks:sysutils/bsdisks

USES=		cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
USE_QT=		buildtools core dbus gui linguisttools location network \
		printsupport qmake qml quick sql sql-sqlite3 uitools \
		webchannel webengine widgets xml

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/astro/qmapshack/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1524141966	1	TIMESTAMP = 1536321097
2	SHA256 (qmapshack-1.11.1.tar.gz) = 3e65e443665041bb4c10ebd10fb49ca6df9015d9cecd2551a888bbdaa8a3117b	2	SHA256 (qmapshack-1.12.0.tar.gz) = 30ee69165a8548b529d5d9679da52099226405b9285b42b18342dd842730b734
3	SIZE (qmapshack-1.11.1.tar.gz) = 11446871	3	SIZE (qmapshack-1.12.0.tar.gz) = 12030329




# HG changeset patch
# User kiozen
# Date 1528899896 -7200
# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
# Parent  f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0

diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
--- src/qmapshack/helpers/CToolBarSetupDialog.cpp
+++ src/qmapshack/helpers/CToolBarSetupDialog.cpp
@@ -20,6 +20,8 @@
 #include "helpers/CToolBarConfig.h"
 #include "helpers/CToolBarSetupDialog.h"
 
+#include <QAction>
+
 bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
 {
     CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);

Return to bug 231359

Lines 2-9 Link Here

(-)b/astro/qmapshack/Makefile (-4 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qmapshack	4	PORTNAME= qmapshack
5	PORTVERSION= 1.11.1	5	PORTVERSION= 1.12.0
6	PORTREVISION= 1
7	CATEGORIES= astro	6	CATEGORIES= astro
8	MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/	7	MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/
9		8
Lines 20-26 LIB_DEPENDS= libgdal.so:graphics/gdal \ Link Here
20	RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks	19	RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
21		20
22	USES= cmake compiler:c++11-lib desktop-file-utils jpeg qt:5	21	USES= cmake compiler:c++11-lib desktop-file-utils jpeg qt:5
23	USE_QT= buildtools core dbus gui linguisttools network printsupport \	22	USE_QT= buildtools core dbus gui linguisttools location network \
24	qmake script sql sql-sqlite3 uitools webkit widgets xml	23	printsupport qmake qml quick sql sql-sqlite3 uitools \
		24	webchannel webengine widgets xml
25		25
26	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Removed Link Here

(-)a/astro/qmapshack/files/patch-hg_e9b47af (-19 lines)
1	# HG changeset patch
2	# User kiozen
3	# Date 1528899896 -7200
4	# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
5	# Parent f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
6	[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0
7
8	diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
9	--- src/qmapshack/helpers/CToolBarSetupDialog.cpp
10	+++ src/qmapshack/helpers/CToolBarSetupDialog.cpp
11	@@ -20,6 +20,8 @@
12	#include "helpers/CToolBarConfig.h"
13	#include "helpers/CToolBarSetupDialog.h"
14
15	+#include <QAction>
16	+
17	bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
18	{
19	CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);