[SCM] gammaray packaging branch, master, updated. debian/2.1.0-5

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=273b3c5

The following commit has been merged in the master branch:
commit 273b3c53a50e1bbd7bf6515dc4e3aa6ecb422de2
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Jun 25 20:13:31 2015 +0200

    Apply changes from 2.1.0-3.1ubuntu2 by Dmitry Shachnev.
    
    * Apply changes from 2.1.0-3.1ubuntu2 by Dmitry Shachnev:
      - Backport one more upstream patch, to fix build on armhf.
      - Adapt to Qt 5.4 API changes (LP: #1395646).
---
 debian/changelog              |  8 ++++++++
 debian/patches/gldouble.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/qsglayer.patch | 22 ++++++++++++++++++++++
 debian/patches/series         |  2 ++
 4 files changed, 65 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 369bf29..470c35a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gammaray (2.1.0-5) unstable; urgency=medium
+
+  * Apply changes from 2.1.0-3.1ubuntu2 by Dmitry Shachnev:
+    - Backport one more upstream patch, to fix build on armhf.
+    - Adapt to Qt 5.4 API changes (LP: #1395646).
+
+ -- Felix Geyer <fgeyer at debian.org>  Thu, 25 Jun 2015 19:32:55 +0200
+
 gammaray (2.1.0-4) unstable; urgency=medium
 
   [ Felix Geyer ]
diff --git a/debian/patches/gldouble.patch b/debian/patches/gldouble.patch
new file mode 100644
index 0000000..9f0b38f
--- /dev/null
+++ b/debian/patches/gldouble.patch
@@ -0,0 +1,33 @@
+Description: fix build on armhf with Qt 5.4
+Origin: upstream, https://github.com/KDAB/GammaRay/commit/dddefcd0008776f1
+Last-Update: 2015-01-13
+
+--- a/plugins/quickinspector/geometryextension/sggeometrymodel.cpp
++++ b/plugins/quickinspector/geometryextension/sggeometrymodel.cpp
+@@ -90,7 +90,7 @@
+       return toStringList<uint>(index.internalPointer(), attrInfo->tupleSize).join(", ");
+     case GL_FLOAT:
+       return toStringList<float>(index.internalPointer(), attrInfo->tupleSize).join(", ");
+-#if GL_DOUBLE != GL_FLOAT
++#if defined(GL_DOUBLE) && GL_DOUBLE != GL_FLOAT
+     case GL_DOUBLE:
+       return toStringList<double>(index.internalPointer(), attrInfo->tupleSize).join(", ");
+ #endif
+@@ -130,7 +130,7 @@
+       return toVariantList<uint>(index.internalPointer(), attrInfo->tupleSize);
+     case GL_FLOAT:
+       return toVariantList<float>(index.internalPointer(), attrInfo->tupleSize);
+-#if GL_DOUBLE != GL_FLOAT
++#if defined(GL_DOUBLE) && GL_DOUBLE != GL_FLOAT
+     case GL_DOUBLE:
+       return toVariantList<double>(index.internalPointer(), attrInfo->tupleSize);
+ #endif
+@@ -214,7 +214,7 @@
+   case GL_FLOAT:
+     tupleItemSize = sizeof(float);
+     break;
+-#if GL_DOUBLE != GL_FLOAT
++#if defined(GL_DOUBLE) && GL_DOUBLE != GL_FLOAT
+   case GL_DOUBLE:
+     tupleItemSize = sizeof(double);
+     break;
diff --git a/debian/patches/qsglayer.patch b/debian/patches/qsglayer.patch
new file mode 100644
index 0000000..a49d1ca
--- /dev/null
+++ b/debian/patches/qsglayer.patch
@@ -0,0 +1,22 @@
+Description: adapt to Qt 5.4 API changes
+Origin: upstream, https://github.com/KDAB/GammaRay/commit/a10e2103f09cb471
+Bug: https://launchpad.net/bugs/1395646
+Last-Update: 2015-01-13
+
+--- a/plugins/quickinspector/quickinspector.cpp
++++ b/plugins/quickinspector/quickinspector.cpp
+@@ -358,9 +358,14 @@
+   const QSGTextureProvider *provider = m_source->textureProvider();
+   Q_ASSERT(provider);
+ 
++#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
+   const QQuickShaderEffectTexture *texture =
+     qobject_cast<QQuickShaderEffectTexture*>(provider->texture());
+   Q_ASSERT(texture);
++#else
++  const QSGLayer *texture = qobject_cast<QSGLayer*>(provider->texture());
++  Q_ASSERT(texture);
++#endif
+ 
+   QOpenGLContext *ctx =
+     QQuickItemPrivate::get(m_source)->sceneGraphRenderContext()->openglContext();
diff --git a/debian/patches/series b/debian/patches/series
index 10f35c1..5c5f6d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 debian-archs-fix-build.patch
+qsglayer.patch
+gldouble.patch

-- 
gammaray packaging