[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: Re: Review Request 123091: [plasma-workspace/dataengines/geolocation] Fix build with NM 1.0.0
From: "Hrvoje Senjan" <hrvoje.senjan () gmail ! com>
Date: 2015-03-23 11:01:58
Message-ID: 20150323110158.18119.55469 () mimi ! kde ! org
[Download RAW message or body]
--===============6873315110855116925==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/123091/
-----------------------------------------------------------
(Updated March 23, 2015, 11:01 a.m.)
Status
------
This change has been marked as submitted.
Review request for Plasma, Martin Gräßlin and Jan Grulich.
Changes
-------
Submitted with commit 17a144bc8c210eae0893bac327e836b0d546e215 by Hrvoje Senjan to \
branch master.
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
--===============6873315110855116925==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> \
<tr> <td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/123091/">https://git.reviewboard.kde.org/r/123091/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="12" style="border: 1px gray solid; \
border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;"> <tr>
<td>
<h1 style="margin: 0; padding: 0; font-size: 10pt;">This change has been marked as \
submitted.</h1> </td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;"> <tr>
<td>
<div>Review request for Plasma, Martin Gräßlin and Jan Grulich.</div>
<div>By Hrvoje Senjan.</div>
<p style="color: grey;"><i>Updated March 23, 2015, 11:01 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Submitted with commit 17a144bc8c210eae0893bac327e836b0d546e215 by Hrvoje \
Senjan to branch master.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-workspace
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">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 ;-)</p></pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">The error was:</p> <p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div \
class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><span \
style="color: #008000; font-weight: bold">In</span> <span style="color: #008000; \
font-weight: bold">file</span> <span style="color: #008000; font-weight: \
bold">included</span> <span style="color: #008000; font-weight: bold">from</span> \
<span style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">qt5</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: bold">QtCore</span><span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">qobject</span><span style="color: #0000FF; font-weight: bold">.h</span><span \
style="color: #AA22FF">:4 0:0</span><span style="color: #666666">,</span>
<span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">qt5</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: bold">QtCore</span><span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">qtimer</span><span style="color: #0000FF; font-weight: bold">.h</span><span \
style="color: #AA22FF">:42</span><span style="color: #666666">,</span> <span \
style="color: #008000; font-weight: bold">from</span> <span style="color: \
#666666">/</span><span style="color: #008000; font-weight: bold">usr</span><span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">include</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">qt5</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">QtCore</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">QTimer</span><span style="color: \
#AA22FF">:1</span><span style="color: #666666">,</span> <span style="color: #008000; \
font-weight: bold">from</span> <span style="color: #666666">../</span><span \
style="color: #008000; font-weight: bold">dataengines</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">geolocation</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">geolocation</span><span style="color: #0000FF; \
font-weight: bold">.h</span><span style="color: #AA22FF">:21</span><span \
style="color: #666666">,</span> <span style="color: #008000; font-weight: \
bold">from</span> <span style="color: #666666">../</span><span style="color: #008000; \
font-weight: bold">dataengines</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">geolocation</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">geolocation</span><span style="color: #0000FF; font-weight: \
bold">.cpp</span><span style="color: #AA22FF">:18</span><span style="color: \
#666666">:</span> <span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">usr</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">glib-2</span><span style="color: #0000FF; \
font-weight: bold">.0</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">gio</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">gdbusintrospection</span><span \
style="color: #0000FF; font-weight: bold">.h</span><span style="color: \
#AA22FF">:155:25</span><span style="color: #666666">:</span> <span style="color: \
#008000; font-weight: bold">error</span><span style="color: #666666">:</span> <span \
style="color: #008000; font-weight: bold">expected</span> <span style="color: \
#008000; font-weight: bold">unqualified-id</span> <span style="color: #008000; \
font-weight: bold">before</span> <span style= "border: 1px solid \
#FF0000">‘</span><span style="color: #008000; font-weight: bold">public</span><span \
style="border: 1px solid #FF0000">'</span> <span style="color: #008000; font-weight: \
bold">GDBusSignalInfo</span> <span style="color: #666666">**</span><span \
style="color: #008000; font-weight: bold">signals</span><span style="color: \
#666666">;</span> <span style="color: #666666">^</span>
<span style="color: #008000; font-weight: bold">In</span> <span style="color: \
#008000; font-weight: bold">file</span> <span style="color: #008000; font-weight: \
bold">included</span> <span style="color: #008000; font-weight: bold">from</span> \
<span style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">glib-2</span><span style="color: #0000FF; \
font-weight: bold">.0</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">gio</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">gio</span><span style="color: #0000FF; \
font-weight: bold">.h</span><span style="color: #AA22FF">:53:0</span><span \
style="color: #666666">,</span> <span style="color: #008000; font-weight: \
bold">from</span> <span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">usr</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">libnm</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: bold">nm-types</span><span \
style="color: #0000FF; font-weight: bold">.h</span><span style="color: \
#AA22FF">:24</span><span style="color: #666666">,</span> <span style="color: \
#008000; font-weight: bold">from</span> <span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">usr</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: bold">include</span><span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">libnm</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">nm-object</span><span style="color: #0000FF; font-weight: \
bold">.h</span><span style="color: #AA22FF">:29</span><span style="color: \
#666666">,</span> <span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">libnm</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">nm-access-point</span><span style="color: #0000FF; font-weight: \
bold">.h</span><span style="color: #AA22FF">:29</span><span style="color: \
#666666">,</span> <span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">libnm</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">NetworkManager</span><span style="color: #0000FF; font-weight: \
bold">.h</span><span style="color: #AA22FF">:26</span><span style="color: \
#666666">,</span> <span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">KF5</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">NetworkManagerQt</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">ipconfig</span><span style="color: #0000FF; font-weight: \
bold">.h</span><span style="color: #AA22FF">:34</span><span style="color: \
#666666">,</span> <span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">KF5</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">NetworkManagerQt</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">device</span><span style="color: #0000FF; font-weight: \
bold">.h</span><span style="color: #AA22FF">:33</span><span style="color: \
#666666">,</span> <span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">KF5</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">NetworkManagerQt</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">manager</span><span style="color: #0000FF; font-weight: \
bold">.h</span><span style="color: #AA22FF">:31</span><span style="color: \
#666666">,</span> <span style="color: #008000; font-weight: bold">from</span> <span \
style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">KF5</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">NetworkManagerQt</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">Manager</span><span style="color: #AA22FF">:1</span><span \
style="color: #666666">,</span> <span style="color: #008000; font-weight: \
bold">from</span> <span style="color: #666666">../</span><span style="color: #008000; \
font-weight: bold">dataengines</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">geolocation</span><span style="color: \
#666666">/</span><span style="color: #008000; font-weight: \
bold">geolocation</span><span style="color: #0000FF; font-weight: \
bold">.cpp</span><span style="color: #AA22FF">:25</span><span style="color: \
#666666">:</span> <span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">usr</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">glib-2</span><span style="color: #0000FF; \
font-weight: bold">.0</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">gio</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">gdbusintrospection</span><span \
style="color: #0000FF; font-weight: bold">.h</span><span style="color: \
#AA22FF">:155:24</span><span style="color: #666666">:</span> <span style="color: \
#008000; font-weight: bold">error</span><span style="color: #666666">:</span> <span \
style="color: #008000; font-weight: bold">expected</span> <span style="border: 1px \
solid #FF0000">‘</span><span style="color: #666666">;</span><span style="border: \
1px solid #FF0000">'</span> <span style="color: #008000; font-weight: \
bold">at</span> <span style="color: #008000; font-weight: bold">end</span> <span \
style="color: #008000; font-weight: bold">of</span> <span style="color: #008000; \
font-weight: bold">member</span> <span style="color: #008000; font-weight: \
bold">declaration</span> <span style="color: #008000; font-weight: \
bold">GDBusSignalInfo</span> <span style="color: #666666">**</span><span \
style="color: #008000; font-weight: bold">signals</span><span style="color: \
#666666">;</span> <span style="color: #666666">^</span>
<span style="color: #666666">/</span><span style="color: #008000; font-weight: \
bold">usr</span><span style="color: #666666">/</span><span style="color: #008000; \
font-weight: bold">include</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">glib-2</span><span style="color: #0000FF; \
font-weight: bold">.0</span><span style="color: #666666">/</span><span style="color: \
#008000; font-weight: bold">gio</span><span style="color: #666666">/</span><span \
style="color: #008000; font-weight: bold">gdbusintrospection</span><span \
style="color: #0000FF; font-weight: bold">.h</span><span style="color: \
#AA22FF">:155:32</span><span style="color: #666666">:</span> <span style="color: \
#008000; font-weight: bold">error</span><span style="color: #666666">:</span> <span \
style="color: #008000; font-weight: bold">expected</span> <span style="border: 1px \
solid #FF0000">‘</span><span style="color: #666666">:</span><span style="border: \
1px solid #FF0000">'</span> <span style="color: #008000; font-weight: \
bold">before</span> <span style="border: 1px solid #FF0000">‘</span><span \
style="color: #666666">;</span><span style="border: 1px solid #FF0000">'</span> <span \
style="color: #008000; font-weight: bold">token</span> <span style="color: #008000; \
font-weight: bold">GDBusSignalInfo</span> <span style="color: \
#666666">**</span><span style="color: #008000; font-weight: bold">signals</span><span \
style="color: #666666">;</span> </pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">With the attached patch it builds fine.</p></pre> \
</td> </tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>dataengines/geolocation/CMakeLists.txt <span style="color: \
grey">(7a477c1)</span></li>
<li>dataengines/geolocation/geolocation.cpp <span style="color: \
grey">(678f25f)</span></li>
<li>dataengines/geolocation/geolocationprovider.cpp <span style="color: \
grey">(6db8026)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/123091/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
--===============6873315110855116925==--
[Attachment #3 (text/plain)]
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic