[gentoo-commits] gentoo-x86 commit in x11-wm/awesome/files: awesome-3.4.4-cmake-2.8.4.patch awesome-3.4.8-cmake-2.8.4.patch

[Alex Alexander (wired)]

wired       11/02/22 14:10:46

  Added:                awesome-3.4.4-cmake-2.8.4.patch
                        awesome-3.4.8-cmake-2.8.4.patch
  Log:
  fixed compilation with cmake-2.8.4, bug #356009
  
  (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-wm/awesome/files/awesome-3.4.4-cmake-2.8.4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/files/awesome-3.4.4-cmake-2.8.4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/files/awesome-3.4.4-cmake-2.8.4.patch?rev=1.1&content-type=text/plain

Index: awesome-3.4.4-cmake-2.8.4.patch
===================================================================
fix compilation with cmake 2.8.4 by backporting some changes from 3.8.9 and applying
	https://awesome.naquadah.org/bugs/index.php?do=details&task_id=869

https://bugs.gentoo.org/show_bug.cgi?id=356009
--- awesome-3.4.4-orig/CMakeLists.txt	2011-02-22 15:26:17.380000002 +0200
+++ CMakeLists.txt	2011-02-22 16:03:40.219000002 +0200
@@ -249,22 +249,24 @@
 # }}}
 
 # {{{ Theme icons
-file(GLOB icon_sources ${SOURCE_DIR}/themes/*/titlebar/*.png)
-set(ALL_ICONS ${icon_sources})
+file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
+
+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)
     string(REPLACE ${match} ${replacement} output ${input})
 
     if(NOT ${input} STREQUAL ${output})
-        if(NOT ${output} MATCHES ${BUILD_DIR})
-            string(REPLACE ${SOURCE_DIR} ${BUILD_DIR} output ${output})
-        endif()
-
         set(ALL_ICONS ${ALL_ICONS} ${output})
 
-        get_filename_component(output_path ${output} PATH)
-        file(MAKE_DIRECTORY ${output_path})
-
         add_custom_command(
             COMMAND ${CONVERT_EXECUTABLE} ${input} ${ARGN} ${output}
             OUTPUT  ${output}



1.1                  x11-wm/awesome/files/awesome-3.4.8-cmake-2.8.4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/files/awesome-3.4.8-cmake-2.8.4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/files/awesome-3.4.8-cmake-2.8.4.patch?rev=1.1&content-type=text/plain

Index: awesome-3.4.8-cmake-2.8.4.patch
===================================================================
fix compilation with cmake 2.8.4

https://awesome.naquadah.org/bugs/index.php?do=details&task_id=869
https://bugs.gentoo.org/show_bug.cgi?id=356009
--- awesome-3.4.9/CMakeLists.txt.orig
+++ awesome-3.4.9/CMakeLists.txt
@@ -274,14 +274,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)