SliTaz Repositories

     1.1 --- a/awesome/receipt	Thu Mar 03 15:08:41 2011 +0100
     1.2 +++ b/awesome/receipt	Thu Mar 03 09:19:12 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="awesome"
     1.7 -VERSION="3.4.8"
     1.8 +VERSION="3.4.9"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="awesome is a highly configurable, next generation framework window manager for X."
    1.11  MAINTAINER="mallory@sweetpeople.org"
    1.12 @@ -16,10 +16,10 @@
    1.13  compile_rules()
    1.14  {
    1.15      cd $src
    1.16 -    #cmake -DCMAKE_INSTALL_PREFIX=/usr -DXDG_CONFIG_DIR=/etc/xdg .
    1.17 +    patch -Np1 -i $stuff/0001-Normalize-icon-path-names-fixes-869.patch
    1.18      make CMAKE_ARGS=" -DPREFIX=/usr -DXDG_CONFIG_DIR=/etc/xdg \
    1.19  	-DCMAKE_BUILD_TYPE=RELEASE" &&
    1.20 -    make DESTDIR=$PWD/_pkg install
    1.21 +    make install
    1.22      
    1.23  }
    1.24  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/awesome/stuff/0001-Normalize-icon-path-names-fixes-869.patch	Thu Mar 03 09:19:12 2011 +0000
     2.3 @@ -0,0 +1,40 @@
     2.4 +From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
     2.5 +From: Thomas Moschny <thomas.moschny@gmx.de>
     2.6 +Date: Mon, 21 Feb 2011 17:58:04 +0100
     2.7 +Subject: [PATCH] Normalize icon path names (fixes #869).
     2.8 +
     2.9 +The elements in ${icon_sources}, as returned by file(GLOB ...) contain
    2.10 +double slashes, could be a bug in cmake. This causes building with
    2.11 +cmake 2.8.4 to fail, due to dependency problems lateron.
    2.12 +
    2.13 +This patch works around the issue by normalizing all path names in
    2.14 +${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
    2.15 +the double slashes.
    2.16 +---
    2.17 + CMakeLists.txt |    3 ++-
    2.18 + 1 files changed, 2 insertions(+), 1 deletions(-)
    2.19 +
    2.20 +diff --git a/CMakeLists.txt b/CMakeLists.txt
    2.21 +index 64be9b9..472bec2 100644
    2.22 +--- a/CMakeLists.txt
    2.23 ++++ b/CMakeLists.txt
    2.24 +@@ -244,14 +244,15 @@ endif()
    2.25 + 
    2.26 + # {{{ Theme icons
    2.27 + file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
    2.28 +-set(ALL_ICONS ${icon_sources})
    2.29 + 
    2.30 + foreach(icon ${icon_sources})
    2.31 +     # Copy all icons to the build dir to simplify the following code.
    2.32 +     # Source paths are interpreted relative to ${SOURCE_DIR}, target paths
    2.33 +     # relative to ${BUILD_DIR}.
    2.34 +     get_filename_component(icon_path ${icon} PATH)
    2.35 ++    get_filename_component(icon_name ${icon} NAME)
    2.36 +     file(COPY ${icon} DESTINATION ${icon_path})
    2.37 ++    set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
    2.38 + endforeach()
    2.39 + 
    2.40 + macro(a_icon_convert match replacement input)
    2.41 +-- 
    2.42 +1.7.3.4
    2.43 +