Attachment #455846 for bug #602334




# add DBUS Option
option (DBUS "DBUS" OFF)

# Prevent custom commands/targets outputs to be deleted by make clean
# We need this to prevent .ts files from being deleted with make clean, when
# UPDATE_TRANSLATIONS=ON

find_package(Qt5WebKitWidgets)
find_package(Qt5LinguistTools)
find_package(Qt5PrintSupport)
if(UNIX AND DBUS)
find_package(Qt5DBus)
endif(UNIX AND DBUS)
find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)

        setup/CLogHandler.cpp
)

if(UNIX AND DBUS AND NOT APPLE)
set( SRCS
    ${SRCS}
    device/CDeviceWatcherLinux.cpp
)
endif(UNIX AND DBUS AND NOT APPLE)

if (APPLE)
set( SRCS

        setup/IAppSetup.h
)

if(UNIX AND DBUS AND NOT APPLE)
set( HDRS
    ${HDRS}
    device/CDeviceWatcherLinux.h
)
endif(UNIX AND DBUS AND NOT APPLE)

if(APPLE)
set( HDRS

add_library(QMS ${LIBINP})
add_executable(${APPLICATION_NAME} WIN32 ${MAININP})

if(UNIX AND DBUS)
    set(DBUS_LIB Qt5::DBus)
else(UNIX AND DBUS)
    set(DBUS_LIB)
endif(UNIX AND DBUS)

target_link_libraries(QMS
    Qt5::Widgets




find_package(Qt5WebKitWidgets)
find_package(Qt5LinguistTools)
find_package(Qt5PrintSupport)
if(UNIX AND DBUS)
find_package(Qt5DBus)
endif(UNIX AND DBUS)
find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)

find_package(PROJ REQUIRED)
find_package(ROUTINO REQUIRED)

if(UNIX AND DBUS)
    set(DBUS_LIB Qt5::DBus)
else(UNIX AND DBUS)
    set(DBUS_LIB)
endif(UNIX AND DBUS)

if(UNIX)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++ b/src/device/IDevice.cpp    2016-12-11 10:44:02.000000000 +0100
-- a/src/device/IDevice.cpp    2016-07-12 09:15:42.000000000 +0200

#include "helpers/CSelectCopyAction.h"

#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)

#endif

int IDevice::cnt = 0;

void IDevice::mount(const QString& path)
{
#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");
//     message << args;
#if defined(Q_OS_FREEBSD)
    // XXX Hunc sint race conditions - call bsdisks (UDisks2) too fast,
    // get a malformed reply, crash.
    QThread::sleep(1);
#endif
//     QDBusConnection::systemBus().call(message);
#endif
}

void IDevice::umount(const QString &path)
{
#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;
//    QDBusConnection::systemBus().call(message);
#endif
}


Lines 205-212 Link Here

(-)a/src/gis/CGisListWks.cpp (-2 / +2 lines)
205	}	205	}
206		206
207	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)	207	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
208	deviceWatcher = new CDeviceWatcherLinux(this);	208	// deviceWatcher = new CDeviceWatcherLinux(this);
209	connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);	209	// connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
210	#endif	210	#endif
211	#ifdef Q_OS_MAC	211	#ifdef Q_OS_MAC
212	deviceWatcher = new CDeviceWatcherMac(this);	212	deviceWatcher = new CDeviceWatcherMac(this);

Return to bug 602334

Lines 1-3 Link Here

(-)a/src/CMakeLists.txt (-9 / +12 lines)
		1	# add DBUS Option
		2	option (DBUS "DBUS" OFF)
		3
