Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kiconthemes/, kde-frameworks/kiconthemes/files/
Date: Mon, 22 Oct 2018 18:32:12
Message-Id: 1540233113.d88b4e52c06a53e43aef10f6f06990eaef67ba28.asturm@gentoo
1 commit: d88b4e52c06a53e43aef10f6f06990eaef67ba28
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 22 18:23:43 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 18:31:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88b4e52
7
8 kde-frameworks/kiconthemes: Fix runtime crash
9
10 See also:
11 https://mail.kde.org/pipermail/release-team/2018-October/011116.html
12
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14 Package-Manager: Portage-2.3.51, Repoman-2.3.11
15
16 .../files/kiconthemes-5.51.0-crashfix.patch | 24 +++++++++++++++++
17 .../kiconthemes/kiconthemes-5.51.0-r1.ebuild | 31 ++++++++++++++++++++++
18 2 files changed, 55 insertions(+)
19
20 diff --git a/kde-frameworks/kiconthemes/files/kiconthemes-5.51.0-crashfix.patch b/kde-frameworks/kiconthemes/files/kiconthemes-5.51.0-crashfix.patch
21 new file mode 100644
22 index 00000000000..2788c89aad8
23 --- /dev/null
24 +++ b/kde-frameworks/kiconthemes/files/kiconthemes-5.51.0-crashfix.patch
25 @@ -0,0 +1,24 @@
26 +From e0006451d5b03a9e15277ad9e7b1c8a74864b532 Mon Sep 17 00:00:00 2001
27 +From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@×××.org>
28 +Date: Mon, 8 Oct 2018 23:12:34 +0200
29 +Subject: Fixing a copy-paste error
30 +
31 +---
32 + src/kicondialog.cpp | 2 +-
33 + 1 file changed, 1 insertion(+), 1 deletion(-)
34 +
35 +diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp
36 +index 1f4193e..12ccb4f 100644
37 +--- a/src/kicondialog.cpp
38 ++++ b/src/kicondialog.cpp
39 +@@ -416,7 +416,7 @@ void KIconDialog::KIconDialogPrivate::_k_slotAcceptIcons()
40 + static bool sortByFileName(const QString &path1, const QString &path2)
41 + {
42 + const QString fileName1 = path1.mid(path1.lastIndexOf(QLatin1Char('/')) + 1);
43 +- const QString fileName2 = path2.mid(path1.lastIndexOf(QLatin1Char('/')) + 1);
44 ++ const QString fileName2 = path2.mid(path2.lastIndexOf(QLatin1Char('/')) + 1);
45 + return QString::compare(fileName1, fileName2, Qt::CaseInsensitive) < 0;
46 + }
47 +
48 +--
49 +cgit v0.11.2
50
51 diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.51.0-r1.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.51.0-r1.ebuild
52 new file mode 100644
53 index 00000000000..8b932fb7c06
54 --- /dev/null
55 +++ b/kde-frameworks/kiconthemes/kiconthemes-5.51.0-r1.ebuild
56 @@ -0,0 +1,31 @@
57 +# Copyright 1999-2018 Gentoo Authors
58 +# Distributed under the terms of the GNU General Public License v2
59 +
60 +EAPI=6
61 +
62 +VIRTUALX_REQUIRED="test"
63 +inherit kde5
64 +
65 +DESCRIPTION="Framework for icon theming and configuration"
66 +LICENSE="LGPL-2+"
67 +KEYWORDS="~amd64 ~arm ~arm64 ~x86"
68 +IUSE=""
69 +
70 +RDEPEND="
71 + $(add_frameworks_dep karchive)
72 + $(add_frameworks_dep kconfig)
73 + $(add_frameworks_dep kconfigwidgets)
74 + $(add_frameworks_dep kcoreaddons)
75 + $(add_frameworks_dep ki18n)
76 + $(add_frameworks_dep kitemviews)
77 + $(add_frameworks_dep kwidgetsaddons)
78 + $(add_qt_dep qtdbus)
79 + $(add_qt_dep qtgui)
80 + $(add_qt_dep qtsvg)
81 + $(add_qt_dep qtwidgets)
82 +"
83 +DEPEND="${RDEPEND}"
84 +
85 +RESTRICT+=" test" # bug 574770
86 +
87 +PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )