Attachment #115847 for bug #157726

View | Details | Raw Unified | Return to bug 157726
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= awesome	8	PORTNAME= awesome
9	PORTVERSION= 3.4.9	9	PORTVERSION= 3.4.10
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= http://awesome.naquadah.org/download/	11	MASTER_SITES= http://awesome.naquadah.org/download/
12		12

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (awesome-3.4.9.tar.bz2) = 144cf9643ca47c2238981f9fe0a1c8ae379ef54a5fb853fd9ac3541a60fc738d	1	SHA256 (awesome-3.4.10.tar.bz2) = 3ed72cf9a63b93290d6ce4dcbbb56cff555cb172868aaac02a64dee995e0c3b0
2	SIZE (awesome-3.4.9.tar.bz2) = 742902	2	SIZE (awesome-3.4.10.tar.bz2) = 747589




--- CMakeLists.txt	2011-05-16 16:35:17.000000000 +0200
+++ CMakeLists.txt.new	2011-06-09 11:40:28.000000000 +0200
@@ -344,7 +344,9 @@
 
 # {{{ 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)

Return to bug 157726

Lines 1-23 Link Here

(-)files/patch-CMakeLists.txt (-20 / +3 lines)
1	--- CMakeLists.txt.orig 2011-01-17 19:38:13.000000000 +0800	1	--- CMakeLists.txt 2011-05-16 16:35:17.000000000 +0200
2	+++ CMakeLists.txt 2011-03-01 19:52:50.000000000 +0800	2	+++ CMakeLists.txt.new 2011-06-09 11:40:28.000000000 +0200
3	@@ -274,14 +274,15 @@	3	@@ -344,7 +344,9 @@
4
5	# {{{ Theme icons
6	file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes//titlebar/.png)
7	-set(ALL_ICONS ${icon_sources})
8
9	foreach(icon ${icon_sources})
10	# Copy all icons to the build dir to simplify the following code.
11	# Source paths are interpreted relative to ${SOURCE_DIR}, target paths
12	# relative to ${BUILD_DIR}.
13	get_filename_component(icon_path ${icon} PATH)
14	+ get_filename_component(icon_name ${icon} NAME)
15	file(COPY ${icon} DESTINATION ${icon_path})
16	+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
17	endforeach()
18
19	macro(a_icon_convert match replacement input)
20	@@ -343,7 +344,9 @@
21	PATTERN "*.in" EXCLUDE)	4	PATTERN "*.in" EXCLUDE)
22	install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}	5	install(DIRECTORY ${SOURCE_DIR}/themes DESTINATION ${AWESOME_DATA_PATH}
23	PATTERN "*.in" EXCLUDE)	6	PATTERN "*.in" EXCLUDE)