Review Request 123091: [plasma-workspace/dataengines/geolocation] Fix build with NM 1.0.0

[Martin Gräßlin]

> On March 21, 2015, 5:16 p.m., Aleix Pol Gonzalez wrote:
> > +1
> > 
> > I also had this error, thanks a lot for the investigation!!
> > 
> > I wonder how it worked for whoever pushed this...

> I wonder how it worked for whoever pushed this...

Debian testing only having NM 0.9


- Martin


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


On March 21, 2015, 2:16 a.m., Hrvoje Senjan wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/123091/
> -----------------------------------------------------------
> 
> (Updated March 21, 2015, 2:16 a.m.)
> 
> 
> Review request for Plasma, Martin Gräßlin and Jan Grulich.
> 
> 
> Repository: plasma-workspace
> 
> 
> Description
> -------
> 
> Fix build by adding QT_NO_KEYWORDS definition. Also adjusted the surrounding files to make them build with this.
> It is needed to avoid symbol collision with gtk/gio.
> (I have no idea what changed in NM 1.0.0 that is exposes the failure, it builds fine with older versions - but would like to know if there's a better solution ;-)
> 
> 
> Diffs
> -----
> 
>   dataengines/geolocation/CMakeLists.txt 7a477c1 
>   dataengines/geolocation/geolocation.cpp 678f25f 
>   dataengines/geolocation/geolocationprovider.cpp 6db8026 
> 
> Diff: https://git.reviewboard.kde.org/r/123091/diff/
> 
> 
> Testing
> -------
> 
> The error was:
> ```
> In file included from /usr/include/qt5/QtCore/qobject.h:40:0,
>                  from /usr/include/qt5/QtCore/qtimer.h:42,
>                  from /usr/include/qt5/QtCore/QTimer:1,
>                  from ../dataengines/geolocation/geolocation.h:21,
>                  from ../dataengines/geolocation/geolocation.cpp:18:
> /usr/include/glib-2.0/gio/gdbusintrospection.h:155:25: error: expected unqualified-id before ‘public’
>    GDBusSignalInfo     **signals;
>                          ^
> In file included from /usr/include/glib-2.0/gio/gio.h:53:0,
>                  from /usr/include/libnm/nm-types.h:24,
>                  from /usr/include/libnm/nm-object.h:29,
>                  from /usr/include/libnm/nm-access-point.h:29,
>                  from /usr/include/libnm/NetworkManager.h:26,
>                  from /usr/include/KF5/NetworkManagerQt/ipconfig.h:34,
>                  from /usr/include/KF5/NetworkManagerQt/device.h:33,
>                  from /usr/include/KF5/NetworkManagerQt/manager.h:31,
>                  from /usr/include/KF5/NetworkManagerQt/Manager:1,
>                  from ../dataengines/geolocation/geolocation.cpp:25:
> /usr/include/glib-2.0/gio/gdbusintrospection.h:155:24: error: expected ‘;’ at end of member declaration
>    GDBusSignalInfo     **signals;
>                         ^
> /usr/include/glib-2.0/gio/gdbusintrospection.h:155:32: error: expected ‘:’ before ‘;’ token
>    GDBusSignalInfo     **signals;
> ```
> 
> With the attached patch it builds fine.
> 
> 
> Thanks,
> 
> Hrvoje Senjan
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20150322/cc8be36d/attachment-0001.html>