<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/116085/">https://git.reviewboard.kde.org/r/116085/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On February 26th, 2014, 5:43 p.m. UTC, <b>Hrvoje Senjan</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/116085/diff/2/?file=246330#file246330line20" style="color: black; font-weight: bold; text-decoration: underline;">src/shell/CMakeLists.txt</a>
<span style="font-weight: normal;">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">20</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="nb">find_package</span><span class="p">(</span><span class="s">KF5TextEditor</span> <span class="s">REQUIRED</span><span class="p">)</span></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This would mean:
a) propagate KTextEditor to part of the KF5 releases (that was not the case with TP1 & alpha1)
b) move the console or shell altogether to a different repo
c) rewrite it without this framework</pre>
</blockquote>
<p>On February 26th, 2014, 5:58 p.m. UTC, <b>Marco Martin</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">ah.
is ok to depend from it from other projects?
We tought about moving the whole shell subdirectory to kde-workspace, looks like we have to do it sooner.</pre>
</blockquote>
<p>On February 26th, 2014, 6:14 p.m. UTC, <b>Hrvoje Senjan</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">it 'can' depend atm - but alpha2 is scheduled for weekend =) (personally, i'd love to have KTextEditor there, but that's something for release & kate guys ;-)</pre>
</blockquote>
<p>On February 26th, 2014, 6:34 p.m. UTC, <b>Marco Martin</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">since unfortunately it has been already merged,
would be a branch (or just a tag) from before this branch was merged be ok for alpha2?</pre>
</blockquote>
<p>On March 1st, 2014, 5:24 p.m. UTC, <b>David Faure</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Guys, you're not making it easy for me to make releases, with deps to unreleased stuff committed at the time of making the release....
"Just a tag" doesn't work, I needed to upgrade the version number of the framework (which is pushed now).
Plus it would just postpone the problem
So I'll just revert the commit that adds the dependencies, since apparently KTextEditor is not meant to be part of 5.0.</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Couldn't simply revert a merge :)
So I did this instead:
commit 4f784339b6b5f7236b057a68e7240a1a36dd7ef7
Author: David Faure <faure@kde.org>
Date: Sat Mar 1 18:47:00 2014 +0100
Make ktexteditor an optional dependency
src/shell/CMakeLists.txt | 21 +++++++++++++++++----
src/shell/config-ktexteditor.h.cmake | 2 ++
src/shell/shellcorona.cpp | 10 ++++++++++
3 files changed, 29 insertions(+), 4 deletions(-)
</pre>
<br />
<p>- David</p>
<br />
<p>On February 26th, 2014, 5:37 p.m. UTC, Marco Martin wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Plasma.</div>
<div>By Marco Martin.</div>
<p style="color: grey;"><i>Updated Feb. 26, 2014, 5:37 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-framework
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">this ports the js interactive console from plasma1 and ports it way from kde4support
ui-wise it should look the same</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">tried to add plasmoids from the console</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/shell/CMakeLists.txt <span style="color: grey">(db0e569)</span></li>
<li>src/shell/interactiveconsole.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/shell/interactiveconsole.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/shell/packages.h <span style="color: grey">(999b4c9)</span></li>
<li>src/shell/packages.cpp <span style="color: grey">(0b2aa3f)</span></li>
<li>src/shell/scripting/layouttemplatepackagestructure.h <span style="color: grey">(abc5562)</span></li>
<li>src/shell/scripting/layouttemplatepackagestructure.cpp <span style="color: grey">(bc1d0ca)</span></li>
<li>src/shell/scripting/scriptengine.cpp <span style="color: grey">(29735a0)</span></li>
<li>src/shell/shellcorona.cpp <span style="color: grey">(e84e0bf)</span></li>
<li>src/shell/shellpluginloader.cpp <span style="color: grey">(c57b348)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/116085/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>