[134191] trunk/dports/science/gerbil

cal at macports.org cal at macports.org
Thu Mar 19 16:25:30 PDT 2015


Revision: 134191
          https://trac.macports.org/changeset/134191
Author:   cal at macports.org
Date:     2015-03-19 16:25:30 -0700 (Thu, 19 Mar 2015)
Log Message:
-----------
gerbil: use cmake.out_of_source yes, #47197, fix build with modern boost

Modified Paths:
--------------
    trunk/dports/science/gerbil/Portfile

Added Paths:
-----------
    trunk/dports/science/gerbil/files/patch-fix-moc-run-with-modern-boost.diff

Modified: trunk/dports/science/gerbil/Portfile
===================================================================
--- trunk/dports/science/gerbil/Portfile	2015-03-19 22:54:02 UTC (rev 134190)
+++ trunk/dports/science/gerbil/Portfile	2015-03-19 23:25:30 UTC (rev 134191)
@@ -29,7 +29,8 @@
 
 patchfiles          \
     patch-gui__model__representation.cpp-include-necessary-header.diff \
-    patch-lsb__lsbhreader.cpp-missing-include.diff
+    patch-lsb__lsbhreader.cpp-missing-include.diff \
+    patch-fix-moc-run-with-modern-boost.diff
 
 livecheck.type      regex
 livecheck.url       ${master_sites}
@@ -41,15 +42,17 @@
                     port:gdal \
                     port:tbb
 
-configure.post_args -DOpenCV_DIR="${prefix}/lib/cmake" \
+cmake.out_of_source yes
+configure.args-append \
+                    -DOpenCV_DIR="${prefix}/lib/cmake" \
                     -DCMAKE_BUILD_TYPE=Release \
-                    -DBoost_DIR="${prefix}" \
+                    -DBoost_DIR="${prefix}"
 
 # the gerbil makefiles do not provide an install target
 destroot {
     # install binaries
-    xinstall -m 755 "${worksrcpath}/bin/gerbil" "${destroot}${prefix}/bin/"
-    xinstall -m 755 "${worksrcpath}/bin/qgerbil" "${destroot}${prefix}/bin/"
+    xinstall -m 755 "${build.dir}/bin/gerbil" "${destroot}${prefix}/bin/"
+    xinstall -m 755 "${build.dir}/bin/qgerbil" "${destroot}${prefix}/bin/"
 
     # create directories for shared files
     xinstall -d -m 755 "${destroot}${prefix}/share/doc/${name}"

Added: trunk/dports/science/gerbil/files/patch-fix-moc-run-with-modern-boost.diff
===================================================================
--- trunk/dports/science/gerbil/files/patch-fix-moc-run-with-modern-boost.diff	                        (rev 0)
+++ trunk/dports/science/gerbil/files/patch-fix-moc-run-with-modern-boost.diff	2015-03-19 23:25:30 UTC (rev 134191)
@@ -0,0 +1,36 @@
+--- core/vole_config.h.orig	2015-03-19 23:58:24.000000000 +0100
++++ core/vole_config.h	2015-03-19 23:59:03.000000000 +0100
+@@ -12,7 +12,9 @@
+ 
+ #ifdef WITH_BOOST_PROGRAM_OPTIONS
+ #include <boost/version.hpp>
++#ifndef Q_MOC_RUN /* https://bugreports.qt.io/browse/QTBUG-22829 */
+ #include <boost/program_options.hpp>
++#endif
+ #endif // WITH_BOOST_PROGRAM_OPTIONS
+ 
+ #include "hashes.h"
+--- ./shell/command.h.orig	2015-03-19 23:59:33.000000000 +0100
++++ ./shell/command.h	2015-03-19 23:59:57.000000000 +0100
+@@ -3,7 +3,9 @@
+ 
+ #include <vector>
+ #include <iostream>
++#ifndef Q_MOC_RUN /* https://bugreports.qt.io/browse/QTBUG-22829 */
+ #include <boost/program_options.hpp>
++#endif
+ #include "vole_config.h"
+ #include "progress_observer.h"
+ 
+--- gui/controller/controller.h.orig	2015-03-20 00:11:28.000000000 +0100
++++ gui/controller/controller.h	2015-03-20 00:12:07.000000000 +0100
+@@ -6,7 +6,9 @@
+ 
+ #include <QObject>
+ #include <QMap>
++#ifndef Q_MOC_RUN /* https://bugreports.qt.io/browse/QTBUG-22829 */
+ #include <boost/thread.hpp>
++#endif
+ 
+ class DockController;
+ class DistViewController;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150319/68832b9c/attachment.html>


More information about the macports-changes mailing list