Re: kde-workspace KDE/4.9 broken
Hello Thomas! On Tue, 10 Jul 2012 15:09:40 +0200, Thomas Lübking thomas.luebk...@gmail.com wrote: Am 10.07.2012, 14:36 Uhr, schrieb guy-kde guy-...@maurel.de: I use the default values at ccmake, with shows me: KACTIVITIES_INCLUDE_DIRS /usr/local/include;usr/localinclude/KDE KActivities_DIR/usr/local/lib/cmake/KActivities There's iirc somewhere a config key to build kwin w/o activity support - try ccmake I found in CMakeCache.txt: //Enable building of KWin with kactivities support KWIN_BUILD_ACTIVITIES:BOOL=ON Is it what you are looking for? Thanks guy If I add a line such as: #include QtCore/QStringList to the file: kde-workspace/kwin/scripting/workspace_wrapper.h the problem is no more present. Is it the right way to fix this? Yes, of course. I rather wondered why it happens for you and suspected moc, *sic*, cannot handle preprocessor defines Sth. will include the QStringList for others but not you - nevertheless the correct approach is to explicitly drag in what one needs. Cheers, Thomas -- guy-kde
Re: kde-workspace KDE/4.9 broken
Am 10.07.2012, 17:38 Uhr, schrieb guy-kde guy-...@maurel.de: Hello Thomas! Hi Guy and everyone else =) There's iirc somewhere a config key to build kwin w/o activity support - try ccmake I found in CMakeCache.txt: //Enable building of KWin with kactivities support KWIN_BUILD_ACTIVITIES:BOOL=ON Is it what you are looking for? Yes, unfortunately i'm out of ideas about the cause now :-( Cheers, Thomas
Re: Re: kde-workspace KDE/4.9 broken
On Tuesday 10 July 2012 18:12:03 Thomas Lübking wrote: Am 10.07.2012, 17:38 Uhr, schrieb guy-kde guy-...@maurel.de: Hello Thomas! Hi Guy and everyone else =) There's iirc somewhere a config key to build kwin w/o activity support - try ccmake I found in CMakeCache.txt: //Enable building of KWin with kactivities support KWIN_BUILD_ACTIVITIES:BOOL=ON Is it what you are looking for? Yes, unfortunately i'm out of ideas about the cause now :-( /me too, although I would really figure out what's going wrong there. @Guy, in case you have a patch please open a review request, so that we can include the patch. Cheers Martin signature.asc Description: This is a digitally signed message part.
Re: kde-workspace KDE/4.9 broken
2012/7/9 Martin Klapetek martin.klape...@gmail.com: On Mon, Jul 9, 2012 at 10:55 PM, Albert Astals Cid aa...@kde.org wrote: Someone merged master to KDE/4.9, no clue if anyone is working on fixing it, but just thought you'd want to know KDE/4.9 is broken, you probably don't want to commit there untils it's fixed. Thanks for the info. There's a thread on plasma-devel about it, so they know and hopefully are on it to fix it asap. I have now reset KDE/4.9 to the right commit, removing the bad merge. If you already pulled 4.9 during the breakage, you will have to fix your local branch too, otherwise your next push will re-introduce the bad merge: - Make sure your current branch is KDE/4.9 (or whatever you call your local branch tracking KDE Workspace 4.9) and that you have no unpushed changes (whether they are committed locally or not). - Run git fetch to download from the server. - Run git reset --hard origin/KDE/4.9, to make your local 4.9 branch point at exactly the same commit as the now-fixed remote 4.9 branch. If you do have local changes on 4.9 that you don't want to lose, reply to this thread asking for help; I don't want to make this one post more complicated than it is :) -- Nicolás