1	# Prevent custom commands/targets outputs to be deleted by make clean	4	# Prevent custom commands/targets outputs to be deleted by make clean
2	# We need this to prevent .ts files from being deleted with make clean, when	5	# We need this to prevent .ts files from being deleted with make clean, when
3	# UPDATE_TRANSLATIONS=ON	6	# UPDATE_TRANSLATIONS=ON
Lines 19-27 Link Here
19	find_package(Qt5WebKitWidgets)	22	find_package(Qt5WebKitWidgets)
20	find_package(Qt5LinguistTools)	23	find_package(Qt5LinguistTools)
21	find_package(Qt5PrintSupport)	24	find_package(Qt5PrintSupport)
22	if(UNIX)	25	if(UNIX AND DBUS)
23	find_package(Qt5DBus)	26	find_package(Qt5DBus)
24	endif(UNIX)	27	endif(UNIX AND DBUS)
25	find_package(GDAL REQUIRED)	28	find_package(GDAL REQUIRED)
26	find_package(PROJ REQUIRED)	29	find_package(PROJ REQUIRED)
27	find_package(ROUTINO REQUIRED)	30	find_package(ROUTINO REQUIRED)
Lines 289-300 Link Here
289	setup/CLogHandler.cpp	292	setup/CLogHandler.cpp
290	)	293	)
291		294
292	if(UNIX AND NOT APPLE)	295	if(UNIX AND DBUS AND NOT APPLE)
293	set( SRCS	296	set( SRCS
294	${SRCS}	297	${SRCS}
295	device/CDeviceWatcherLinux.cpp	298	device/CDeviceWatcherLinux.cpp
296	)	299	)
297	endif(UNIX AND NOT APPLE)	300	endif(UNIX AND DBUS AND NOT APPLE)
298		301
299	if (APPLE)	302	if (APPLE)
300	set( SRCS	303	set( SRCS
Lines 553-564 Link Here
553	setup/IAppSetup.h	556	setup/IAppSetup.h
554	)	557	)
555		558
556	if(UNIX AND NOT APPLE)	559	if(UNIX AND DBUS AND NOT APPLE)
557	set( HDRS	560	set( HDRS
558	${HDRS}	561	${HDRS}
559	device/CDeviceWatcherLinux.h	562	device/CDeviceWatcherLinux.h
560	)	563	)
561	endif(UNIX AND NOT APPLE)	564	endif(UNIX AND DBUS AND NOT APPLE)
562		565
563	if(APPLE)	566	if(APPLE)
564	set( HDRS	567	set( HDRS
Lines 724-734 Link Here
724	add_library(QMS ${LIBINP})	727	add_library(QMS ${LIBINP})
725	add_executable(${APPLICATION_NAME} WIN32 ${MAININP})	728	add_executable(${APPLICATION_NAME} WIN32 ${MAININP})
726		729
727	if(UNIX)	730	if(UNIX AND DBUS)
728	set(DBUS_LIB Qt5::DBus)	731	set(DBUS_LIB Qt5::DBus)
729	else(UNIX)	732	else(UNIX AND DBUS)
730	set(DBUS_LIB)	733	set(DBUS_LIB)
731	endif(UNIX)	734	endif(UNIX AND DBUS)
732		735
733	target_link_libraries(QMS	736	target_link_libraries(QMS
734	Qt5::Widgets	737	Qt5::Widgets

Lines 13-21 Link Here

(-)a/test/unittest/CMakeLists.txt (-14 / +13 lines)
13	find_package(Qt5WebKitWidgets)	13	find_package(Qt5WebKitWidgets)
14	find_package(Qt5LinguistTools)	14	find_package(Qt5LinguistTools)
15	find_package(Qt5PrintSupport)	15	find_package(Qt5PrintSupport)
16	if(UNIX)	16	if(UNIX AND DBUS)
17	find_package(Qt5DBus)	17	find_package(Qt5DBus)
18	endif(UNIX)	18	endif(UNIX AND DBUS)
19	find_package(GDAL REQUIRED)	19	find_package(GDAL REQUIRED)
20	find_package(PROJ REQUIRED)	20	find_package(PROJ REQUIRED)
21	find_package(ROUTINO REQUIRED)	21	find_package(ROUTINO REQUIRED)
Lines 20-30 Link Here
20	find_package(PROJ REQUIRED)	20	find_package(PROJ REQUIRED)
21	find_package(ROUTINO REQUIRED)	21	find_package(ROUTINO REQUIRED)
22		22
23	if(UNIX)	23	if(UNIX AND DBUS)
24	set(DBUS_LIB Qt5::DBus)	24	set(DBUS_LIB Qt5::DBus)
25	else(UNIX)	25	else(UNIX AND DBUS)
26	set(DBUS_LIB)	26	set(DBUS_LIB)
27	endif(UNIX)	27	endif(UNIX AND DBUS)
28		28
29	if(UNIX)	29	if(UNIX)
30	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")	30	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
31	-diff -ur a/src/device/IDevice.cpp b/src/device/IDevice.cpp	31	++ b/src/device/IDevice.cpp 2016-12-11 10:44:02.000000000 +0100
32	-- a/src/device/IDevice.cpp 2016-07-12 09:15:42.000000000 +0200
Lines 23-29 Link Here
23	#include "helpers/CSelectCopyAction.h"	23	#include "helpers/CSelectCopyAction.h"
24		24
25	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)	25	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
26	#include <QtDBus>	26
27	#endif	27	#endif
28		28
29	int IDevice::cnt = 0;	29	int IDevice::cnt = 0;
Lines 53-78 Link Here
53	void IDevice::mount(const QString& path)	53	void IDevice::mount(const QString& path)
54	{	54	{
55	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)	55	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
56	QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");	56	// QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");
57	QVariantMap args;	57	QVariantMap args;
58	args.insert("options", "sync");	58	args.insert("options", "sync");
59	message << args;	59	// message << args;
60	#if defined(Q_OS_FREEBSD)	60	#if defined(Q_OS_FREEBSD)
61	// XXX Hunc sint race conditions - call bsdisks (UDisks2) too fast,	61	// XXX Hunc sint race conditions - call bsdisks (UDisks2) too fast,
62	// get a malformed reply, crash.	62	// get a malformed reply, crash.
63	QThread::sleep(1);	63	QThread::sleep(1);
64	#endif	64	#endif
65	QDBusConnection::systemBus().call(message);	65	// QDBusConnection::systemBus().call(message);
66	#endif	66	#endif
67	}	67	}
68		68
69	void IDevice::umount(const QString &path)	69	void IDevice::umount(const QString &path)
70	{	70	{
71	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)	71	#if defined(Q_OS_LINUX) \|\| defined(Q_OS_FREEBSD)
72	QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");	72	// QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");
73	QVariantMap args;	73	QVariantMap args;
74	message << args;	74	// message << args;
75	QDBusConnection::systemBus().call(message);	75	// QDBusConnection::systemBus().call(message);
76	#endif	76	#endif
77	}	77	}
78		78