[SCM] qt3d packaging branch, experimental, updated. debian/5.7.1+dfsg-2-30-gd427b89

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=a9ede8f

The following commit has been merged in the experimental branch:
commit a9ede8faebac17995d454a25a0c91cca5fef726d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 15 15:28:03 2017 +0300

    Disable code which was using the removed non-free assets.
---
 debian/changelog                      |  1 +
 debian/patches/nonfree_resources.diff | 46 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 48 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 61ee54f..09802f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ qt3d-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   * Override false positive Lintian license-problem-json-evil error.
   * Bump Qt build-dependencies to 5.9.1.
   * Remove some non-free example assets from the tarball.
+    - Disable code which was using them (nonfree_resources.diff).
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
diff --git a/debian/patches/nonfree_resources.diff b/debian/patches/nonfree_resources.diff
new file mode 100644
index 0000000..932182f
--- /dev/null
+++ b/debian/patches/nonfree_resources.diff
@@ -0,0 +1,46 @@
+Description: disable code which is using resources not in DFSG tarball
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2017-07-15
+
+--- a/examples/qt3d/exampleresources/obj.qrc
++++ b/examples/qt3d/exampleresources/obj.qrc
+@@ -1,8 +1,5 @@
+ <RCC>
+     <qresource prefix="/">
+-        <file>assets/textures/pattern_09/specular.webp</file>
+-        <file>assets/textures/pattern_09/normal.webp</file>
+-        <file>assets/textures/pattern_09/diffuse.webp</file>
+         <file>assets/obj/trefoil.obj</file>
+         <file>assets/obj/toyplane.obj</file>
+         <file>assets/obj/ball.obj</file>
+--- a/examples/qt3d/qt3d.pro
++++ b/examples/qt3d/qt3d.pro
+@@ -6,15 +6,12 @@
+     multiviewport \
+     wireframe \
+     shadow-map-qml \
+-    materials \
+     wave \
+-    materials-cpp \
+     scene3d \
+     controls \
+     anaglyph-rendering \
+     planets-qml \
+     instanced-arrays-qml \
+-    lights \
+     compute-particles \
+     3d-text \
+     qardboard \
+--- a/tests/tests.pro
++++ b/tests/tests.pro
+@@ -1,8 +1,7 @@
+ TEMPLATE = subdirs
+ 
+ !package: SUBDIRS += \
+-                auto \
+-                manual
++                auto
+ 
+ # Benchmarks make sense in release mode only.
+ # Disable them for code coverage.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..30c7a2c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+nonfree_resources.diff

-- 
qt3d packaging