Attachment 119691 Details for Bug 92899 – Fix test-autolaunch test by generating session.conf in <build-dir>/share/dbus-1 for cmake.

[patch] Fix test-autolaunch test by generating session.conf in <build-dir>/share/dbus-1 for cmake.

0001-Fix-test-autolaunch-test-by-generating-session.conf-.patch (text/plain), 1.51 KB, created by Ralf Habacker on 2015-11-15 19:55:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-11-15 19:55:55 UTC

Size: 1.51 KB

patch

obsolete

>From c90f385012cdfd295e1b8a9b46e6d23cd2e042f4 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Sun, 15 Nov 2015 20:48:30 +0100
>Subject: [PATCH] Fix test-autolaunch test by generating session.conf in
> <build-dir>/share/dbus-1 for cmake.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92899
>---
> cmake/bus/CMakeLists.txt | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt
>index 0dcae65..9a2933e 100644
>--- a/cmake/bus/CMakeLists.txt
>+++ b/cmake/bus/CMakeLists.txt
>@@ -4,12 +4,12 @@ SET(EFENCE "")
> SET(BUS_DIR ${CMAKE_SOURCE_DIR}/../bus)
> 
> # config files for installation 
>-CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/session.conf" IMMEDIATE @ONLY)
>+CONFIGURE_FILE( "${BUS_DIR}/session.conf.in" "${CMAKE_BINARY_DIR}/share/dbus-1/session.conf" IMMEDIATE @ONLY)
> CONFIGURE_FILE( "${BUS_DIR}/legacy-config/session.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/session.conf" IMMEDIATE @ONLY)
> FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/session.d)
> 
> if(NOT WIN32)
>-    CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/system.conf" IMMEDIATE @ONLY)
>+    CONFIGURE_FILE( "${BUS_DIR}/system.conf.in" "${CMAKE_BINARY_DIR}/share/dbus-1/system.conf" IMMEDIATE @ONLY)
>     CONFIGURE_FILE( "${BUS_DIR}/legacy-config/system.conf.in" "${CMAKE_CURRENT_BINARY_DIR}/legacy-config/system.conf" IMMEDIATE @ONLY)
>     FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/system.d)
> endif()
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 92899: 119691 | 119735 | 119741 | 119742 | 119743 | 119921 | 120166 | 120169 | 120170 | 120172 | 121599 | 121600 | 121619 | 121621 | 121623 | 121625 | 121626 | 121630 | 121631 | 121632 | 121635

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.