Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Mar 2011 20:42:14 +0800 (CST)
From:      Anati Chang <femc7488@gmail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/155152: [PATCH] x11-wm/awesome: fix building error
Message-ID:  <201103011242.p21CgEKb038365@cse.tw>
Resent-Message-ID: <201103011300.p21D0LZd023924@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         155152
>Category:       ports
>Synopsis:       [PATCH] x11-wm/awesome: fix building error
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 01 13:00:20 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Anati Chang
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD cse.tw 8.2-STABLE FreeBSD 8.2-STABLE #15: Sun Feb 27 21:33:50 CST 2011 gaod@cse.tw:/usr/obj/usr/src/sys/CSETW i386


	
>Description:
	fix awesome 3.4.9 build failed
    reference to http://aur.archlinux.org/packages.php?ID=41362
>How-To-Repeat:
    Using attach patch-CMakeLists.txt to replace the origrin one.
>Fix:

	

--- patch-CMakeLists.txt begins here ---
--- CMakeLists.txt.orig	2011-01-17 19:38:13.000000000 +0800
+++ CMakeLists.txt	2011-03-01 19:52:50.000000000 +0800
@@ -274,14 +274,15 @@
 
 # {{{ 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)
@@ -343,7 +344,9 @@
     PATTERN "*.in" EXCLUDE)
 install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
     PATTERN "*.in" EXCLUDE)
-install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
+if(INSTALL_PORTDOCS)
+    install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH})
+endif()
 install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH})
 if(GENERATE_LUADOC)
     install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH})
--- patch-CMakeLists.txt ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103011242.p21CgEKb038365>