[SCM] qtsvg packaging branch, experimental, updated. debian/5.6.1-2-4-g0e90d64

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 307ce3f4acccb6ce2f5da29f1c4ac414475b4a45
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 9 15:52:15 2016 +0300

    Replace disable_qicon_test.diff patch with (forwarded) fix_qicon_diff.
    
    The new patch fixes the test instead of disabling it.
---
 debian/changelog                       |  2 ++
 debian/patches/disable_qicon_test.diff | 15 ---------------
 debian/patches/fix_qicon_test.diff     | 21 +++++++++++++++++++++
 debian/patches/series                  |  2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0181611..8b10bdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtsvg-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump Qt build-dependencies to 5.7.0.
+  * Replace disable_qicon_test.diff patch with (forwarded) fix_qicon_diff,
+    which fixes the test instead of disabling it.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Jul 2016 15:12:20 +0300
 
diff --git a/debian/patches/disable_qicon_test.diff b/debian/patches/disable_qicon_test.diff
deleted file mode 100644
index 8ea85f7..0000000
--- a/debian/patches/disable_qicon_test.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: disable test that needs qtsvg to be installed
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Forwarded: not-needed
-Last-Update: 2014-12-26
-
---- a/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
-@@ -4,7 +4,6 @@
-         qsvgdevice \
-         qsvggenerator \
-         qsvgrenderer \
--        qicon_svg \
-         cmake \
-         installed_cmake
- 
diff --git a/debian/patches/fix_qicon_test.diff b/debian/patches/fix_qicon_test.diff
new file mode 100644
index 0000000..5f059d1
--- /dev/null
+++ b/debian/patches/fix_qicon_test.diff
@@ -0,0 +1,21 @@
+Description: add correct library path for qicon_svg test
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: https://codereview.qt-project.org/164761
+Last-Update: 2016-07-09
+
+--- a/tests/auto/qicon_svg/qicon_svg.pro
++++ b/tests/auto/qicon_svg/qicon_svg.pro
+@@ -1,12 +1,11 @@
+ CONFIG += testcase
+ TARGET = tst_qicon_svg
+ 
+-QT += testlib gui-private
++QT += svg testlib gui-private
+ SOURCES += tst_qicon_svg.cpp
+ RESOURCES = tst_qicon_svg.qrc
+ 
+ wince* {
+-   QT += svg
+    DEPLOYMENT_PLUGIN += qsvg
+ }
+ TESTDATA += icons/*
diff --git a/debian/patches/series b/debian/patches/series
index c60d93d..a47a80d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-disable_qicon_test.diff
+fix_qicon_test.diff

-- 
qtsvg packaging