From a34663f844ccf8b132b6ff2de8e45c20c5d956ca Mon Sep 17 00:00:00 2001 From: Erinor2 Date: Fri, 19 Jan 2018 15:08:14 +0100 Subject: [PATCH] Transparency: Double-buffer not taken into consideration when selecting X11 when using ccmake (#383) * Solved an issue when having own_visual_argb_visual combined with double_buffer which break with an error. And when disabling this combination Conky is not anymore transparent. * Added imlib2 for travis * Added libimlib2-dev for travis --- .travis.yml | 1 + cmake/ConkyBuildOptions.cmake | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c2a7c76..6b6cd265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ addons: - liblua5.1-0-dev - libtolua++5.1-dev - libcairo2-dev + - libimlib2-dev - libxinerama-dev - gawk before_script: diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake index ff3e6dd2..53b7859e 100644 --- a/cmake/ConkyBuildOptions.cmake +++ b/cmake/ConkyBuildOptions.cmake @@ -110,10 +110,10 @@ if(BUILD_X11) option(OWN_WINDOW "Enable own_window support" true) option(BUILD_XDAMAGE "Build Xdamage support" true) option(BUILD_XINERAMA "Build Xinerama support" true) - option(BUILD_XDBE "Build Xdbe (double-buffer) support" false) + option(BUILD_XDBE "Build Xdbe (double-buffer) support" true) option(BUILD_XFT "Build Xft (freetype fonts) support" true) - option(BUILD_IMLIB2 "Enable Imlib2 support" false) - option(BUILD_XSHAPE "Enable Xshape support" false) + option(BUILD_IMLIB2 "Enable Imlib2 support" true) + option(BUILD_XSHAPE "Enable Xshape support" true) else(BUILD_X11) set(OWN_WINDOW false CACHE BOOL "Enable own_window support" FORCE) set(BUILD_XDAMAGE false CACHE BOOL "Build Xdamage support" FORCE)