Merge lp:~vanvugt/unity/fix-1036095 into lp:unity

[Daniel van Vugt]

Detect required package "libgeis", rather than waiting for cryptic build
failures. (LP: #1036095)

Detect required package "libgeis", rather than waiting for cryptic build
failures. (LP: #1036095)

Also include the header for nux::GestureEvent. A missing file is much nicer than inexplicable undefined types.

[Andrea Azzarone (azzar1)]

+#include <NuxGraphics/GestureEvent.h>

Why have you added this line? Nux/View.h uses a forward declaration for it IIRC.

review: Needs Information

[Sam Spilsbury (smspillaz)]

review: Approve

[Sam Spilsbury (smspillaz)]

> +#include <NuxGraphics/GestureEvent.h>
>
> Why have you added this line? Nux/View.h uses a forward declaration for it
> IIRC.

Whoops, approved the whole branch just before you added your comment. Put it back to needs review ... lets hope the automerger doesn't see it.

I think he's got this so that you'll immediately know if you're missing support for it, though it should probably go inside of the files that use it and not the header itself.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

andyrock: No, GestureEvent.h can be missing and never installed if you built Nux but forgot to install libgeis-dev first. So it's a useful check to ensure NuxGraphics/GestureEvent.h exists.

More generally you should always include the headers that define the types used in the current file.

[Daniel van Vugt (vanvugt)]

nux::GestureEvent is referred to in Launcher.h. Therefore GestureEvent.h should be included by Launcher.h

[Andrea Azzarone (azzar1)]

I prefer to use forward declaration as much as possible. Approve btw ;)

review: Approve

[Sam Spilsbury (smspillaz)]

review: Approve

[Michal Hruby (mhr3)]

Why don't we check the macro in nux that's defined when nux actually has gesture support? This makes unity unnecessarily compile and link against geis :/

review: Needs Fixing

[Michal Hruby (mhr3)]

Not to mention that it doesn't really fix the issue...

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-08-10 09:34:26 +0000
+++ CMakeLists.txt	2012-08-13 09:46:25 +0000
@@ -134,7 +134,7 @@
 # Compiz Plugins
 #
 
-set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.93.1")
+set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.93.1;libgeis")
 # FIXME: unity-protocol-private shouldn't be there, but building of unityshell is just broken
 set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.93.1")
 

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-08-03 09:39:01 +0000
+++ launcher/Launcher.h	2012-08-13 09:46:25 +0000
@@ -24,6 +24,7 @@
 #include <Nux/View.h>
 #include <Nux/BaseWindow.h>
 #include <Nux/TimerProc.h>
+#include <NuxGraphics/GestureEvent.h>
 #include <NuxGraphics/IOpenGLAsmShader.h>
 
 #include "PointerBarrier.h"