Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (401c0b732ba241bc2a87a9a9b02c0a8314800c0a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (401c0b732ba241bc2a87a9a9b02c0a8314800c0a)
  • Date: Wed, 23 Mar 2011 15:15:38 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

windowmanagers/awesome/HISTORY | 4 ++
windowmanagers/awesome/PRE_BUILD | 1
windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch | 23
+++++++++++++++++
3 files changed, 28 insertions(+)

New commits:
commit 84232a309f88b9f2a019486d1989aee5bc6ee0fc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/awesome: added missing file

commit 5ffa330bd3a6110a65a7e8d6042449c0a4cc3efb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

windowmanagers/awesome: fixed build with cmake 2.8.4

diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 2f0fe72..9c11c2c 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,7 @@
+2011-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, awesome-3.4.8-cmake-2.8.4.patch: added patch from
+ gentoo to fix build with cmake 2.8.4
+
2011-01-18 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 3.4.9

diff --git a/windowmanagers/awesome/PRE_BUILD
b/windowmanagers/awesome/PRE_BUILD
index d1d3345..75abd2d 100755
--- a/windowmanagers/awesome/PRE_BUILD
+++ b/windowmanagers/awesome/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SCRIPT_DIRECTORY/awesome-3.4.8-cmake-2.8.4.patch &&
sedit 's:Exec=awesome:Exec=startawesome:' awesome.desktop
diff --git a/windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch
b/windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch
new file mode 100644
index 0000000..bfa7ab0
--- /dev/null
+++ b/windowmanagers/awesome/awesome-3.4.8-cmake-2.8.4.patch
@@ -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)



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (401c0b732ba241bc2a87a9a9b02c0a8314800c0a), Florian Franzmann, 03/23/2011

Archive powered by MHonArc 2.6.24.

Top of Page