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

[Jakub Adam]

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

The following commit has been merged in the master branch:
commit b6c2128aa1c5877fcaca90ce1616245775315eee
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Jul 1 20:56:47 2015 +0200

    Remove patches included upstream
---
 debian/changelog              |  3 +++
 debian/patches/gldouble.patch | 33 ---------------------------------
 debian/patches/qsglayer.patch | 22 ----------------------
 debian/patches/series         |  2 --
 4 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67ab4ff..6cc703f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ gammaray (2.2.1-1) UNRELEASED; urgency=medium
     lintian error.
   * Disable build of Qt4 web inspector plugin since qtwebkit is to be removed
     from the repository (Closes: #784466).
+  * Remove patches included upstream:
+    - gldouble.patch
+    - qsglayer.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 07 Feb 2015 12:00:17 +0100
 
diff --git a/debian/patches/gldouble.patch b/debian/patches/gldouble.patch
deleted file mode 100644
index 9f0b38f..0000000
--- a/debian/patches/gldouble.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index a49d1ca..0000000
--- a/debian/patches/qsglayer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 a25056a..d2e8ae3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ fix-objectvisualizer-build.patch
 use-empty-rpath.patch
 disable-qt4-objectvisualizer.patch
 disable-qt4-webinspector.patch
-qsglayer.patch
-gldouble.patch

-- 
gammaray packaging