<div dir="ltr">Fixed local file handling prevented merges from being saved. Thin rapper class created to insure scheme is never blank. QUrl::isLocal returns false in this case. <br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Jan 13, 2018 at 2:47 AM, Michael Reeves <span dir="ltr"><<a href="mailto:reeves.87@gmail.com" target="_blank">reeves.87@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Looks the original is a somewhat modified version of be348bcf1. It doesn't have some of the windows specific code. Also kreplacements was not always patched when updating code. I'm working on getting it updated with changes Joachim has made.<br></div><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Fri, Jan 12, 2018 at 12:21 AM, Joachim Eibl <span dir="ltr"><<a href="mailto:Joachim.Eibl@gmx.de" target="_blank">Joachim.Eibl@gmx.de</a>></span> wrote:<br></span><div><div class="h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div style="font-family:Verdana;font-size:12.0px"><div>
<div>Hi,</div>
<div> </div>
<div>It's great to hear there is some ongoing effort to port KDiff3 to KF5.</div>
<div>Thanks for informing me.</div>
<div>I had a try at it myself, but was quite overwhelmed about the big changes in KF5.</div>
<div> </div>
<div>You have my blessing to use the name KDiff3.</div>
<div> </div>
<div>@Michael: It seems the repo at <a href="https://bitbucket.org/reporter123/kdiff3" target="_blank">https://bitbucket.org/reporter<wbr>123/kdiff3</a></div>
<div>has no public access.</div>
<div> </div>
<div>Kudos,</div>
<div>Joachim</div>
<div> </div>
<div>
<div style="margin:10.0px 5.0px 5.0px 10.0px;padding:10.0px 0 10.0px 10.0px;border-left:2.0px solid rgb(195,217,229)">
<div style="margin:0 0 10.0px 0"><b>Gesendet:</b> Donnerstag, 11. Januar 2018 um 22:28 Uhr<br>
<b>Von:</b> "Michael Reeves" <<a href="mailto:reeves.87@gmail.com" target="_blank">reeves.87@gmail.com</a>><br>
<b>An:</b> "Albert Astals Cid" <<a href="mailto:aacid@kde.org" target="_blank">aacid@kde.org</a>><br>
<b>Cc:</b> <a href="mailto:kde-core-devel@kde.org" target="_blank">kde-core-devel@kde.org</a>, "Joachim Eibl" <<a href="mailto:Joachim.Eibl@gmx.de" target="_blank">Joachim.Eibl@gmx.de</a>><br>
<b>Betreff:</b> Re: KDE inclusion</div><div><div class="m_-2779594470419812558h5">
<div>
<div>Sorry meant this to go to everyone.
<div><br>
I did this based off what Ubuntu was using at the time. The repo is here <a href="https://bitbucket.org/reporter123/kdiff3" target="_blank">https://bitbucket.org/reporter<wbr>123/kdiff3</a>. Master is currently set the require CMake 3.1 but as of this moment that is just a number change. My concern here was C++11 feature dectect which is not implemented in earlier versions. Right now that is not critical. I was not aware of the parallel effort at <a href="https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5" target="_blank">https://cgit.kde.org/scratch/t<wbr>homasfischer/kdiff3.git/log/?h<wbr>=kf5</a>. Command line parsing is fully operational on mine. To my knowledge it is fully operational and I have been using it on my machine. I generally work with two way comparisons.</div>
</div>
<div class="gmail_extra">
<div class="gmail_quote">On Thu, Jan 11, 2018 at 6:24 PM, Albert Astals Cid <span><<a href="mailto:aacid@kde.org" target="_blank">aacid@kde.org</a>></span> wrote:
<blockquote class="gmail_quote" style="margin:0 0 0 0.8ex;border-left:1.0px rgb(204,204,204) solid;padding-left:1.0ex">El dijous, 11 de gener de 2018, a les 12:15:15 CET, Kevin Funk va escriure:<br>
<span>> On Tuesday, 9 January 2018 21:06:36 CET Michael Reeves wrote:<br>
> > I have a version of kdiff3 that I ported to kf5. I like to what build<br>
> > requirements kf5 as a whole has. Also what would be the process for being<br>
> > considered for inclusion in kde?<br>
><br>
> Heya,<br>
><br>
> Note: kdiff3 right now is hosted & developed on SourceForge.<br>
><br>
> I'd love to see kdiff3 being adopted by KDE again (it former was KDE<br>
> extragear if I understood correctly). kdiff3 is a super useful tool -- and<br>
> right now development has stalled a bit.<br>
><br>
> Talked to Joachim (the original author) a few weeks ago, where he stated he<br>
> just doesn't have the time maintaining it anymore, really. I've CC'd Joachim<br>
> so he can tell us whether he's okay with having kdiff3 developed further<br>
> under the KDE umbrella.</span><br>
<br>
I guess this is the most important question, if we can keep using the kdiff3<br>
name under's Joachim's blessing or we have to "fork it" and find a new name.<br>
<br>
Cheers,<br>
Albert
<div class="m_-2779594470419812558m_2458208607079975333HOEnZb">
<div class="m_-2779594470419812558m_2458208607079975333h5"><br>
><br>
> I don't really know the process of having it integrated either. I'll leave<br>
> that to others.<br>
><br>
> Kudos for doing the KF5 port!<br>
><br>
> Regards,<br>
> Kevin<br>
<br>
</div>
</div>
</blockquote>
</div>
</div>
</div>
</div></div></div>
</div>
</div></div></div>
</blockquote></div></div></div><br></div>
</blockquote></div><br></div>