wok annotate awesome/stuff/0001-Normalize-icon-path-names-fixes-869.patch @ rev 9195
busybox: add conspy fix
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Mar 09 22:01:54 2011 +0100 (2011-03-09) |
| parents | |
| children |
| rev | line source |
|---|---|
| slaxemulator@9000 | 1 From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001 |
| slaxemulator@9000 | 2 From: Thomas Moschny <thomas.moschny@gmx.de> |
| slaxemulator@9000 | 3 Date: Mon, 21 Feb 2011 17:58:04 +0100 |
| slaxemulator@9000 | 4 Subject: [PATCH] Normalize icon path names (fixes #869). |
| slaxemulator@9000 | 5 |
| slaxemulator@9000 | 6 The elements in ${icon_sources}, as returned by file(GLOB ...) contain |
| slaxemulator@9000 | 7 double slashes, could be a bug in cmake. This causes building with |
| slaxemulator@9000 | 8 cmake 2.8.4 to fail, due to dependency problems lateron. |
| slaxemulator@9000 | 9 |
| slaxemulator@9000 | 10 This patch works around the issue by normalizing all path names in |
| slaxemulator@9000 | 11 ${icon_sources} while appending them to ${ALL_ICONS}, thereby removing |
| slaxemulator@9000 | 12 the double slashes. |
| slaxemulator@9000 | 13 --- |
| slaxemulator@9000 | 14 CMakeLists.txt | 3 ++- |
| slaxemulator@9000 | 15 1 files changed, 2 insertions(+), 1 deletions(-) |
| slaxemulator@9000 | 16 |
| slaxemulator@9000 | 17 diff --git a/CMakeLists.txt b/CMakeLists.txt |
| slaxemulator@9000 | 18 index 64be9b9..472bec2 100644 |
| slaxemulator@9000 | 19 --- a/CMakeLists.txt |
| slaxemulator@9000 | 20 +++ b/CMakeLists.txt |
| slaxemulator@9000 | 21 @@ -244,14 +244,15 @@ endif() |
| slaxemulator@9000 | 22 |
| slaxemulator@9000 | 23 # {{{ Theme icons |
| slaxemulator@9000 | 24 file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png) |
| slaxemulator@9000 | 25 -set(ALL_ICONS ${icon_sources}) |
| slaxemulator@9000 | 26 |
| slaxemulator@9000 | 27 foreach(icon ${icon_sources}) |
| slaxemulator@9000 | 28 # Copy all icons to the build dir to simplify the following code. |
| slaxemulator@9000 | 29 # Source paths are interpreted relative to ${SOURCE_DIR}, target paths |
| slaxemulator@9000 | 30 # relative to ${BUILD_DIR}. |
| slaxemulator@9000 | 31 get_filename_component(icon_path ${icon} PATH) |
| slaxemulator@9000 | 32 + get_filename_component(icon_name ${icon} NAME) |
| slaxemulator@9000 | 33 file(COPY ${icon} DESTINATION ${icon_path}) |
| slaxemulator@9000 | 34 + set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}") |
| slaxemulator@9000 | 35 endforeach() |
| slaxemulator@9000 | 36 |
| slaxemulator@9000 | 37 macro(a_icon_convert match replacement input) |
| slaxemulator@9000 | 38 -- |
| slaxemulator@9000 | 39 1.7.3.4 |
| slaxemulator@9000 | 40 |