Permalink
Browse files

awesome: fix compilation with cmake 2.8.4

  • Loading branch information...
1 parent 77a2b44 commit ca7292944dd680f10e2eff3a05ee0dea50a70c1e @wired committed Feb 22, 2011
View
@@ -3,9 +3,10 @@ AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080
AUX awesome-3.4.3-net-current-desktop-ooo.patch 695 RMD160 e5cc2573bce8022db8c9b9c0d7565b95892bbe44 SHA1 b7d38d59b6256cd7675840ae0b6584fc81cbd3f1 SHA256 401e3143d0f3619c0595642b0d2c1cee7d730c2e03aabf9f6aee320f2ac22917
AUX awesome-3.4.3-qt-xinerama-fix.patch 850 RMD160 e344db4fb9b88a1ec26f647bf7f31f5366094c16 SHA1 47b1b42abf0dbcad0990232326242c554e37ab10 SHA256 e41183e4a45aa05de4f67da45dbdf1eabf7adf0629096f7db5b7d28f148a9c78
AUX awesome-3.4.7-fix-multiscreen-window-placement.patch 1012 RMD160 92086374c413afdc125c6dbac082bbbfe5147c9d SHA1 ea6455383c469ac175d37f8ce4866e5516488897 SHA256 45f8d40bf4ae08ccd436527e2fe458f882c6e3b350c6c1afbb4eaa25c159c883
+AUX awesome-3.4.8-cmake-2.8.4.patch 878 RMD160 1793b87bc558377e8d117f104cd830c7b38b95e2 SHA1 95a5b453d5c11dee3dff058b81f9500c7362eb92 SHA256 6f4f3fc953739d5437cd4258f664677aef882acf873894c5300f6b35feff708d
AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
DIST awesome-3.4.9.tar.bz2 742902 RMD160 ab6cb81f9c44ca2d3ef863d37683930a21fb9c58 SHA1 8fba4bf2e272c21cf9d7f5f2269932a967fa733c SHA256 144cf9643ca47c2238981f9fe0a1c8ae379ef54a5fb853fd9ac3541a60fc738d
-EBUILD awesome-3.4.9.ebuild 2743 RMD160 c55c12b554d336e6937ec682ff8b561473700f42 SHA1 74155c6bb1f9a41ad3b0e2e486fef148d93f8f6b SHA256 cac5bbcfbb13f9f8602473f1cd9cc7e5a73368b4e764ec7e3bcb8a661ef504cc
+EBUILD awesome-3.4.9.ebuild 2795 RMD160 49cc75955d9e2c4bfabf66c41352a9013ec1a25f SHA1 3bd6a6190208693fd239fb1cbb87a8021ff0a85b SHA256 ae392e0bacda764da12ef50c112d29d349744be2c54cdacaf5b842a1a288f120
EBUILD awesome-9999.ebuild 2616 RMD160 f37098638ff7a48d5e374a6b29a0bbd6b8098902 SHA1 777e3730352f3b9b411a1aa4c91c2c9cb6990ffd SHA256 a1679cf4cfd4601a2c7363732c20f34a1b833b6cfcd27a78d39af10717228802
MISC metadata.xml 255 RMD160 55d76cb4c854b53723cb2e447f289f5c661dc389 SHA1 5a237e00dc1c7c8a2b4c565c3884b060b805927f SHA256 ad624d5a908e1afc5bbe5ae20dc33b31f218a6c648fc960e149d6d1aa0c4c9bd
@@ -71,6 +71,7 @@ DOCS="AUTHORS BUGS PATCHES README STYLE"
src_prepare() {
epatch "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
+ epatch "${FILESDIR}/${PN}-3.4.8-cmake-2.8.4.patch"
# kill handling of NET_CURRENT_DESKTOP
# temp fix for openoffice bug #109550
@@ -0,0 +1,23 @@
+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)

0 comments on commit ca72929

Please sign in to comment.