[Kde-games-devel] KMahjongg frameworks branch

[Ian Wadham]

On 05/01/2016, at 1:58 PM, Frederik Schwarzer wrote:

> Am Dienstag, 5. Januar 2016, 13:27:17 schrieb Ian Wadham:
> 
> Hi Ian,
> 
>> On 04/01/2016, at 11:07 AM, Frederik Schwarzer wrote:
>>> I found the cause for the crash. I read in the Qt docs that
>>> QFile::Text is a good idea but in this case it causes problems.
>>> 
>>> So now I pushed the merge to the server.
>> 
>> Well done, Frederik!!!  It has been a long haul.  I hope your next
>> merge of a frameworks branch will be on a game which is better
>> maintained and has fewer open bug reports.
> 
> I am planning Kigo and the KGoldrunner.
> Kigo has some review requests (a.k.a porters stumbling blocks ;))
> but I guess you might be willing to help with KGoldrunner so it should 
> be alright.

Sure, but KGr might be quite a large port, compared to other games.

>>> Brace for impact. :)
>> 
>> Yair, tell me about it…  As you know, I cannot compile and build
>> Frameworks on Apple OS X.  But it gets worse...
>> 
>> Apparently KMahjongg had its CMakeLists.txt radically changed
>> and some porting to Frameworks (or "preparation" for Frameworks)
>> done on the master branch, starting on 20 Sept 2014.  If I "git
>> reset" to just before that, I miss fixes that went into master in
>> 2015.
>> 
>> If I reset to just before you started merging, I cannot build
>> KMahjongg.
> 
> You cannot build f59dc4a400?

Hmmmm, yes, I can.  And it has the CMakeLists.txt for KDE 4.

> It's the commit before the merge.

Fooled me...  I took the "commit before the merge" to be the one
that is chronologically just before "Merge branch 'frameworks'"
(in the history given by Quickgit)… :-(

> It should build fine with a KDE 4 setup.
> Although it might not be useful to build that version when checking 
> stuff for the current master branch.

Well, I now have a branch 'kde4only' that is reset to f59dc4a…  If I merge
my local 'qgraphic' into that, I should get a KMahjongg that is functionally
the same (or almost the same) as yours, assuming the Frameworks and
Qt5 between them cover the same library functions as kdelibs and Qt4
(in respect of KMahjonng, that is).

I might have a go at that...

> I think the commit from 20 Sept 2014 (2fa7f323b9) is on frameworks 
> branch here. But there is too much branching/merging going on there to 
> be sure.

Yeah, it probably is.  The Quickgit shortlog does not give a lot of detail
on which branch each commit came from.  Nor could I find a "Reader's
Guide" for Quickgit output anywhere that might explain the significance
of the branch names that appear occasionally in the shortlog.

Cheers, Ian W.