3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #88 from cpages/master

awesome: update to 3.4.13
This commit is contained in:
viric 2012-08-06 08:59:32 -07:00
commit 0eb1b30947
2 changed files with 4 additions and 54 deletions

View file

@ -1,40 +0,0 @@
From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thomas.moschny@gmx.de>
Date: Mon, 21 Feb 2011 17:58:04 +0100
Subject: [PATCH] Normalize icon path names (fixes #869).
The elements in ${icon_sources}, as returned by file(GLOB ...) contain
double slashes, could be a bug in cmake. This causes building with
cmake 2.8.4 to fail, due to dependency problems lateron.
This patch works around the issue by normalizing all path names in
${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
the double slashes.
---
CMakeLists.txt | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64be9b9..472bec2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,14 +244,15 @@ endif()
# {{{ Theme icons
file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
-set(ALL_ICONS ${icon_sources})
foreach(icon ${icon_sources})
# Copy all icons to the build dir to simplify the following code.
# Source paths are interpreted relative to ${SOURCE_DIR}, target paths
# relative to ${BUILD_DIR}.
get_filename_component(icon_path ${icon} PATH)
+ get_filename_component(icon_name ${icon} NAME)
file(COPY ${icon} DESTINATION ${icon_path})
+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
endforeach()
macro(a_icon_convert match replacement input)
--
1.7.3.4

View file

@ -6,7 +6,7 @@
, docbook_xml_dtd_45, libxslt, coreutils}:
let
version = "3.4.11";
version = "3.4.13";
in
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
sha256 = "576b4f6d2c3f56dfbe52ad92f2eecece111f0f05816e32126cd03d4b4387761d";
sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr";
};
buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango
@ -36,19 +36,9 @@ stdenv.mkDerivation rec {
# asciidoc: FAILED: <stdin>: line 3: section title expected
# make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1
substituteInPlace CMakeLists.txt \
--replace "set(AWE_MAN_LANGS es fr de ru)" \
"set(AWE_MAN_LANGS es fr de)"
--replace "set(AWE_MAN_LANGS it es fr de ru)" \
"set(AWE_MAN_LANGS it es fr de)"
'';
# XXX: maybe not needed anymore
# Somehow libev does not get into the rpath, although it should.
# Something may be wrong in the gcc wrapper.
preBuild = ''
export NIX_LDFLAGS_BEFORE="-lev";
'';
# Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error.
cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ];
meta = {
homepage = http://awesome.naquadah.org/;