[SCM] plasma-framework packaging branch, master, updated. debian/5.19.0-1-9-g69b5e50

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=69b5e50

The following commit has been merged in the master branch:
commit 69b5e50924ffbea87d496dddbf1b12d9f45fe61f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Apr 7 14:11:32 2016 +0200

    Add new patch: upstream_fix_iconitem_test.patch
---
 debian/patches/series                           |  1 +
 debian/patches/upstream_fix_iconitem_test.patch | 42 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..242f10c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix_iconitem_test.patch
diff --git a/debian/patches/upstream_fix_iconitem_test.patch b/debian/patches/upstream_fix_iconitem_test.patch
new file mode 100644
index 0000000..2d0f226
--- /dev/null
+++ b/debian/patches/upstream_fix_iconitem_test.patch
@@ -0,0 +1,42 @@
+commit ab302872d300158a590af841bb890392d11489be
+Author: David Rosca <nowrep at gmail.com>
+Date:   Sun Mar 6 16:13:54 2016 +0100
+
+    Fix iconitem test - second try
+
+diff --git a/autotests/data/icons/test-theme/index.theme b/autotests/data/icons/test-theme/index.theme
+index 52a7275..5eaeff3 100644
+--- a/autotests/data/icons/test-theme/index.theme
++++ b/autotests/data/icons/test-theme/index.theme
+@@ -3,8 +3,6 @@ Name=Unittest Theme
+ 
+ DisplayDepth=32
+ 
+-Inherits=breeze
+-
+ DesktopDefault=48
+ DesktopSizes=16,22,32,48,64,128,256
+ ToolbarDefault=22
+@@ -21,7 +19,7 @@ DialogSizes=16,22,32,48,64,128,256
+ ########## Directories
+ ########## ordered by category and alphabetically
+ 
+-Directories=apps/22,apps/32
++Directories=apps/22,apps/32,apps/48
+ 
+ [apps/22]
+ Size=22
+diff --git a/autotests/iconitemtest.cpp b/autotests/iconitemtest.cpp
+index 5853f74..ae825a9 100644
+--- a/autotests/iconitemtest.cpp
++++ b/autotests/iconitemtest.cpp
+@@ -61,6 +61,9 @@ void IconItemTest::initTestCase()
+ 
+     QFile::remove(configPath);
+ 
++    QIcon::setThemeSearchPaths({QFINDTESTDATA("data/icons")});
++    QIcon::setThemeName("test-theme");
++
+     KConfigGroup cg(KSharedConfig::openConfig(), "Icons");
+     cg.writeEntry("Theme", "test-theme");
+     KConfigGroup plasmaConfig(KSharedConfig::openConfig("plasmarc"), "Theme");

-- 
plasma-framework packaging