[Lunar-commits] <moonbase-kde> Merge pull request #52 from v4hn/kdepim-moc

[Dennis Veatch]

commit edf217eb146db6c639bc04cb65db7701faba300a
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 14 Nov 2014 14:42:53 -0500
URL: https://github.com/lunar-linux/moonbase-kde/commit/edf217eb146db6c639bc04cb65db7701faba300a

Merge pull request #52 from v4hn/kdepim-moc

kdepim: fix qt4's moc with kdepim
---
  office/kdepim/BUILD     | +0/-3     
  office/kdepim/PRE_BUILD | +4/-0     
  2 files changed, 4 insertions(+), 3 deletions(-)

--- a/office/kdepim/BUILD
+++ b/office/kdepim/BUILD
@@ -1,8 +1,5 @@
-(
 
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
   default_cmake_build
-  
-) > $C_FIFO 2>&1
--- /dev/null
+++ b/office/kdepim/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+
+# qt4's moc chokes on BOOST_JOIN
+grep -l -r "#include <boost/.*>" | xargs sed -i "s at .*include <boost/.*>.*@#ifndef Q_MOC_RUN\n\0\n#endif@"