kubuntu-packaging

Merge ~gsilvapt/kubuntu-packaging/+git/dolphin:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/dolphin:kubuntu_unstable

  1. Git
  2. lp:~gsilvapt/kubuntu-packaging/+git/dolphin
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by Gustavo Silva
Status: Needs review
Proposed branch: ~gsilvapt/kubuntu-packaging/+git/dolphin:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/dolphin:kubuntu_unstable
Diff against target: 43 lines (+0/-32)
2 files modified
debian/patches/series (+0/-1)
dev/null (+0/-31)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+325805@code.launchpad.net

Description of the change

Remove upstream patch that was causing build failures.

To post a comment you must log in.

Unmerged commits

fe3e4bb... by Gustavo Silva

Remove patch that was causing build failures in KCI

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/patches/series b/debian/patches/series
2index dd0827a..e69de29 100644
3--- a/debian/patches/series
4+++ b/debian/patches/series
5@@ -1 +0,0 @@
6-upstream_fix_kfileitemmodel_test.diff
7diff --git a/debian/patches/upstream_fix_kfileitemmodel_test.diff b/debian/patches/upstream_fix_kfileitemmodel_test.diff
8deleted file mode 100644
9index 0f039c8..0000000
10--- a/debian/patches/upstream_fix_kfileitemmodel_test.diff
11+++ /dev/null
12@@ -1,31 +0,0 @@
13-From f6095c86c17be60e7f3b3ce1e02b40777600725e Mon Sep 17 00:00:00 2001
14-From: Elvis Angelaccio <elvis.angelaccio@kde.org>
15-Date: Wed, 10 May 2017 12:19:12 +0200
16-Subject: Fix kfileitemmodeltest
17-
18-Commit 6dcbb8127c introduced the isHidden role, update the test
19-accordingly.
20----
21- src/tests/kfileitemmodeltest.cpp | 3 ++-
22- 1 file changed, 2 insertions(+), 1 deletion(-)
23-
24-diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp
25-index 59ff630..b8e0895 100644
26---- a/src/tests/kfileitemmodeltest.cpp
27-+++ b/src/tests/kfileitemmodeltest.cpp
28-@@ -135,10 +135,11 @@ void KFileItemModelTest::cleanup()
29- void KFileItemModelTest::testDefaultRoles()
30- {
31- const QSet<QByteArray> roles = m_model->roles();
32-- QCOMPARE(roles.count(), 3);
33-+ QCOMPARE(roles.count(), 4);
34- QVERIFY(roles.contains("text"));
35- QVERIFY(roles.contains("isDir"));
36- QVERIFY(roles.contains("isLink"));
37-+ QVERIFY(roles.contains("isHidden"));
38- }
39-
40- void KFileItemModelTest::testDefaultSortRole()
41---
42-cgit v0.11.2
43-

Subscribers

People subscribed via source and target branches