Attachment #171075 for bug #210063




# $FreeBSD$

PORTNAME=	qmapshack
PORTVERSION=	1.6.1
CATEGORIES=	astro
MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/



LICENSE=	GPLv3

LIB_DEPENDS=	libQt5DBus.so:devel/dbus-qt5 \
		libgdal.so:graphics/gdal \
		libproj.so:graphics/proj \

LIB_DEPENDS=	libgdal.so:graphics/gdal \
		libroutino.so:astro/routino

USES=		cmake desktop-file-utils
USE_QT5=	buildtools core gui linguisttools network printsupport \
		qmake script sql sql-sqlite3 webkit widgets xml

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)astro/qmapshack/distinfo (-2 / +3 lines)
1	SHA256 (qmapshack-1.3.1.tar.gz) = 8f4bcb5454786d7f81681abe4f96cc8e3598f62219708d1efe4c94d19ab0dfea	1	TIMESTAMP = 1465057676
2	SIZE (qmapshack-1.3.1.tar.gz) = 3758785	2	SHA256 (qmapshack-1.6.1.tar.gz) = e702482ef894ec3fdbc5a932dd220bbb34eef1580b1645a314e9a3fa99956c22
		3	SIZE (qmapshack-1.6.1.tar.gz) = 4538423




--- src/device/IDevice.cpp.orig	2016-06-04 19:56:45 UTC
+++ src/device/IDevice.cpp
@@ -22,7 +22,7 @@
 #include "gis/prj/IGisProject.h"
 #include "helpers/CSelectCopyAction.h"
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 #include <QtDBus>
 #endif
 
