<!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>[121378] trunk/dports/kde/kdelibs4</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/121378">121378</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-06-24 09:23:44 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>kdelibs4: using back raster graphics by default</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdekdelibs4Portfile">trunk/dports/kde/kdelibs4/Portfile</a></li>
<li><a href="#trunkdportskdekdelibs4filespatchkapplicationsrasterdiff">trunk/dports/kde/kdelibs4/files/patch-kapplications-raster.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdekdelibs4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kdelibs4/Portfile (121377 => 121378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdelibs4/Portfile 2014-06-24 16:02:37 UTC (rev 121377)
+++ trunk/dports/kde/kdelibs4/Portfile 2014-06-24 16:23:44 UTC (rev 121378)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name kdelibs4
</span><span class="cx"> version 4.12.5
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers nicos
</span><span class="cx"> license LGPL-2+ GPL-2+ BSD
</span><span class="lines">@@ -60,12 +60,9 @@
</span><span class="cx"> patch-cmake-modules-FindPhonon.cmake.diff \
</span><span class="cx"> patch-cmake-modules-FindQt4.cmake.diff \
</span><span class="cx"> patch-cmake-modules-KDE4Macros.cmake.diff \
</span><del>- patch-removeFindFlex.diff
</del><ins>+ patch-removeFindFlex.diff \
+ patch-kapplications-raster.diff
</ins><span class="cx">
</span><del>-#The patch forcing raster graphics (speeding up some applications) causes others to
-#crash (see for example kmymoney in #43767)
-# patch-kapplications-raster.diff
-
</del><span class="cx"> patch.pre_args -p1
</span><span class="cx">
</span><span class="cx"> # explicitly define certain headers and libraries, to avoid
</span></span></pre></div>
<a id="trunkdportskdekdelibs4filespatchkapplicationsrasterdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/kdelibs4/files/patch-kapplications-raster.diff (121377 => 121378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/kdelibs4/files/patch-kapplications-raster.diff 2014-06-24 16:02:37 UTC (rev 121377)
+++ trunk/dports/kde/kdelibs4/files/patch-kapplications-raster.diff 2014-06-24 16:23:44 UTC (rev 121378)
</span><span class="lines">@@ -1,12 +1,79 @@
</span><del>---- kdelibs-4.12.5/kdeui/kernel/kapplication.cpp.orig 2014-04-28 13:37:51.000000000 +0900
-+++ kdelibs-4.12.5/kdeui/kernel/kapplication.cpp 2014-05-17 00:04:51.000000000 +0900
-@@ -409,6 +409,9 @@
</del><ins>+diff --git a/kdeui/kernel/kapplication.cpp b/kdeui/kernel/kapplication.cpp
+index b093034..3e1b2f2 100644
+--- a/kdeui/kernel/kapplication.cpp
++++ b/kdeui/kernel/kapplication.cpp
+@@ -207,7 +207,11 @@ public:
+ QString sessionConfigName() const;
+ void init(bool GUIenabled=true);
+ void parseCommandLine( ); // Handle KDE arguments (Using KCmdLineArgs)
++#ifdef Q_OS_MAC
++ static void preqapplicationhack(bool GUIenabled = true);
++#else
+ static void preqapplicationhack();
++#endif
+ static void preread_app_startup_id();
+ void read_app_startup_id();
+
+@@ -342,7 +346,11 @@ static SmcConn mySmcConnection = 0;
+ #endif
+
+ KApplication::KApplication(bool GUIenabled)
++#ifdef Q_OS_MAC
++ : QApplication((KApplicationPrivate::preqapplicationhack(GUIenabled),KCmdLineArgs::qtArgc()), KCmdLineArgs::qtArgv(), GUIenabled),
++#else
+ : QApplication((KApplicationPrivate::preqapplicationhack(),KCmdLineArgs::qtArgc()), KCmdLineArgs::qtArgv(), GUIenabled),
++#endif
+ d(new KApplicationPrivate(this))
+ {
+ d->read_app_startup_id();
+@@ -402,10 +410,31 @@ KApplication::KApplication(Display *display, int& argc, char** argv, const QByte
+ }
+ #endif
+
++#ifdef Q_OS_MAC
++static bool useRaster = true;
++void KApplication::doNotUseRaster()
++{
++ useRaster = false;
++}
++#endif
++
+ // this function is called in KApplication ctors while evaluating arguments to QApplication ctor,
+ // i.e. before QApplication ctor is called
++#ifdef Q_OS_MAC
++void KApplicationPrivate::preqapplicationhack(bool GUIenabled)
++#else
+ void KApplicationPrivate::preqapplicationhack()
++#endif
+ {
++#ifdef Q_OS_MAC
++ // Setting env RasterOff avoids setting raster. Can be used for before/after
++ // testing and to work around an application failing when raster is set.
++ if (getenv("RasterOff") == NULL) {
++ if (useRaster && GUIenabled) {
++ QApplication::setGraphicsSystem(QString("raster"));
++ }
++ }
++#endif
</ins><span class="cx"> preread_app_startup_id();
</span><span class="cx">
</span><span class="cx"> KGlobal::config(); // initialize qt plugin path (see KComponentDataPrivate::lazyInit)
</span><del>-+#ifdef Q_WS_MAC
-+ QApplication::setGraphicsSystem("raster");
</del><ins>+diff --git a/kdeui/kernel/kapplication.h b/kdeui/kernel/kapplication.h
+index fa2ab26..cc21e76 100644
+--- a/kdeui/kernel/kapplication.h
++++ b/kdeui/kernel/kapplication.h
+@@ -403,6 +403,14 @@ public:
+ */
+ static bool loadedByKdeinit;
+
++#ifdef Q_OS_MAC
++ /**
++ * Use before creating KApplication in an app which fails with raster
++ * graphics, such as KMyMoney. Most KDE apps on OS X run better with raster.
++ */
++ static void doNotUseRaster();
</ins><span class="cx"> +#endif
</span><del>- }
-
- int KApplication::xioErrhandler( Display* dpy )
</del><ins>++
+ public Q_SLOTS:
+ /**
+ * Updates the last user action timestamp to the given time, or to the current time,
</ins></span></pre>
</div>
</div>
</body>
</html>