SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/awesome/stuff/0001-Normalize-icon-path-names-fixes-869.patch	Thu Mar 03 22:10:39 2011 +0100
     1.3 @@ -0,0 +1,40 @@
     1.4 +From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
     1.5 +From: Thomas Moschny <thomas.moschny@gmx.de>
     1.6 +Date: Mon, 21 Feb 2011 17:58:04 +0100
     1.7 +Subject: [PATCH] Normalize icon path names (fixes #869).
     1.8 +
     1.9 +The elements in ${icon_sources}, as returned by file(GLOB ...) contain
    1.10 +double slashes, could be a bug in cmake. This causes building with
    1.11 +cmake 2.8.4 to fail, due to dependency problems lateron.
    1.12 +
    1.13 +This patch works around the issue by normalizing all path names in
    1.14 +${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
    1.15 +the double slashes.
    1.16 +---
    1.17 + CMakeLists.txt |    3 ++-
    1.18 + 1 files changed, 2 insertions(+), 1 deletions(-)
    1.19 +
    1.20 +diff --git a/CMakeLists.txt b/CMakeLists.txt
    1.21 +index 64be9b9..472bec2 100644
    1.22 +--- a/CMakeLists.txt
    1.23 ++++ b/CMakeLists.txt
    1.24 +@@ -244,14 +244,15 @@ endif()
    1.25 + 
    1.26 + # {{{ Theme icons
    1.27 + file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
    1.28 +-set(ALL_ICONS ${icon_sources})
    1.29 + 
    1.30 + foreach(icon ${icon_sources})
    1.31 +     # Copy all icons to the build dir to simplify the following code.
    1.32 +     # Source paths are interpreted relative to ${SOURCE_DIR}, target paths
    1.33 +     # relative to ${BUILD_DIR}.
    1.34 +     get_filename_component(icon_path ${icon} PATH)
    1.35 ++    get_filename_component(icon_name ${icon} NAME)
    1.36 +     file(COPY ${icon} DESTINATION ${icon_path})
    1.37 ++    set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
    1.38 + endforeach()
    1.39 + 
    1.40 + macro(a_icon_convert match replacement input)
    1.41 +-- 
    1.42 +1.7.3.4
    1.43 +