@@ -52,7 +52,7 @@ IDevice::~IDevice()
 
 void IDevice::mount(const QString& path)
 {
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");
     QVariantMap args;
     args.insert("options", "sync");
@@ -63,7 +63,7 @@ void IDevice::mount(const QString& path)
 
 void IDevice::umount(const QString &path)
 {
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");
     QVariantMap args;
     message << args;




--- src/gis/CGisListWks.cpp.orig	2016-06-04 19:56:53 UTC
+++ src/gis/CGisListWks.cpp
@@ -18,7 +18,7 @@
 
 #include "CMainWindow.h"
 #include "canvas/CCanvas.h"
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 #include "device/CDeviceWatcherLinux.h"
 #endif
 #ifdef Q_OS_WIN
@@ -196,7 +196,7 @@ CGisListWks::CGisListWks(QWidget *parent
         QTimer::singleShot(saveEvery * 60000, this, SLOT(slotSaveWorkspace()));
     }
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
     deviceWatcher = new CDeviceWatcherLinux(this);
     connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
 #endif

Line 0 Link Here

(-)astro/qmapshack/files/patch-src_setup_IAppSetup.cpp (+11 lines)
	1	--- src/setup/IAppSetup.cpp.orig 2016-06-04 19:55:57 UTC
	2	+++ src/setup/IAppSetup.cpp
	3	@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstanc
	4	{
	5	#if defined(Q_OS_MAC)
	6	instance = new CAppSetupMac();
	7	-#elif defined(Q_OS_LINUX)
	8	+#elif defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	9	instance = new CAppSetupLinux();
	10	#elif defined (Q_OS_WIN32)
	11	instance = new CAppSetupWin();

Lines 1-8 Link Here

(-)astro/qmapshack/pkg-plist (+4 lines)
1	bin/qmapshack	1	bin/qmapshack
2	man/man1/qmapshack.1.gz	2	man/man1/qmapshack.1.gz
3	share/applications/qmapshack.desktop	3	share/applications/qmapshack.desktop
		4	share/icons/hicolor/32x32/apps/QMapShack.png
		5	share/icons/hicolor/48x48/apps/QMapShack.png
		6	share/icons/hicolor/scalable/apps/QMapShack.svg
4	share/pixmaps/QMapShack.png	7	share/pixmaps/QMapShack.png
5	%%DATADIR%%/translations/qmapshack_cs.qm	8	%%DATADIR%%/translations/qmapshack_cs.qm
6	%%DATADIR%%/translations/qmapshack_de.qm	9	%%DATADIR%%/translations/qmapshack_de.qm
7	%%DATADIR%%/translations/qmapshack_es.qm	10	%%DATADIR%%/translations/qmapshack_es.qm
8	%%DATADIR%%/translations/qmapshack_fr.qm	11	%%DATADIR%%/translations/qmapshack_fr.qm
		12	%%DATADIR%%/translations/qmapshack_nl.qm

Return to bug 210063

Lines 2-8 Link Here

(-)astro/qmapshack/Makefile (-7 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qmapshack	4	PORTNAME= qmapshack
5	PORTVERSION= 1.3.1	5	PORTVERSION= 1.6.1
6	CATEGORIES= astro	6	CATEGORIES= astro
7	MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/	7	MASTER_SITES= https://bitbucket.org/maproom/qmapshack/downloads/
8		8
Lines 11-24 Link Here
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13		13
14	BROKEN= unfetchable	14	LIB_DEPENDS= libQt5DBus.so:devel/dbus-qt5 \
15	DEPRECATED= Broken for more than 6 months	15	libgdal.so:graphics/gdal \
16	EXPIRATION_DATE= 2016-07-04	16	libproj.so:graphics/proj \
17
18	LIB_DEPENDS= libgdal.so:graphics/gdal \
19	libroutino.so:astro/routino	17	libroutino.so:astro/routino
20		18
21	USES= cmake desktop-file-utils	19	USES= cmake desktop-file-utils
22	USE_QT5= buildtools linguisttools qmake script sql webkit widgets xml	20	USE_QT5= buildtools core gui linguisttools network printsupport \
		21	qmake script sql sql-sqlite3 webkit widgets xml
23		22
24	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Line 0 Link Here

(-)astro/qmapshack/files/patch-src_device_IDevice.cpp (+29 lines)
	1	--- src/device/IDevice.cpp.orig 2016-06-04 19:56:45 UTC
	2	+++ src/device/IDevice.cpp
	3	@@ -22,7 +22,7 @@
	4	#include "gis/prj/IGisProject.h"
	5	#include "helpers/CSelectCopyAction.h"
	6
	7	-#ifdef Q_OS_LINUX
	8	+#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	9	#include <QtDBus>
	10	#endif
	11
	12	@@ -52,7 +52,7 @@ IDevice::~IDevice()
	13
	14	void IDevice::mount(const QString& path)
	15	{
	16	-#ifdef Q_OS_LINUX
	17	+#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	18	QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");
	19	QVariantMap args;
	20	args.insert("options", "sync");
	21	@@ -63,7 +63,7 @@ void IDevice::mount(const QString& path)
	22
	23	void IDevice::umount(const QString &path)
	24	{
	25	-#ifdef Q_OS_LINUX
	26	+#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	27	QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");
	28	QVariantMap args;
	29	message << args;

Line 0 Link Here

(-)astro/qmapshack/files/patch-src_gis_CGisListWks.cpp (+20 lines)
	1	--- src/gis/CGisListWks.cpp.orig 2016-06-04 19:56:53 UTC
	2	+++ src/gis/CGisListWks.cpp
	3	@@ -18,7 +18,7 @@
	4
	5	#include "CMainWindow.h"
	6	#include "canvas/CCanvas.h"
	7	-#ifdef Q_OS_LINUX
	8	+#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	9	#include "device/CDeviceWatcherLinux.h"
	10	#endif
	11	#ifdef Q_OS_WIN
	12	@@ -196,7 +196,7 @@ CGisListWks::CGisListWks(QWidget *parent
	13	QTimer::singleShot(saveEvery * 60000, this, SLOT(slotSaveWorkspace()));
	14	}
	15
	16	-#ifdef Q_OS_LINUX
	17	+#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
	18	deviceWatcher = new CDeviceWatcherLinux(this);
	19	connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
	20	#endif