<!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>[153563] trunk/dports/kde</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/153563">153563</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2016-10-04 07:06:21 -0700 (Tue, 04 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>kde4-runtime, kdepim4, kget: fix compilation after change in kdepimlibs4 in <a href="https://trac.macports.org/changeset/153162">r153162</a> (ticket #52481)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4runtimePortfile">trunk/dports/kde/kde4-runtime/Portfile</a></li>
<li><a href="#trunkdportskdekdepim4Portfile">trunk/dports/kde/kdepim4/Portfile</a></li>
<li><a href="#trunkdportskdekgetPortfile">trunk/dports/kde/kget/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4runtimefilespatchgpgmediff">trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff</a></li>
<li><a href="#trunkdportskdekdepim4filespatchinternalgpgmediff">trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff</a></li>
<li><a href="#trunkdportskdekgetfilespatchgpgmediff">trunk/dports/kde/kget/files/patch-gpgme.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekde4runtimePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kde4-runtime/Portfile (153562 => 153563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-runtime/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
+++ trunk/dports/kde/kde4-runtime/Portfile 2016-10-04 14:06:21 UTC (rev 153563)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">
</span><span class="cx"> name kde4-runtime
</span><span class="cx"> version 4.14.4.20150225
</span><del>-revision 5
</del><ins>+revision 6
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers nicos
</span><span class="cx"> license GPL-2+ LGPL-2.1+
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx">
</span><span class="cx"> patchfiles patch-support-for-lldb.diff \
</span><span class="cx"> patch-make-kioexec-agent.diff \
</span><del>- patch-phonon-cmakelists.diff
</del><ins>+ patch-phonon-cmakelists.diff \
+ patch-gpgme.diff
</ins><span class="cx">
</span><span class="cx"> #Blacklist gcc42 and llvm-gcc-42 (does not build with gcc, ticket #37574)
</span><span class="cx"> compiler.blacklist gcc-4.2 apple-gcc-4.2 llvm-gcc-4.2 macports-llvm-gcc-4.2
</span><span class="lines">@@ -71,6 +72,11 @@
</span><span class="cx"> -DKDEBASE_DISABLE_MULTIMEDIA=OFF \
</span><span class="cx"> -DKDERUNTIME_BUILD_NEPOMUK=ON
</span><span class="cx">
</span><ins>+pre-configure {
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/kwalletd/CMakeLists.txt
+}
+
</ins><span class="cx"> variant xine description "Enable xine support" {
</span><span class="cx"> # Unsupported. Don't report bugs, unless it comes with a patch :-)
</span><span class="cx"> depends_lib-append port:xine-lib
</span></span></pre></div>
<a id="trunkdportskdekde4runtimefilespatchgpgmediff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff (0 => 153563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff (rev 0)
+++ trunk/dports/kde/kde4-runtime/files/patch-gpgme.diff 2016-10-04 14:06:21 UTC (rev 153563)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- kwalletd/CMakeLists.txt.orig 2016-10-03 22:09:25.000000000 +0900
++++ kwalletd/CMakeLists.txt 2016-10-03 22:13:23.000000000 +0900
+@@ -7,6 +7,8 @@
+
+ if (GPGME_FOUND AND QGPGME_FOUND)
+ add_definitions(-DHAVE_QGPGME)
++ #Force include directory
++ set(GPGME_INCLUDES "%PREFIX%/include/kde4")
+ include_directories(${GPGME_INCLUDES} ${QGPGME_INCLUDE_DIR})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ endif(GPGME_FOUND AND QGPGME_FOUND)
</ins></span></pre></div>
<a id="trunkdportskdekdepim4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kdepim4/Portfile (153562 => 153563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdepim4/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
+++ trunk/dports/kde/kdepim4/Portfile 2016-10-04 14:06:21 UTC (rev 153563)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">
</span><span class="cx"> name kdepim4
</span><span class="cx"> version 4.14.3
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers intevation.de:bjoern.ricks nicos
</span><span class="cx"> license GPL-2+ LGPL-2+
</span><span class="lines">@@ -40,10 +40,21 @@
</span><span class="cx"> #emulate-addTitle: Preventing menu crash in kmail (https://trac.macports.org/ticket/44798)
</span><span class="cx"> patchfiles-append patch-ktimetracker.diff \
</span><span class="cx"> patch-emulate-addTitle.diff \
</span><del>- patch-CMakeLists-disableKleo.diff
</del><ins>+ patch-CMakeLists-disableKleo.diff \
+ patch-internal-gpgme.diff
+
</ins><span class="cx"> #Disabling kleopatra which does not build with boost >= 1.57.
</span><span class="cx"> #See https://bugs.kde.org/show_bug.cgi?id=341355
</span><span class="cx">
</span><ins>+pre-configure {
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/libkleo/CMakeLists.txt
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/kaddressbook/CMakeLists.txt
+ reinplace "s|%PREFIX%|${prefix}|g" \
+ ${worksrcpath}/messagecomposer/CMakeLists.txt
+}
+
</ins><span class="cx"> if {![variant_isset docs]} {
</span><span class="cx"> depends_lib-delete port:dblatex
</span><span class="cx"> patchfiles-append patch-CMakeLists.diff
</span></span></pre></div>
<a id="trunkdportskdekdepim4filespatchinternalgpgmediff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff (0 => 153563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff (rev 0)
+++ trunk/dports/kde/kdepim4/files/patch-internal-gpgme.diff 2016-10-04 14:06:21 UTC (rev 153563)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+Only in ../kdepim-4.14.3-orig/kaddressbook: .DS_Store
+diff -ur ../kdepim-4.14.3-orig/kaddressbook/CMakeLists.txt ./kaddressbook/CMakeLists.txt
+--- ../kdepim-4.14.3-orig/kaddressbook/CMakeLists.txt 2016-10-04 00:15:35.000000000 +0900
++++ ./kaddressbook/CMakeLists.txt 2016-10-04 00:15:53.000000000 +0900
+@@ -29,6 +29,7 @@
+ add_subdirectory(printing)
+ add_subdirectory(tests)
+ if(QGPGME_FOUND)
++ include_directories( %PREFIX%/include/KDE4 )
+ add_definitions(-DQGPGME_FOUND)
+ endif()
+
+Only in ../kdepim-4.14.3-orig/libkleo: .DS_Store
+diff -ur ../kdepim-4.14.3-orig/libkleo/CMakeLists.txt ./libkleo/CMakeLists.txt
+--- ../kdepim-4.14.3-orig/libkleo/CMakeLists.txt 2016-10-03 23:59:04.000000000 +0900
++++ ./libkleo/CMakeLists.txt 2016-10-03 23:59:57.000000000 +0900
+@@ -1,4 +1,4 @@
+-include_directories( ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
++include_directories( %PREFIX%/include/KDE4 ${Boost_INCLUDE_DIR} )
+ KDE4_NO_ENABLE_FINAL(libkleo)
+ if (KDEPIM_ONLY_KLEO)
+ add_definitions( -DKDEPIM_ONLY_KLEO )
+Only in ../kdepim-4.14.3-orig/messagecomposer: .DS_Store
+diff -ur ../kdepim-4.14.3-orig/messagecomposer/CMakeLists.txt ./messagecomposer/CMakeLists.txt
+--- ../kdepim-4.14.3-orig/messagecomposer/CMakeLists.txt 2016-10-04 00:27:43.000000000 +0900
++++ ./messagecomposer/CMakeLists.txt 2016-10-04 00:28:47.000000000 +0900
+@@ -109,6 +109,7 @@
+ settings/messagecomposersettings_base.kcfgc
+ )
+
++include_directories( %PREFIX%/include/KDE4 )
+ kde4_add_library( messagecomposer ${LIBRARY_TYPE} ${messagecomposer_src} )
+ target_link_libraries( messagecomposer ${KDE4_KIO_LIBS} ${KDEPIMLIBS_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_KMIME_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
+ messagecore messageviewer templateparser kleo kdepim ${QGPGME_LIBRARIES} ${Grantlee_GUI_LIBRARIES} sendlater pimcommon)
</ins></span></pre></div>
<a id="trunkdportskdekgetPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kget/Portfile (153562 => 153563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kget/Portfile 2016-10-04 13:59:59 UTC (rev 153562)
+++ trunk/dports/kde/kget/Portfile 2016-10-04 14:06:21 UTC (rev 153563)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name kget
</span><span class="cx"> version 4.14.3
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> license GPL-2+ LGPL-2+
</span><span class="cx"> maintainers nicos openmaintainer
</span><span class="lines">@@ -40,10 +40,16 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append -DWITH_KDE4Workspace=OFF
</span><span class="cx">
</span><ins>+patchfiles-append patch-gpgme.diff
+
</ins><span class="cx"> if {![variant_isset docs]} {
</span><del>- patchfiles patch-CMakeLists.diff
</del><ins>+ patchfiles-append patch-CMakeLists.diff
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+pre-configure {
+ reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/CMakeLists.txt
+}
+
</ins><span class="cx"> pre-activate {
</span><span class="cx"> #Deactivate hack for when kdenetwork4 port has been fragmented into small ports
</span><span class="cx"> if {[file exists ${prefix}/lib/kde4/sambausershareplugin.so]
</span></span></pre></div>
<a id="trunkdportskdekgetfilespatchgpgmediff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kget/files/patch-gpgme.diff (0 => 153563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kget/files/patch-gpgme.diff (rev 0)
+++ trunk/dports/kde/kget/files/patch-gpgme.diff 2016-10-04 14:06:21 UTC (rev 153563)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- CMakeLists.txt.orig 2016-10-04 20:59:03.000000000 +0900
++++ CMakeLists.txt 2016-10-04 21:13:43.000000000 +0900
+@@ -92,6 +92,7 @@
+ include_directories(
+ ${Boost_INCLUDE_DIRS}
+ ${QGPGME_INCLUDE_DIR}
++ %PREFIX%/include/kde4
+ )
+ endif(QGPGME_FOUND)
+
</ins></span></pre>
</div>
</div>
</body>
</html>