flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 02:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename share/dbus-1 to etc/dbus-1 to not mix it up with data/shared

Browse Source 
refs #615
This commit is contained in:
Roland Winklmeier
2016-04-29 20:51:12 +02:00
parent 20aa59c537
commit ab1491f085
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/dbus-1/session.conf → etc/dbus-1/session.conf
View File

@@ -35,18 +35,13 @@
<allow own="*"/> <allow own="*"/>
</policy> </policy>
<!-- Include legacy configuration location -->
<include ignore_missing="yes">../../etc/dbus-1/session.conf</include>
<!-- Config files are placed here that among other things, <!-- Config files are placed here that among other things,
further restrict the above policy for specific services. --> further restrict the above policy for specific services. -->
<includedir>session.d</includedir> <includedir>session.d</includedir>
<includedir>../../etc/dbus-1/session.d</includedir>
<!-- This is included last so local configuration can override what's <!-- This is included last so local configuration can override what's
in this standard file --> in this standard file -->
<include ignore_missing="yes">../../etc/dbus-1/session-local.conf</include> <include ignore_missing="yes">session-local.conf</include>
<include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include> <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>

14
install.pri
View File

@@ -90,9 +90,9 @@ win32-g++ {
DBUS_LIBRARIES *= libdbus-1-3.dll DBUS_LIBRARIES *= libdbus-1-3.dll
dbus_library_target.path = $${PREFIX}/bin dbus_library_target.path = $${PREFIX}/bin
DBUS_CONFIG_SOURCE_DIR = $$[QT_INSTALL_BINS]/.. DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
DBUS_CONFIG_FILES *= share/dbus-1/* DBUS_CONFIG_FILES *= etc/dbus-1/*
dbus_config_target.path = $${PREFIX}/share/dbus-1 dbus_config_target.path = $${PREFIX}/etc/dbus-1
} }
win32-msvc2015 { win32-msvc2015 {
@@ -105,9 +105,9 @@ win32-msvc2015 {
DBUS_LIBRARIES *= dbus-1-3.dll DBUS_LIBRARIES *= dbus-1-3.dll
dbus_library_target.path = $${PREFIX}/bin dbus_library_target.path = $${PREFIX}/bin
DBUS_CONFIG_SOURCE_DIR = $$[QT_INSTALL_BINS]/.. DBUS_CONFIG_SOURCE_DIR = $$SourceRoot
DBUS_CONFIG_FILES *= share/dbus-1/* DBUS_CONFIG_FILES *= etc/dbus-1/*
dbus_config_target.path = $${PREFIX}/share/dbus-1 dbus_config_target.path = $${PREFIX}/etc/dbus-1
} }
macx { macx {
@@ -122,7 +122,7 @@ macx {
DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1 DBUS_CONFIG_SOURCE_DIR = /usr/local/share/dbus-1
DBUS_CONFIG_FILES *= session.conf DBUS_CONFIG_FILES *= session.conf
DBUS_CONFIG_FILES *= system.conf DBUS_CONFIG_FILES *= system.conf
dbus_config_target.path = $${PREFIX}/share/dbus-1 dbus_config_target.path = $${PREFIX}/etc/dbus-1
} }
for (BINARY, DBUS_BINARIES) { for (BINARY, DBUS_BINARIES) {

6
installer/installbuilder/qt5-binaries.xml
View File

@@ -67,13 +67,13 @@
</distributionFileList> </distributionFileList>
</folder> </folder>
<folder> <folder>
<description>share</description> <description>etc</description>
<destination>${installdir}/</destination> <destination>${installdir}/</destination>
<name>share</name> <name>etc</name>
<platforms>windows</platforms> <platforms>windows</platforms>
<distributionFileList> <distributionFileList>
<distributionDirectory> <distributionDirectory>
<origin>../../dist/share</origin> <origin>../../dist/etc</origin>
</distributionDirectory> </distributionDirectory>
</distributionFileList> </distributionFileList>
</folder> </folder>

2
src/blackmisc/dbusserver.cpp
View File

@@ -102,7 +102,7 @@ namespace BlackMisc
void CDBusServer::launchDBusDaemon() void CDBusServer::launchDBusDaemon()
{ {
const QString program = QStringLiteral("dbus-daemon"); const QString program = QStringLiteral("dbus-daemon");
const QStringList arguments = { QStringLiteral("--config-file=../share/dbus-1/session.conf") }; const QStringList arguments = { QStringLiteral("--config-file=../etc/dbus-1/session.conf") };
bool success = QProcess::startDetached(program, arguments); bool success = QProcess::startDetached(program, arguments);
if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); } if (!success) { CLogMessage(this).error("Failed to launch dbus-daemon!"); }
} }