<!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>[153562] trunk/dports/kde/kdepimlibs4</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/153562">153562</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2016-10-04 06:59:59 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>kdepimlibs4: reinstate internal gpgpme++ from kdepimlibs4 for dependents, removed in <a href="https://trac.macports.org/changeset/153292">r153292</a>. Move headers away to avoid conflict with gpgme</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekdepimlibs4Portfile">trunk/dports/kde/kdepimlibs4/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportskdekdepimlibs4filespatchgpgmediff">trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff</a></li>
<li><a href="#trunkdportskdekdepimlibs4filespatchqgpgmediff">trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff</a></li>
<li><a href="#trunkdportskdekdepimlibs4filespatchtestqgpgmediff">trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekdepimlibs4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kdepimlibs4/Portfile (153561 => 153562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdepimlibs4/Portfile 2016-10-04 13:29:07 UTC (rev 153561)
+++ trunk/dports/kde/kdepimlibs4/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name kdepimlibs4
</span><span class="cx"> version 4.14.3
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers nicos
</span><span class="cx"> license GPL-2+ LGPL-2+ BSD
</span><span class="lines">@@ -41,21 +41,14 @@
</span><span class="cx"> port:gpgme
</span><span class="cx">
</span><span class="cx"> #Suppress build of kioslaves which conflict with openssl
</span><del>-patchfiles-append patch-CMakeLists.diff \
- patch-gpgme.diff \
- patch-qgpgme.diff \
- patch-testqgpgme.diff
</del><ins>+patchfiles-append patch-CMakeLists.diff
</ins><span class="cx">
</span><span class="cx"> configure.args-append -DMAILTRANSPORT_INPROCESS_SMTP=Off
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="cx"> #Deactivating gpgme++ to avoid conflict with gpgme port
</span><del>- reinplace "s|add_subdirectory(gpgme++)|#add_subdirectory(gpgme++)|g" \
- ${worksrcpath}/CMakeLists.txt
- reinplace "s|%PREFIX%|${prefix}/lib|g" \
- ${worksrcpath}/qgpgme/CMakeLists.txt
- reinplace "s|%PREFIX%|${prefix}/lib|g" \
- ${worksrcpath}/qgpgme/tests/CMakeLists.txt
</del><ins>+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/gpgme++/CMakeLists.txt
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-activate {
</span><span class="lines">@@ -66,6 +59,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+post-destroot {
+ #Move headers only in case of main port
+ if {${subport} eq ${name}} {
+ #Move internal gpgme headers out of the way
+ file mkdir ${destroot}${prefix}/include/KDE4
+ move ${destroot}${prefix}/include/gpgme++ \
+ ${destroot}${prefix}/include/KDE4/gpgme++
+ }
+}
+
</ins><span class="cx"> subport kdepimlibs4-kioslaves {
</span><span class="cx">
</span><span class="cx"> #kioslaves components conflict with openssl license
</span></span></pre></div>
<a id="trunkdportskdekdepimlibs4filespatchgpgmediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff (153561 => 153562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff 2016-10-04 13:29:07 UTC (rev 153561)
+++ trunk/dports/kde/kdepimlibs4/files/patch-gpgme.diff 2016-10-04 13:59:59 UTC (rev 153562)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/eventloopinteractor.h ./gpgme++/eventloopinteractor.h
---- ../kdepimlibs-4.14.3-orig/./gpgme++/eventloopinteractor.h 2014-11-05 06:19:27.000000000 +0900
-+++ ./gpgme++/eventloopinteractor.h 2016-09-28 00:32:48.000000000 +0900
-@@ -24,7 +24,7 @@
- #ifndef __GPGMEPP_EVENTLOOPINTERACTOR_H__
- #define __GPGMEPP_EVENTLOOPINTERACTOR_H__
-
--#include <gpgme++/gpgme++_export.h>
-+#include <gpgme++/gpgmepp_export.h>
-
- namespace GpgME {
-
-diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/global.h ./gpgme++/global.h
---- ../kdepimlibs-4.14.3-orig/./gpgme++/global.h 2014-11-05 06:19:27.000000000 +0900
-+++ ./gpgme++/global.h 2016-09-28 00:33:02.000000000 +0900
-@@ -25,7 +25,7 @@
- #define __GPGMEPP_GLOBAL_H__
-
- #include <gpgme++/gpgmefw.h>
--#include <gpgme++/gpgme++_export.h>
-+#include <gpgme++/gpgmepp_export.h>
-
- #include <iosfwd>
-
-diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/interfaces/dataprovider.h ./gpgme++/interfaces/dataprovider.h
---- ../kdepimlibs-4.14.3-orig/./gpgme++/interfaces/dataprovider.h 2014-11-05 06:19:27.000000000 +0900
-+++ ./gpgme++/interfaces/dataprovider.h 2016-09-28 00:30:40.000000000 +0900
-@@ -25,7 +25,7 @@
-
- #include <sys/types.h>
-
--#include <gpgme++/gpgme++_export.h>
-+#include <gpgme++/gpgmepp_export.h>
-
- #include <gpg-error.h>
-
-diff -ur ../kdepimlibs-4.14.3-orig/./gpgme++/verificationresult.h ./gpgme++/verificationresult.h
---- ../kdepimlibs-4.14.3-orig/./gpgme++/verificationresult.h 2014-11-05 06:19:27.000000000 +0900
-+++ ./gpgme++/verificationresult.h 2016-09-28 00:34:27.000000000 +0900
-@@ -25,7 +25,7 @@
-
- #include <gpgme++/gpgmefw.h>
- #include <gpgme++/result.h>
--#include <gpgme++/gpgme++_export.h>
-+#include <gpgme++/gpgmepp_export.h>
-
- #include <time.h>
-
</del></span></pre></div>
<a id="trunkdportskdekdepimlibs4filespatchqgpgmediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff (153561 => 153562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff 2016-10-04 13:29:07 UTC (rev 153561)
+++ trunk/dports/kde/kdepimlibs4/files/patch-qgpgme.diff 2016-10-04 13:59:59 UTC (rev 153562)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- qgpgme/CMakeLists.txt.orig 2016-09-28 23:37:35.000000000 +0900
-+++ qgpgme/CMakeLists.txt 2016-09-29 00:05:38.000000000 +0900
-@@ -44,7 +44,7 @@
- add_library( qgpgme ${LIBRARY_TYPE} ${qgpgme_LIB_SRCS} )
- generate_export_header(qgpgme)
-
-- target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} ${_qgpgme_libgpgme} )
-+ target_link_libraries( qgpgme ${QT_QTCORE_LIBRARY} %PREFIX%/libgpgme-pthread.dylib %PREFIX%/libgpgmepp.dylib )
-
- set_target_properties( qgpgme PROPERTIES
- VERSION ${_qgpgme_version}
</del></span></pre></div>
<a id="trunkdportskdekdepimlibs4filespatchtestqgpgmediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff (153561 => 153562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff 2016-10-04 13:29:07 UTC (rev 153561)
+++ trunk/dports/kde/kdepimlibs4/files/patch-testqgpgme.diff 2016-10-04 13:59:59 UTC (rev 153562)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- qgpgme/tests/CMakeLists.txt.orig 2016-09-29 00:13:50.000000000 +0900
-+++ qgpgme/tests/CMakeLists.txt 2016-09-29 00:15:01.000000000 +0900
-@@ -29,7 +29,7 @@
- if (WIN32) # what's up?
- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} ${_gpgme_vanilla_library} ${_gpg_error_library} ${QT_QTCORE_LIBRARY} )
- else()
-- target_link_libraries( "${_qgpgme_test}" qgpgme ${_qgpgme_libgpgme} gpgme gpg-error ${QT_QTCORE_LIBRARY} )
-+ target_link_libraries( "${_qgpgme_test}" qgpgme %PREFIX%/libgpgme-pthread.dylib %PREFIX%/libgpgmepp.dylib gpgme gpg-error ${QT_QTCORE_LIBRARY} )
- endif()
- endforeach( _qgpgme_test )
-
</del></span></pre>
</div>
</div>
</body>
</html>