[SCM] qtgraphicaleffects packaging branch, experimental, updated. debian/5.6.1-3-8-g41fb0f5

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit b904774540216fa0a5603fe56ea0eeb578b2c243
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jul 12 14:10:39 2016 +0300

    Add a patch to import the module directly (test_import_module.diff).
---
 debian/changelog                       |  1 +
 debian/patches/series                  |  1 +
 debian/patches/test_import_module.diff | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 68b7daf..f74e84e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtgraphicaleffects-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.7.0.
   * Run the tests against installed module, to make them work.
+    - Add a patch to import the module directly (test_import_module.diff).
   * Drop unused pkg-kde-tools build-dependency.
   * Update debian/copyright.
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ef07768
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test_import_module.diff
diff --git a/debian/patches/test_import_module.diff b/debian/patches/test_import_module.diff
new file mode 100644
index 0000000..4dc3185
--- /dev/null
+++ b/debian/patches/test_import_module.diff
@@ -0,0 +1,32 @@
+Description: import module directly because we use custom import path
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2016-07-12
+
+--- a/tests/auto/tst_qtgraphicaleffects.cpp
++++ b/tests/auto/tst_qtgraphicaleffects.cpp
+@@ -86,23 +86,7 @@
+ 
+ void tst_qtgraphicaleffects::initTestCase()
+ {
+-    QString import;
+-
+-    // Allow the test to work whether or not the module is yet installed.
+-    if (QFile::exists(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/QtGraphicalEffects")) {
+-        // Module is installed - import it the nice way
+-        import = "QtGraphicalEffects";
+-    }
+-    else {
+-        // Module is not installed - import it from the source tree, by URI
+-        QString qmldir = QFINDTESTDATA("../../src/effects/qmldir");
+-        QVERIFY2(QFile::exists(qmldir), qPrintable(qmldir));
+-
+-        QUrl url = QUrl::fromLocalFile(QFileInfo(qmldir).canonicalPath());
+-        import = "\"" + url.toString() + "\"";
+-    }
+-
+-    importSelf = QString("import %1 1.0
").arg(import);
++    importSelf = QString("import QtGraphicalEffects");
+ }
+ 
+ 

-- 
qtgraphicaleffects packaging