[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=7d3acbc

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

    Add kubuntu_fix_epoxy_vs_qopengl.diff in an attempt to fix armhf builds failing from conflicting typedefs between epoxy and qopengl
---
 debian/changelog                                 |  8 ++++++
 debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff | 33 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6ef7c8e..a882d24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeclarative (5.7.0-0ubuntu2) vivid; urgency=medium
+
+  * Add kubuntu_fix_epoxy_vs_qopengl.diff in an attempt to fix
+    armhf builds failing from conflicting typedefs between epoxy
+    and qopengl
+
+ -- Harald Sitter <sitter at kde.org>  Fri, 13 Feb 2015 16:11:45 +0100
+
 kdeclarative (5.7.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff b/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
new file mode 100644
index 0000000..f21a746
--- /dev/null
+++ b/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
@@ -0,0 +1,33 @@
+Description: fix epoxy include
+ epoxy defines GLdouble as double whereas qopengl defines it as float.
+ g++ doesn't like these conflicting typedefs.
+Author: Marco Martin <notmart at kde.org>
+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
+@@ -21,7 +21,6 @@
+  * Boston, MA 02110-1301, USA.
+ */
+ 
+-#include <epoxy/gl.h>
+ #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 @@
+ #ifndef PLASMA_PLOTTER_H
+ #define PLASMA_PLOTTER_H
+ 
++#include <epoxy/gl.h>
+ #include <QSGTexture>
+ #include <QSGSimpleTextureNode>
+ #include <QQuickItem>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6796296
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+kubuntu_fix_epoxy_vs_qopengl.diff

-- 
kdeclarative packaging