[104404] trunk/dports/science/openscad

landonf at macports.org landonf at macports.org
Sun Mar 24 16:22:35 PDT 2013


Revision: 104404
          https://trac.macports.org/changeset/104404
Author:   landonf at macports.org
Date:     2013-03-24 16:22:35 -0700 (Sun, 24 Mar 2013)
Log Message:
-----------
Pull in work-around for QTBUG-22829 from upstream openscad repository. This works around a build incompatibility between qt4 and boost.

See also:
  https://github.com/openscad/openscad/commit/660301589762048cd33ff54b9b1ea586be8062f2#L0R2 
  https://bugreports.qt-project.org/browse/QTBUG-22829

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

Added Paths:
-----------
    trunk/dports/science/openscad/files/
    trunk/dports/science/openscad/files/patch-qtbug-22829

Modified: trunk/dports/science/openscad/Portfile
===================================================================
--- trunk/dports/science/openscad/Portfile	2013-03-24 21:18:48 UTC (rev 104403)
+++ trunk/dports/science/openscad/Portfile	2013-03-24 23:22:35 UTC (rev 104404)
@@ -51,6 +51,8 @@
                     port:mpfr \
                     port:OpenCSG
 
+patchfiles          patch-qtbug-22829
+
 configure.env       OPENSCAD_LIBRARIES=${prefix}
 configure.cmd       ${qt_qmake_cmd}
 configure.pre_args

Added: trunk/dports/science/openscad/files/patch-qtbug-22829
===================================================================
--- trunk/dports/science/openscad/files/patch-qtbug-22829	                        (rev 0)
+++ trunk/dports/science/openscad/files/patch-qtbug-22829	2013-03-24 23:22:35 UTC (rev 104404)
@@ -0,0 +1,17 @@
+diff --git a/src/value.h b/src/value.h
+index 24fbf49..0445ff4 100644
+--- src/value.h
++++ src/value.h
+@@ -3,8 +3,12 @@
+ 
+ #include <vector>
+ #include <string>
++
++// Workaround for https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/variant.hpp>
+ #include <boost/lexical_cast.hpp>
++#endif
+ 
+ class QuotedString : public std::string
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130324/4dfcc09b/attachment.html>


More information about the macports-changes mailing list