> On Aug. 11, 2014, 12:17 a.m., Raphael Kubo da Costa wrote:
> > Hmm, the 2.3 branch still contains the problematic includes in 
> > `src/gui/statusbar.cpp`. Robby, how does branching work in Tellico? I can 
> > see that 2.3 is regularly merged into master, but the tags seem to be done 
> > to the 2.3 branch, and the tarball releases also seem to come from it, so 
> > packagers are still going to have problems.

>From https://mail.kde.org/pipermail/tellico-users/2014-August/000980.html:
> I don't have a working computer with git access at the moment. Bug fixes
> are still being done from the 2.3 branch, so this seems like an appropriate
> fix for that branch.

The problem doesn't exist in master because of commit 
4be3af4b1206501c4eda379b26671acc7308e4c2 ("move icon view to be stacked with 
the list view") that is not part of the 2.3 branch. If we apply Vadim's fix to 
2.3, it will then make it into master in the next merge and will introduce an 
unnecessary dependency. Is there a particular reason why that commit is not 
part of 2.3?


- Raphael


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/119260/#review64204
-----------------------------------------------------------


On Aug. 11, 2014, 12:02 a.m., Vadim Zhukov wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/119260/
> -----------------------------------------------------------
> 
> (Updated Aug. 11, 2014, 12:02 a.m.)
> 
> 
> Review request for Build System and Tellico.
> 
> 
> Repository: tellico
> 
> 
> Description
> -------
> 
> The "gui" target relies on data provided by "tellico-config" target. But 
> there was no dependency chain between those, and this resulted in (sometimes) 
> broken builds, especially involving Ninja backend for CMake. The patch below 
> adds missing dependency and allows to compile Tellico on OpenBSD 100% time.
> 
> Please note that I do not have commit rights to the KDE repositories. That 
> means, if the patch will be accepted, someone else will need to actually 
> commit it. Thanks.
> 
> 
> Diffs
> -----
> 
>   src/gui/CMakeLists.txt e44db7b 
> 
> Diff: https://git.reviewboard.kde.org/r/119260/diff/
> 
> 
> Testing
> -------
> 
> OpenBSD/i386-CURRENT, KDE 4.13.3
> 
> 
> Thanks,
> 
> Vadim Zhukov
> 
>

_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Reply via email to