Merge lp:~sil2100/compiz/0.9.8_fix_ftbfs_arm into lp:compiz/0.9.8

[Łukasz Zemczak]

Fix FTBFS for ARM because of an unused variable.

- Problem:

FTBFS because of an unused variable.

- Fix:

Move the unused variable to the path where GLES is not used.

- Tests:

N/A

[Łukasz Zemczak (sil2100)]

Resubmitted the patch to the correct branch.

[Sam Spilsbury (smspillaz)]

Yep, thats fine.

review: Approve

=== modified file 'plugins/text/src/text.cpp'
--- plugins/text/src/text.cpp	2012-11-27 03:51:57 +0000
+++ plugins/text/src/text.cpp	2013-01-10 15:40:27 +0000
@@ -492,7 +492,6 @@
 	        float y,
 	        float alpha) const
 {
-    GLboolean  wasBlend;
     GLint      oldBlendSrc, oldBlendDst;
     GLushort        colorData[4];
     GLfloat         textureData[8];
@@ -509,6 +508,8 @@
     glGetIntegerv (GL_BLEND_SRC_ALPHA, &oldBlendSrcAlpha);
     glGetIntegerv (GL_BLEND_DST_ALPHA, &oldBlendDstAlpha);
 #else
+    GLboolean  wasBlend;
+
     glGetIntegerv (GL_BLEND_SRC, &oldBlendSrc);
     glGetIntegerv (GL_BLEND_DST, &oldBlendDst);