[SCM] kdeclarative packaging branch, kubuntu_unstable, updated. 47f9d2373fbc6a76abd0cce3e0320e653c108dbb

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 47f9d2373fbc6a76abd0cce3e0320e653c108dbb
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 13 17:50:18 2015 +0100

    drop patch, adopted upstream
---
 debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff | 35 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 36 deletions(-)

diff --git a/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff b/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
deleted file mode 100644
index 8c2a9c5..0000000
--- a/debian/patches/kubuntu_fix_epoxy_vs_qopengl.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-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/
-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.
- */
- 
--#include <epoxy/gl.h>
- #include "plotter.h"
- 
- #include <QGuiApplication>
-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>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6796296..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-kubuntu_fix_epoxy_vs_qopengl.diff

-- 
kdeclarative packaging