Attachment #172519 for bug #210808

Lines 2-8 Link Here

(-)astro/qmapshack/Makefile (-1 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qmapshack	4	PORTNAME= qmapshack
5	PORTVERSION= 1.6.1	5	PORTVERSION= 1.6.3
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 16-21 Link Here
16	libproj.so:graphics/proj \	16	libproj.so:graphics/proj \
17	libroutino.so:astro/routino	17	libroutino.so:astro/routino
18		18
		19	RUN_DEPENDS= ${LOCALBASE}/bin/bsdisks:sysutils/bsdisks
		20
19	USES= cmake compiler:c++11-lib desktop-file-utils	21	USES= cmake compiler:c++11-lib desktop-file-utils
20	USE_QT5= buildtools core dbus gui linguisttools network printsupport \	22	USE_QT5= buildtools core dbus gui linguisttools network printsupport \
21	qmake script sql sql-sqlite3 webkit widgets xml	23	qmake script sql sql-sqlite3 webkit widgets xml

Lines 1-3 Link Here

(-)astro/qmapshack/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1465057676	1	TIMESTAMP = 1468509007
2	SHA256 (qmapshack-1.6.1.tar.gz) = e702482ef894ec3fdbc5a932dd220bbb34eef1580b1645a314e9a3fa99956c22	2	SHA256 (qmapshack-1.6.3.tar.gz) = 6fa5158bd823e8d43eb8a4e4db35a05720d1fe8d624eb65320b905ae315bd708
3	SIZE (qmapshack-1.6.1.tar.gz) = 4538423	3	SIZE (qmapshack-1.6.3.tar.gz) = 5181205




--- 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

Lines 1-11 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 (+15 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/128x128/apps/QMapShack.png
		5	share/icons/hicolor/16x16/apps/QMapShack.png
		6	share/icons/hicolor/192x192/apps/QMapShack.png
		7	share/icons/hicolor/22x22/apps/QMapShack.png
		8	share/icons/hicolor/24x24/apps/QMapShack.png
		9	share/icons/hicolor/256x256/apps/QMapShack.png
4	share/icons/hicolor/32x32/apps/QMapShack.png	10	share/icons/hicolor/32x32/apps/QMapShack.png
		11	share/icons/hicolor/36x36/apps/QMapShack.png
		12	share/icons/hicolor/40x40/apps/QMapShack.png
		13	share/icons/hicolor/42x42/apps/QMapShack.png
5	share/icons/hicolor/48x48/apps/QMapShack.png	14	share/icons/hicolor/48x48/apps/QMapShack.png
		15	share/icons/hicolor/512x512/apps/QMapShack.png
		16	share/icons/hicolor/64x64/apps/QMapShack.png
		17	share/icons/hicolor/72x72/apps/QMapShack.png
		18	share/icons/hicolor/80x80/apps/QMapShack.png
		19	share/icons/hicolor/8x8/apps/QMapShack.png
		20	share/icons/hicolor/96x96/apps/QMapShack.png
6	share/icons/hicolor/scalable/apps/QMapShack.svg	21	share/icons/hicolor/scalable/apps/QMapShack.svg
7	share/pixmaps/QMapShack.png	22	share/pixmaps/QMapShack.png
8	%%DATADIR%%/translations/qmapshack_cs.qm	23	%%DATADIR%%/translations/qmapshack_cs.qm

Return to bug 210808

Lines 1-29 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;

Lines 1-20 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