Linux/CI & OSX/CI: kglobalaccel is failing to build on branches stable and master

[Martin Klapetek]

Hey,

On Tue, Jan 6, 2015 at 7:56 PM, Marko Käning <mk-lists at email.de> wrote:

> Hi devs,
>
> kglobalaccel is currently failing on Jenkins [1].
>
>
> This can partially be fixed by inserting some dependencies for it:
> ---
> diff --git a/dependency-data-kf5-qt5 b/dependency-data-kf5-qt5
> index 55b4141..91ac810 100644
> --- a/dependency-data-kf5-qt5
> +++ b/dependency-data-kf5-qt5
> @@ -16,6 +16,13 @@
>  *: Qt5[stable]
>  *: kdesupport/extra-cmake-modules
>
> +# Frameworks, tier1
> +frameworks/kglobalaccel: frameworks/kconfig
> +frameworks/kglobalaccel: frameworks/kcoreaddons
> +frameworks/kglobalaccel: frameworks/kcrash
> +frameworks/kglobalaccel: frameworks/kdbusaddons
> +frameworks/kglobalaccel: frameworks/ki18n
> +
>  # Frameworks, tier2
>  frameworks/kauth: frameworks/kcoreaddons
>  frameworks/kcompletion: frameworks/kconfig
> ---
>

Ahh yes, I prepared this and then got carried away by other work, this
needs to be done.


> ... yet I wonder whether this is actually wanted!?! I thought that tier 1
> frameworks won’t depend on any other framework, but kglobalaccel now seems
> to be the 1st framework not being in correspondence with this!
>

KGlobalAccel got the runtime daemon added into the framework today
and is now tier3 (starting from 5.7 release).


> But well, even with the above lines I run into this after all:
> ---
> /Users/marko/WC/KDECI-builds/kglobalaccel/src/runtime/globalshortcutsregistry.cpp:38:10:
> fatal error: 'kglobalaccel_qws.h' file not found
> #include "kglobalaccel_qws.h"
>          ^
> 1 error generated.
> make[2]: ***
> [src/runtime/CMakeFiles/kglobalaccel5.dir/globalshortcutsregistry.cpp.o]
> Error 1
> ---
>

Ah humm..that would be my fault, builds fine here. I'll have a look.

This seems to be caused by the use of Q_WS_MACX. Replacing it by Q_OS_MAC in
> src/runtime/globalshortcutsregistry.cpp makes it build the OSX code path:
> ---
> diff --git src/runtime/globalshortcutsregistry.cpp
> src/runtime/globalshortcutsregistry.cpp
> index 532334a..3f84edb 100644
> --- src/runtime/globalshortcutsregistry.cpp
> +++ src/runtime/globalshortcutsregistry.cpp
> @@ -30,7 +30,7 @@
>
>  #if HAVE_X11
>  #include "kglobalaccel_x11.h"
> -#elif defined(Q_WS_MACX)
> +#elif defined(Q_OS_MAC)
>  #include "kglobalaccel_mac.h"
>  #elif defined(Q_WS_WIN)
>  #include "kglobalaccel_win.h"
> ---
>
> Compiling now gets further, but unfortunately fails:
> ---
>
> In file included from
> /Users/marko/WC/KDECI-builds/kglobalaccel/src/runtime/globalshortcutsregistry.cpp:34:
> /Users/marko/WC/KDECI-builds/kglobalaccel/src/runtime/kglobalaccel_mac.h:25:10:
> fatal error: 'kshortcut.h' file not found
> #include "kshortcut.h"
>          ^
> ---
>
> Ideas?
>

I'll have a look and fix it.

Thanks for the investigation!

Cheers
-- 
Martin Klapetek | KDE Developer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20150106/d03c8fee/attachment.html>