<!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>[135456] trunk/dports/kde/kmymoney4-devel</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/135456">135456</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2015-04-23 14:48:44 -0700 (Thu, 23 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>kmymoney4-devel: reintroduce patches against meinproc4 crash (see issue #47496)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekmymoney4develPortfile">trunk/dports/kde/kmymoney4-devel/Portfile</a></li>
<li><a href="#trunkdportskdekmymoney4develfilespatchCMakeLists_remove_APIDOCtxtdiff">trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff</a></li>
<li><a href="#trunkdportskdekmymoney4develfilespatch_remove_manpagediff">trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekmymoney4develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kmymoney4-devel/Portfile (135455 => 135456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kmymoney4-devel/Portfile 2015-04-23 21:47:35 UTC (rev 135455)
+++ trunk/dports/kde/kmymoney4-devel/Portfile 2015-04-23 21:48:44 UTC (rev 135456)
</span><span class="lines">@@ -43,6 +43,10 @@
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-mainRaster.diff
</span><span class="cx">
</span><ins>+if {![variant_isset docs]} {
+ patchfiles-append patch_remove_manpage.diff patch-CMakeLists_remove_APIDOC.txt.diff
+}
+
</ins><span class="cx"> configure.args-append -DENABLE_KBANKING=ON \
</span><span class="cx"> -DKDE4_BUILD_TESTS=OFF
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportskdekmymoney4develfilespatchCMakeLists_remove_APIDOCtxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff (135455 => 135456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff 2015-04-23 21:47:35 UTC (rev 135455)
+++ trunk/dports/kde/kmymoney4-devel/files/patch-CMakeLists_remove_APIDOC.txt.diff 2015-04-23 21:48:44 UTC (rev 135456)
</span><span class="lines">@@ -1,22 +1,30 @@
</span><del>-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6e20c3f..b7f2c4f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
</del><ins>+--- kmymoney/CMakeLists.txt 2015-04-23 23:31:22.000000000 +0200
++++ kmymoney/CMakeLists.txt.new 2015-04-23 23:40:20.000000000 +0200
+@@ -91,18 +91,6 @@
</ins><span class="cx">
</span><del>- # check for Doxygen
- FIND_PACKAGE(Doxygen)
--IF(DOXYGEN_FOUND)
-+IF( FALSE )
- SET(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
</del><ins>+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
</ins><span class="cx">
</span><del>- MAKE_DIRECTORY(${APIDOC_DIR})
-@@ -105,7 +105,7 @@ IF(DOXYGEN_FOUND)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
-
- ADD_CUSTOM_TARGET(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
--ENDIF(DOXYGEN_FOUND)
-+ENDIF( FALSE )
-
- FIND_PACKAGE(GMP REQUIRED)
- SET(LIBALKIMIA_MIN_VERSION 4.3.2)
</del><ins>+-# check for Doxygen
+-find_package(Doxygen)
+-if(DOXYGEN_FOUND)
+- set(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
+-
+- make_directory(${APIDOC_DIR})
+-
+- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen IMMEDIATE)
+-
+- add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
+-endif(DOXYGEN_FOUND)
+-
+ find_package(LibAlkimia 4.3.2 REQUIRED)
+ #TODO: remove when LibAlkimia minimum version will be raised
+ if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
+@@ -295,7 +283,7 @@
+ add_subdirectory( libkdchart )
+ add_subdirectory( tools )
+ add_subdirectory( kmymoney )
+-add_subdirectory( doc )
++#add_subdirectory( doc )
+ if (USE_DEVELOPER_DOC)
+ add_subdirectory( developer-doc )
+ endif (USE_DEVELOPER_DOC)
</ins></span></pre></div>
<a id="trunkdportskdekmymoney4develfilespatch_remove_manpagediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff (135455 => 135456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff 2015-04-23 21:47:35 UTC (rev 135455)
+++ trunk/dports/kde/kmymoney4-devel/files/patch_remove_manpage.diff 2015-04-23 21:48:44 UTC (rev 135456)
</span><span class="lines">@@ -2,8 +2,8 @@
</span><span class="cx"> --- kmymoney/doc/CMakeLists.txt.new Thu Jan 19 23:05:05 2012
</span><span class="cx"> ***************
</span><span class="cx"> *** 1,2 ****
</span><del>-! KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
-! KDE4_CREATE_MANPAGE(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
</del><ins>+! kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
+! kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
</ins><span class="cx"> --- 1,2 ----
</span><del>-! #KDE4_CREATE_HANDBOOK(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
-! #KDE4_CREATE_MANPAGE(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
</del><ins>+! #kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney)
+! #kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
</ins></span></pre>
</div>
</div>
</body>
</html>