sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 +- solenv/flatpak-manifest.in | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-)
New commits: commit f465685aecf508be987ae199e77667af896a5e8f Author: Arkadiy Illarionov <qar...@gmail.com> AuthorDate: Thu Aug 9 20:25:06 2018 +0300 Commit: Thorsten Behrens <thorsten.behr...@cib.de> CommitDate: Sun Aug 12 22:33:57 2018 +0200 Resolves: tdf#112343 remove last dbus-glib mentions Remove dbus-glib bundle from flatpak since LibreOffice doesn't depend on dbus-glib as of commit 02addb3618f026acd72ece76fc726b9473cc5940. Fix dbus reference in comment. Change-Id: I1f4bc41bcd0ea091fc199f2271b27079ce3c2c74 Reviewed-on: https://gerrit.libreoffice.org/58795 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index c89acf3daf58..0a13f5847ecb 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -959,7 +959,7 @@ setupBluez5Profile1(DBusConnection* pConnection, std::vector<Communicator*>* pCo aVTable.message_function = ProfileMessageFunction; // dbus_connection_try_register_object_path could be used but only exists for - // dbus-glib >= 1.2 -- we really shouldn't be trying this twice in any case. + // dbus >= 1.2 -- we really shouldn't be trying this twice in any case. // (dbus_connection_try_register_object_path also returns an error with more // information which could be useful for debugging purposes.) bErr = !dbus_connection_register_object_path(pConnection, "/org/libreoffice/bluez/profile1", &aVTable, pCommunicators); diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 129e325cea12..3596916c79c7 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -44,21 +44,6 @@ ] }, { - "name": "dbus-glib", - "cleanup": [ "*.la", "/bin", "/etc", "/include", "/libexec", "/share/gtk-doc", "/share/man" ], - "config-opts": [ - "--disable-static", - "--disable-gtk-doc" - ], - "sources": [ - { - "type": "archive", - "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.108.tar.gz", - "sha256": "9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c" - } - ] - }, - { "name": "gvfs", "cleanup": [ "/libexec/*", "/share/dbus-1/services/*", "/share/gvfs/mounts" ], "config-opts": [ "--disable-hal", "--disable-gdu", "--disable-gcr", "--disable-obexftp", _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits