[arch-commits] Commit in avogadro/trunk (3 files)

[Andrea Scarpino]

    Date: Tuesday, November 29, 2011 @ 14:49:27
  Author: andrea
Revision: 143836

We need the workaround here too

Modified:
  avogadro/trunk/PKGBUILD
  avogadro/trunk/fix-boost.patch
  avogadro/trunk/replace-qt4_automoc-with-qt4_wrap_cpp.patch

---------------------------------------------+
 PKGBUILD                                    |    4 ++--
 fix-boost.patch                             |   11 +++++++++++
 replace-qt4_automoc-with-qt4_wrap_cpp.patch |    7 +++----
 3 files changed, 16 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-29 19:09:33 UTC (rev 143835)
+++ PKGBUILD	2011-11-29 19:49:27 UTC (rev 143836)
@@ -17,8 +17,8 @@
         'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
         'fix-boost.patch')
 md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         '1b74d435a058062600bdb22174371fbc'
-         '607ef5f4db5f2a193718f06b2bb295ed')
+         'aec516daab066c15326a9681f8f15abc'
+         '46282e4709429447e44a0a54d51ad2ec')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}

Modified: fix-boost.patch
===================================================================
--- fix-boost.patch	2011-11-29 19:09:33 UTC (rev 143835)
+++ fix-boost.patch	2011-11-29 19:49:27 UTC (rev 143836)
@@ -20,3 +20,14 @@
  
  ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
  SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
+--- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
++++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
+@@ -18,7 +18,7 @@
+   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
+   # We should probably scan the header to verify the Q_OBJECT macro is used
+   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
+-  qt4_wrap_cpp(moc_files ${hdr_list})
++  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
+   # Now sort out the ui and qrc files, process them as appropriate
+   set(ui_plugin_files)
+   set(qrc_plugin_files)

Modified: replace-qt4_automoc-with-qt4_wrap_cpp.patch
===================================================================
--- replace-qt4_automoc-with-qt4_wrap_cpp.patch	2011-11-29 19:09:33 UTC (rev 143835)
+++ replace-qt4_automoc-with-qt4_wrap_cpp.patch	2011-11-29 19:49:27 UTC (rev 143836)
@@ -626,13 +626,12 @@
 -
 -#include "periodictablescene_p.moc"
 diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-04-25 07:22:18.000000000 +0200
+--- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
 +++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
+@@ -69,4 +69,3 @@
  
  } // End namespace Avogadro
--
+ 
 -#include "periodictableview.moc"
 diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
 --- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200