[SCM] kdeclarative packaging branch, kubuntu_vivid_archive, updated. 7f6db706a947ad936691e4249789a59efa54492f

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kdeclarative.git;a=commitdiff;h=7f6db70

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 7f6db706a947ad936691e4249789a59efa54492f
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 13 16:49:35 2015 +0100

    Refine kubuntu_fix_epoxy_vs_qopengl.diff to prevent Qt from doing a second typedef on GLdouble
---
 debian/changelog                                 |  7 +++++++
 debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff | 22 ++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a882d24..652e307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeclarative (5.7.0-0ubuntu3) vivid; urgency=medium
+
+  * Refine kubuntu_fix_epoxy_vs_qopengl.diff to prevent Qt from
+    doing a second typedef on GLdouble
+
+ -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 16:49:06 +0100
+
 kdeclarative (5.7.0-0ubuntu2) vivid; urgency=medium
 
   * Add kubuntu_fix_epoxy_vs_qopengl.diff in an attempt to fix
diff --git a/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff b/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
index f21a746..8c2a9c5 100644
--- a/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
+++ b/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
@@ -6,11 +6,10 @@ Origin: vendor
 Forwarded: no
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp b/src/qmlcontrols/kquickcontrolsa
-ddons/plotter.cpp
-index 43246c2..7c19a34 100644
---- a/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
-+++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
+Index: kdeclarative-5.7.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
+===================================================================
+--- kdeclarative-5.7.0.orig/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
++++ kdeclarative-5.7.0/src/qmlcontrols/kquickcontrolsaddons/plotter.cpp
 @@ -21,7 +21,6 @@
   * Boston, MA 02110-1301, USA.
  */
@@ -19,15 +18,18 @@ index 43246c2..7c19a34 100644
  #include "plotter.h"
  
  #include <QGuiApplication>
-diff --git a/src/qmlcontrols/kquickcontrolsaddons/plotter.h b/src/qmlcontrols/kquickcontrolsaddons/plotter.h
-index 0a787d2..23b84fc 100644
---- a/src/qmlcontrols/kquickcontrolsaddons/plotter.h
-+++ b/src/qmlcontrols/kquickcontrolsaddons/plotter.h
-@@ -23,6 +23,7 @@
+Index: kdeclarative-5.7.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h
+===================================================================
+--- kdeclarative-5.7.0.orig/src/qmlcontrols/kquickcontrolsaddons/plotter.h
++++ kdeclarative-5.7.0/src/qmlcontrols/kquickcontrolsaddons/plotter.h
+@@ -23,6 +23,10 @@
  #ifndef PLASMA_PLOTTER_H
  #define PLASMA_PLOTTER_H
  
 +#include <epoxy/gl.h>
++// Qt's qopenl.h redefines GLdouble to float on ARM. This causes conflicting
++// typedefs and results in build failure on ARM.
++#define GLdouble GLdouble
  #include <QSGTexture>
  #include <QSGSimpleTextureNode>
  #include <QQuickItem>

-- 
kdeclarative packaging