<!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>[126431] trunk/dports/kde/kde4-runtime</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/126431">126431</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-10-09 20:21:45 -0700 (Thu, 09 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>kde4-runtime: update to 4.13.3
review dependencies
add patch for DrKonqi</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4runtimePortfile">trunk/dports/kde/kde4-runtime/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdekde4runtimefilespatchDrKonqidiff">trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.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 (126430 => 126431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-runtime/Portfile 2014-10-10 03:08:34 UTC (rev 126430)
+++ trunk/dports/kde/kde4-runtime/Portfile 2014-10-10 03:21:45 UTC (rev 126431)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup kde4 1.1
</span><span class="cx">
</span><span class="cx"> name kde4-runtime
</span><del>-version 4.12.5
</del><ins>+version 4.13.3
</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">@@ -18,15 +18,17 @@
</span><span class="cx"> use_xz yes
</span><span class="cx"> distname kde-runtime-${version}
</span><span class="cx">
</span><del>-checksums rmd160 9e5c16749b275c191e6efc4a61e070b8e8c48442 \
- sha256 b43e1aebd7e9dd13677f2205bb6eef7ee02a7085ae9fd34a39bad55d5df56fe7
</del><ins>+checksums rmd160 873bc8f5b2ff834e45bbcddd5cf1985a96e78952 \
+ sha256 d35dbf930d212e86154e87e3566797827af1ed666099e5d5df8df76b874318f0
</ins><span class="cx">
</span><span class="cx"> #Binaries do not link directly to openssl, nor use the ssl backend of kdelibs4,
</span><span class="cx"> #nor links to libkimap or libmailtransport from kdepimlibs4
</span><span class="cx"> license_noconflict openssl
</span><span class="cx">
</span><del>-#Fully removing X11 only function to prevent automoc to include it
-patchfiles patch-kwalletd.diff
</del><ins>+#kwalletd: Fully removing X11 only function to prevent automoc to include it
+#DrKonqi: Fix issues with Dr Konqi during bug reporting on OSX (see https://git.reviewboard.kde.org/r/119498/)
+patchfiles patch-kwalletd.diff \
+ patch-DrKonqi.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">@@ -45,7 +47,13 @@
</span><span class="cx"> port:redland \
</span><span class="cx"> port:raptor2 \
</span><span class="cx"> port:webp \
</span><del>- port:bison
</del><ins>+ port:bison \
+ port:shared-mime-info \
+ port:gpgme port:attica \
+ port:libgcrypt port:openexr \
+ port:xz port:zlib \
+ port:qca \
+ port:perl5
</ins><span class="cx">
</span><span class="cx"> depends_run-append port:virtuoso
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportskdekde4runtimefilespatchDrKonqidiff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff (0 => 126431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff (rev 0)
+++ trunk/dports/kde/kde4-runtime/files/patch-DrKonqi.diff 2014-10-10 03:21:45 UTC (rev 126431)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+diff -ur ../kde-runtime-4.13.3-orig/drkonqi/gdbhighlighter.cpp ./drkonqi/gdbhighlighter.cpp
+--- ../kde-runtime-4.13.3-orig/drkonqi/gdbhighlighter.cpp 2014-07-06 16:27:04.000000000 +0900
++++ ./drkonqi/gdbhighlighter.cpp 2014-09-20 15:27:00.000000000 +0900
+@@ -30,6 +30,9 @@
+ lines.insert(l, line);
+ l += line.toString().count('\n');
+ }
++ // Add a dummy, in case the last backtrace line has more than 1 '\n' char.
++ const BacktraceLine dummy;
++ lines.insert(l, dummy);
+
+ // setup formates
+ KColorScheme scheme(QPalette::Active);
+@@ -71,7 +74,8 @@
+ // -1 since we skip the first line
+ QMap< int, BacktraceLine >::iterator it = lines.lowerBound(lineNr - 1);
+ Q_ASSERT(it != lines.end());
+- // lowerbound would return the next higher item, even though we want the former one
++ // QMap::lowerbound() returns the next higher item or
++ // the dummy item, but we want the one before that.
+ if (it.key() > lineNr - 1) {
+ --it;
+ }
+diff -ur ../kde-runtime-4.13.3-orig/drkonqi/main.cpp ./drkonqi/main.cpp
+--- ../kde-runtime-4.13.3-orig/drkonqi/main.cpp 2014-07-06 16:27:04.000000000 +0900
++++ ./drkonqi/main.cpp 2014-09-20 15:27:00.000000000 +0900
+@@ -43,7 +43,10 @@
+
+ int main(int argc, char* argv[])
+ {
+-#ifndef Q_OS_WIN //krazy:exclude=cpp
++#if !defined(Q_OS_WIN)
++// #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
++// When starting Dr Konqi via kdeinit4, Apple OS X aborts us unconditionally for
++// using setgid/setuid, even if the privs were those of the logged-in user.
+ // Drop privs.
+ setgid(getgid());
+ if (setuid(getuid()) < 0 && geteuid() != getuid()) {
+@@ -106,6 +109,9 @@
+
+ DrKonqiDialog *w = new DrKonqiDialog();
+ w->show();
++ // Make sure the Dr Konqi dialog comes to the front, whatever the platform
++ // or window manager, but especially on Apple OS X.
++ w->raise();
+ int ret = qa->exec();
+
+ DrKonqi::cleanup();
+diff -ur ../kde-runtime-4.13.3-orig/drkonqi/reportassistantpages_bugzilla.cpp ./drkonqi/reportassistantpages_bugzilla.cpp
+--- ../kde-runtime-4.13.3-orig/drkonqi/reportassistantpages_bugzilla.cpp 2014-07-06 16:27:04.000000000 +0900
++++ ./drkonqi/reportassistantpages_bugzilla.cpp 2014-09-20 15:27:00.000000000 +0900
+@@ -283,9 +283,18 @@
+ {
+ if (!(ui.m_userEdit->text().isEmpty() || ui.m_passwordEdit->text().isEmpty())) {
+
++#ifndef Q_OS_MAC
++ // On Apple OS X, the following test is omitted (for now) because kded4,
++ // the KDE daemon is not usually running (OS X is not a KDE desktop) and
++ // the absence of kded4 causes Dr Konqi to crash.
++ //
++ // The code based on cookies is intended to be replaced because Bugzilla
++ // and bugs.kde.org no longer use cookies (Bugzilla 4.4.5, July 2014).
++ //
+ if (!canSetCookies()) {
+ return;
+ }
++#endif
+
+ ui.m_loginButton->setEnabled(false);
+
+Only in .: patch-DrKonqi.diff
</ins></span></pre>
</div>
</div>
</body>
</html>