> On Feb. 26, 2014, 5:43 p.m., Hrvoje Senjan wrote: > > src/shell/CMakeLists.txt, line 20 > > <https://git.reviewboard.kde.org/r/116085/diff/2/?file=246330#file246330line20> > > > > 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 > > Marco Martin wrote: > 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. > > Hrvoje Senjan wrote: > 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 ;-) > > Marco Martin wrote: > 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? > > David Faure wrote: > 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.
Couldn't simply revert a merge :) So I did this instead: commit 4f784339b6b5f7236b057a68e7240a1a36dd7ef7 Author: David Faure <fa...@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(-) - David ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/116085/#review50965 ----------------------------------------------------------- On Feb. 26, 2014, 5:37 p.m., Marco Martin wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/116085/ > ----------------------------------------------------------- > > (Updated Feb. 26, 2014, 5:37 p.m.) > > > Review request for Plasma. > > > Repository: plasma-framework > > > Description > ------- > > this ports the js interactive console from plasma1 and ports it way from > kde4support > > ui-wise it should look the same > > > Diffs > ----- > > src/shell/CMakeLists.txt db0e569 > src/shell/interactiveconsole.h PRE-CREATION > src/shell/interactiveconsole.cpp PRE-CREATION > src/shell/packages.h 999b4c9 > src/shell/packages.cpp 0b2aa3f > src/shell/scripting/layouttemplatepackagestructure.h abc5562 > src/shell/scripting/layouttemplatepackagestructure.cpp bc1d0ca > src/shell/scripting/scriptengine.cpp 29735a0 > src/shell/shellcorona.cpp e84e0bf > src/shell/shellpluginloader.cpp c57b348 > > Diff: https://git.reviewboard.kde.org/r/116085/diff/ > > > Testing > ------- > > tried to add plasmoids from the console > > > Thanks, > > Marco Martin > >
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel