dbus: drop CMake patches
CMake is not being used to build dbus as it does not respect endinaness under CMake and 1.14 branch. So, lets drop the patches as they will not apply to future 1.14 update. Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
c663d8171f
commit
25e4b88083
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=dbus
|
||||
PKG_VERSION:=1.13.18
|
||||
PKG_RELEASE:=12
|
||||
PKG_RELEASE:=13
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://dbus.freedesktop.org/releases/dbus
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -510,11 +510,11 @@ if(WIN32)
|
||||
else(WIN32)
|
||||
set(DBUS_SESSION_BUS_LISTEN_ADDRESS "unix:tmpdir=${DBUS_SESSION_SOCKET_DIR}" CACHE STRING "session bus default listening address")
|
||||
set(DBUS_SESSION_BUS_CONNECT_ADDRESS "autolaunch:" CACHE STRING "session bus fallback address for clients")
|
||||
- set(sysconfdir "")
|
||||
+ set(sysconfdir "/usr/share")
|
||||
set(configdir ${sysconfdir}/dbus-1 )
|
||||
set(DBUS_SYSTEM_CONFIG_FILE ${configdir}/system.conf)
|
||||
set(DBUS_SESSION_CONFIG_FILE ${configdir}/session.conf)
|
||||
- set(DBUS_USER "messagebus")
|
||||
+ set(DBUS_USER "root")
|
||||
set(DBUS_TEST_USER "nobody")
|
||||
# For best security, assume that all non-Windows platforms can do
|
||||
# credentials-passing.
|
|
@ -1,27 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -471,14 +471,16 @@ endif()
|
||||
|
||||
#### Find socket directories
|
||||
if(UNIX)
|
||||
- if(NOT $ENV{TMPDIR} STREQUAL "")
|
||||
- set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
|
||||
- elseif(NOT $ENV{TEMP} STREQUAL "")
|
||||
- set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
|
||||
- elseif(NOT $ENV{TMP} STREQUAL "")
|
||||
- set(DBUS_SESSION_SOCKET_DIR $ENV{TMP})
|
||||
- else()
|
||||
- set(DBUS_SESSION_SOCKET_DIR /tmp)
|
||||
+ if(NOT DEFINED DBUS_SESSION_SOCKET_DIR)
|
||||
+ if(NOT $ENV{TMPDIR} STREQUAL "")
|
||||
+ set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
|
||||
+ elseif(NOT $ENV{TEMP} STREQUAL "")
|
||||
+ set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
|
||||
+ elseif(NOT $ENV{TMP} STREQUAL "")
|
||||
+ set(DBUS_SESSION_SOCKET_DIR $ENV{TMP})
|
||||
+ else()
|
||||
+ set(DBUS_SESSION_SOCKET_DIR /tmp)
|
||||
+ endif()
|
||||
endif()
|
||||
endif()
|
||||
|
Loading…
Reference in New Issue