Merge PR mumble-voip#6580: BREAK(server): Remove DBus support

Krzmbrzl · Oct 3, 2024 · 5570841 · 5570841
2 parents 6f521d2 + fbe0f90
commit 5570841
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 1,860 deletions.
diff --git a/3rdPartyLicenses/dbus_license.txt b/3rdPartyLicenses/dbus_license.txt
diff --git a/auxiliary_files/mumble-server.ini b/auxiliary_files/mumble-server.ini
@@ -48,15 +48,6 @@ database=
 ;dbPrefix=mumble-server_
 ;dbOpts=
 
-;  The server defaults to not using D-Bus. If you wish to use dbus, which is one of the
-; RPC methods available in the server, please specify so here.
-;
-;dbus=session
-
-; Alternate D-Bus service name. Only use if you are running distinct
-; mumble server processes connected to the same D-Bus daemon.
-;dbusservice=net.sourceforge.mumble.murmur
-
 ; If you want to use ZeroC Ice to communicate with the server, you need
 ; to specify the endpoint to use. Since there is no authentication
 ; with ICE, you should only use it if you trust all the users who have

diff --git a/auxiliary_files/run_scripts/mumble-server-user-wrapper.in b/auxiliary_files/run_scripts/mumble-server-user-wrapper.in
@@ -41,7 +41,6 @@ while getopts "sid:p:k" flag; do
   		;;
   esac
 done
-DBUSFILE=$DIR/.dbus.sh
 
 if [ $DO_KILL == 1 ]; then
 	if pkill -U $UID -u $EUID -o -x -f "@MUMBLE_INSTALL_ABS_EXECUTABLEDIR@/@MUMBLE_SERVER_BINARY_NAME@ -ini $DIR/mumble-server.ini"; then
@@ -103,18 +102,5 @@ if [ "X$PID" != "X" ]; then
   exit 1
 fi
 
-DBUS_SESSION_BUS_ADDRESS=invalid:/
-[ -f $DBUSFILE ] && . $DBUSFILE
-
-if ! dbus-send --print-reply --dest=org.freedesktop.DBus --type=method_call / org.freedesktop.DBus.GetId 2> /dev/null > /dev/null; then
-  echo "Launching D-Bus session"
-  dbus-launch --sh-syntax > $DBUSFILE
-  . $DBUSFILE
-  if ! dbus-send --print-reply --dest=org.freedesktop.DBus --type=method_call / org.freedesktop.DBus.GetId 2> /dev/null > /dev/null; then
-    echo "Failed to launch session DBUS, bailing out."
-    exit 2
-  fi
-fi
-
 echo "Starting Mumble server"
 exec @MUMBLE_INSTALL_ABS_EXECUTABLEDIR@/@MUMBLE_SERVER_BINARY_NAME@ -ini $DIR/mumble-server.ini
diff --git a/scripts/generate_license_header.py b/scripts/generate_license_header.py
@@ -57,7 +57,6 @@
     ["licenseSQLite3", "3rdPartyLicenses/sqlite3_license.txt", "SQLite3", "http://sqlite.org", "USE_BUILDENV"],
     ["licenseXar", "3rdPartyLicenses/xar_license.txt", "XAR", "https://opensource.apple.com/source/xar/", "USE_BUILDENV"], # macOS only
     ["licenseAvahi", "3rdPartyLicenses/avahi_license.txt", "Avahi", "https://www.avahi.org/", "USE_BUILDENV"], # Linux only
-    ["licenseDBus", "3rdPartyLicenses/dbus_license.txt", "D-Bus", "https://www.freedesktop.org/wiki/Software/dbus", "USE_BUILDENV"], # Linux only
     ["licenseAppImageRuntime", "3rdPartyLicenses/appimage_runtime_license.txt", "AppImage Runtime", "http://www.appimage.org", "USE_BUILDENV"], # Linux only
     ["licenseSquashfuse", "3rdPartyLicenses/squashfuse_license.txt", "squashfuse", "https://github.com/vasi/squashfuse", "USE_BUILDENV"], # Linux only
     ["licenseLibfuse", "3rdPartyLicenses/libfuse_license.txt", "libfuse", "https://github.com/libfuse/libfuse/", "USE_BUILDENV"], # Linux only

diff --git a/src/murmur/CMakeLists.txt b/src/murmur/CMakeLists.txt
@@ -183,19 +183,6 @@ if(zeroconf)
 	)
 endif()
 
-if(NOT WIN32 AND NOT APPLE)
-	find_pkg(Qt6 COMPONENTS DBus REQUIRED)
-
-	target_sources(mumble-server
-		PRIVATE
-			"DBus.cpp"
-			"DBus.h"
-	)
-
-	target_compile_definitions(mumble-server PUBLIC "USE_DBUS")
-	target_link_libraries(mumble-server PRIVATE Qt6::DBus)
-endif()
-
 if(ice)
 	find_pkg(Ice
 		COMPONENTS