<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[126425] trunk/dports/devel/akonadi</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/126425">126425</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-10-09 18:31:30 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>akonadi: fix build on older systems without full C11++ support</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelakonadiPortfile">trunk/dports/devel/akonadi/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelakonadifilespatchtestsdiff">trunk/dports/devel/akonadi/files/patch-tests.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelakonadiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/akonadi/Portfile (126424 => 126425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/akonadi/Portfile 2014-10-09 23:35:26 UTC (rev 126424)
+++ trunk/dports/devel/akonadi/Portfile 2014-10-10 01:31:30 UTC (rev 126425)
</span><span class="lines">@@ -187,11 +187,18 @@
</span><span class="cx"> reinplace "s|/Applications|${applications_dir}|" ${worksrcpath}/CMakeLists.txt
</span><span class="cx"> }
</span><span class="cx">
</span><del>-platform darwin 9 {
- if {[info exists universal_target] && ${universal_target} == "10.4"} {
-# Needed if compiling for 10.4 universal on 10.5
- post-configure {
- reinplace "s|#define HAVE_EXECINFO_H 1||" ${workpath}/build/config-akonadi.h
</del><ins>+platform darwin {
+ if {${os.major} < 13} {
+ #Deactivate tests for 10.8 and lower, as they require full C++11 support (ticket #45300)
+ patchfiles-append patch-tests.diff
+ configure.args-append -DAKONADI_BUILD_TESTS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF
+ }
+ if {${os.major} == 9} {
+ if {[info exists universal_target] && ${universal_target} == "10.4"} {
+ # Needed if compiling for 10.4 universal on 10.5
+ post-configure {
+ reinplace "s|#define HAVE_EXECINFO_H 1||" ${workpath}/build/config-akonadi.h
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsdevelakonadifilespatchtestsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/akonadi/files/patch-tests.diff (0 => 126425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/akonadi/files/patch-tests.diff (rev 0)
+++ trunk/dports/devel/akonadi/files/patch-tests.diff 2014-10-10 01:31:30 UTC (rev 126425)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+--- server/CMakeLists.txt.orig 2014-08-10 19:38:58.000000000 +0900
++++ server/CMakeLists.txt 2014-10-10 10:24:15.000000000 +0900
+@@ -27,7 +27,9 @@
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/handler)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/nepomuk)
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests)
++if(AKONADI_BUILD_TESTS AND BUILD_TESTING)
++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tests)
++endif(AKONADI_BUILD_TESTS AND BUILD_TESTING)
+ include_directories(${Akonadi_SOURCE_DIR}/shared)
+ if(Soprano_FOUND)
+ include_directories(${SOPRANO_INCLUDE_DIR})
+@@ -64,7 +66,9 @@
+ add_subdirectory(akonadictl)
+ add_subdirectory(control)
+ add_subdirectory(src)
+-add_subdirectory(tests)
++if(AKONADI_BUILD_TESTS AND BUILD_TESTING)
++ add_subdirectory(tests)
++endif(AKONADI_BUILD_TESTS AND BUILD_TESTING)
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}")
+ if(MYSQLD_EXECUTABLE)
</ins></span></pre>
</div>
</div>
</body>
</html>