<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/124212/">https://git.reviewboard.kde.org/r/124212/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On Juni 30th, 2015, 8:30 vorm. UTC, <b>Kai Uwe Broulik</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">Doesn't build on OSX:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">[ 24%] Building CXX object src/CMakeFiles/KF5WindowSystem.dir/platforms/osx/kkeyserver_mac.cpp.o
[ 27%] Building CXX object src/CMakeFiles/KF5WindowSystem.dir/KF5WindowSystem_automoc.cpp.o
In file included from /Users/broulik/Documents/kf5/kwindowsystem/src/kkeyserver.cpp:23:
/Users/broulik/Documents/kf5/kwindowsystem/src/kkeyserver.h:34:10: fatal error: 'kkeyserver_mac.h' file not found</p>
<h1 style="font-size: 100%;text-rendering: inherit;padding: 0;white-space: normal;margin: 0;line-height: inherit;">include "kkeyserver_mac.h"</h1>
<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%"> ^
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">1 error generated.
make[2]: <strong style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"><em style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"> [src/CMakeFiles/KF5WindowSystem.dir/kkeyserver.cpp.o] Error 1
make[2]: </em></strong> Waiting for unfinished jobs....
/Users/broulik/Documents/kf5/kwindowsystem/src/platforms/osx/kkeyserver_mac.cpp:64:13: warning: unused variable
'lastLayoutID' [-Wunused-variable]
static long lastLayoutID = -1;
^
1 warning generated.
make[1]: <strong style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"><em style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;"> [src/CMakeFiles/KF5WindowSystem.dir/all] Error 2
make: </em></strong> [all] Error 2</p></pre>
</blockquote>
<p>On Juni 30th, 2015, 8:39 vorm. UTC, <b>Martin Gräßlin</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">did it build before?</p></pre>
</blockquote>
<p>On Juni 30th, 2015, 8:39 vorm. UTC, <b>Kai Uwe Broulik</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="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;">yes</p></pre>
</blockquote>
<p>On Juni 30th, 2015, 9:07 vorm. UTC, <b>Martin Gräßlin</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">can you please test with:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index adf1e34..0cbab72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,6 +46,7 @@ if (KWINDOWSYSTEM_HAVE_X11)
endif ()
if (APPLE)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/osx)
set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/osx/kkeyserver_mac.cpp
# kwindowsystem_mac.cpp
# FIXME: adjust kwindowinfo_mac to inherit from KWindowInfoPrivate
@@ -55,6 +56,7 @@ if (APPLE)
endif ()
if (WIN32)
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/windows)
set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/windows/kkeyserver_win.cpp
# kwindowsystem_win.cpp
# FIXME: adjust kwindowinfo_win to inherit from KWindowInfoPrivate</pre>
</blockquote>
</blockquote>
<pre style="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;">That fixes the build.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I now just get a warning about:
/Users/broulik/Documents/kf5/kwindowsystem/src/platforms/osx/kkeyserver_mac.cpp:64:13: warning: unused variable
'lastLayoutID' [-Wunused-variable]
static long lastLayoutID = -1;
^
1 warning generated.</p></pre>
<br />
<p>- Kai Uwe</p>
<br />
<p>On Juni 30th, 2015, 6:19 vorm. UTC, Martin Gräßlin wrote:</p>
<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 KDE Frameworks.</div>
<div>By Martin Gräßlin.</div>
<p style="color: grey;"><i>Updated Juni 30, 2015, 6:19 vorm.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kwindowsystem
</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;">In the src directory we introduce a platforms directory with a specific
* osx
* wayland
* windows
* xcb
sub directory. The platform specific source and header files are moved
into those directories.
This is a preparation step to move the platform specific behavior into
plugins which get loaded at runtime. Such a change is required to
support more platforms in future for which kwindowsystem cannot provide
support directly. An example is proper Wayland support on the Plasma
platform. It needs to provide its own implementationn which has to
differ from the generic Wayland implementation.</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;">compiles, installs and autotest pass on platform Linux/xcb</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>src/kxutils_p.h <span style="color: grey">()</span></li>
<li>src/netwm.h <span style="color: grey">()</span></li>
<li>src/netwm.cpp <span style="color: grey">()</span></li>
<li>src/netwm_p.h <span style="color: grey">()</span></li>
<li>src/platforms/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/platforms/osx/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/platforms/wayland/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/platforms/windows/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/platforms/xcb/CMakeLists.txt <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/kxutils.cpp <span style="color: grey">()</span></li>
<li>src/kxmessages.h <span style="color: grey">()</span></li>
<li>src/kxmessages.cpp <span style="color: grey">()</span></li>
<li>src/kxerrorhandler_p.h <span style="color: grey">()</span></li>
<li>src/kxerrorhandler.cpp <span style="color: grey">()</span></li>
<li>src/kwindowsystem_win.cpp <span style="color: grey">()</span></li>
<li>src/kwindowsystem_x11.cpp <span style="color: grey">()</span></li>
<li>src/kselectionowner.cpp <span style="color: grey">()</span></li>
<li>src/kselectionowner.h <span style="color: grey">()</span></li>
<li>src/kmanagerselection.h <span style="color: grey">()</span></li>
<li>src/kkeyserver_x11.cpp <span style="color: grey">()</span></li>
<li>src/kkeyserver_win.cpp <span style="color: grey">()</span></li>
<li>src/kkeyserver_x11.h <span style="color: grey">()</span></li>
<li>src/kkeyserver_win.h <span style="color: grey">()</span></li>
<li>src/kkeyserver_mac.cpp <span style="color: grey">()</span></li>
<li>src/fixx11h.h <span style="color: grey">()</span></li>
<li>src/kkeyserver_mac.h <span style="color: grey">()</span></li>
<li>src/CMakeLists.txt <span style="color: grey">(ff2ce392ecd7969eb94543528c7a670ea0fcd870)</span></li>
<li>autotests/CMakeLists.txt <span style="color: grey">(dda0af259b292ee5e526bb9166811fc1b376f388)</span></li>
<li>src/kwindowsystem_wayland.cpp <span style="color: grey">()</span></li>
<li>src/kwindowsystem_p_x11.h <span style="color: grey">()</span></li>
<li>src/kwindowsystem_p_wayland.h <span style="color: grey">()</span></li>
<li>src/kwindowsystem_mac.cpp <span style="color: grey">()</span></li>
<li>src/kwindowsystem.cpp <span style="color: grey">(789132e1b4883dd54218d29af9710dedfe6218e1)</span></li>
<li>src/kwindowinfo_x11.cpp <span style="color: grey">()</span></li>
<li>src/kwindowinfo_p_x11.h <span style="color: grey">()</span></li>
<li>src/kwindowinfo_win.cpp <span style="color: grey">()</span></li>
<li>src/kwindowinfo_mac_p.h <span style="color: grey">()</span></li>
<li>src/kwindowinfo_mac.cpp <span style="color: grey">()</span></li>
<li>src/kselectionwatcher.cpp <span style="color: grey">()</span></li>
<li>src/kwindoweffects_x11.cpp <span style="color: grey">()</span></li>
<li>src/kselectionwatcher.h <span style="color: grey">()</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/124212/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>