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/breeze-icons-rcc/files/, kde-frameworks/breeze-icons-rcc/
Date: Mon, 31 Jan 2022 20:57:47
Message-Id: 1643662650.d125adf91da3a6a0e3f2e9bbc36ed842833a36e2.asturm@gentoo
1 commit: d125adf91da3a6a0e3f2e9bbc36ed842833a36e2
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 31 20:57:16 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 31 20:57:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d125adf9
7
8 kde-frameworks/breeze-icons-rcc: Fix dupe tests
9
10 Reported-by: Frank Krömmelbein <kroemmelbein <AT> gmx.de>
11 Bug: https://bugs.gentoo.org/831587
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../breeze-icons-rcc-5.90.0.ebuild | 2 +
16 .../breeze-icons-rcc-5.90.0-fix-dupe-tests.patch | 193 +++++++++++++++++++++
17 2 files changed, 195 insertions(+)
18
19 diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild
20 index 98610eaa6083..a85058e7c6f3 100644
21 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild
22 +++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild
23 @@ -23,6 +23,8 @@ BDEPEND="${PYTHON_DEPS}
24 "
25 DEPEND="test? ( dev-qt/qttest:5 )"
26
27 +PATCHES=( "${FILESDIR}/${P}-fix-dupe-tests.patch" )
28 +
29 python_check_deps() {
30 has_version "dev-python/lxml[${PYTHON_USEDEP}]"
31 }
32
33 diff --git a/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch b/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch
34 new file mode 100644
35 index 000000000000..af066fda766b
36 --- /dev/null
37 +++ b/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch
38 @@ -0,0 +1,193 @@
39 +From eb684892d7528cf4790cbcaf65b2fe1abda5e114 Mon Sep 17 00:00:00 2001
40 +From: Heiko Becker <heirecka@×××××××.org>
41 +Date: Tue, 4 Jan 2022 22:43:49 +0100
42 +Subject: [PATCH] Fix dupe tests by replacing icons with symlinks
43 +
44 +[1] introduced new icons which are apparently duplicates of already
45 +existing icons and made the dupe test fail.
46 +
47 +[1] 9073eb1f7c34045930ac375e288827c29c0553fc
48 +---
49 + icons/places/16/folder-book.svg | 14 +-------------
50 + icons/places/16/folder-comic.svg | 14 +-------------
51 + icons/places/16/folder-library.svg | 15 +--------------
52 + icons/places/22/folder-book.svg | 15 +--------------
53 + icons/places/22/folder-comic.svg | 15 +--------------
54 + icons/places/22/folder-library.svg | 15 +--------------
55 + 6 files changed, 6 insertions(+), 82 deletions(-)
56 + mode change 100644 => 120000 icons/places/16/folder-book.svg
57 + mode change 100644 => 120000 icons/places/16/folder-comic.svg
58 + mode change 100644 => 120000 icons/places/16/folder-library.svg
59 + mode change 100644 => 120000 icons/places/22/folder-book.svg
60 + mode change 100644 => 120000 icons/places/22/folder-comic.svg
61 + mode change 100644 => 120000 icons/places/22/folder-library.svg
62 +
63 +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
64 +deleted file mode 100644
65 +index eff7ce86..00000000
66 +--- a/icons/places/16/folder-book.svg
67 ++++ /dev/null
68 +@@ -1,13 +0,0 @@
69 +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
70 +- <defs id="defs3051">
71 +- <style type="text/css" id="current-color-scheme">
72 +- .ColorScheme-Text {
73 +- color:#232629;
74 +- }
75 +- </style>
76 +- </defs>
77 +- <path style="fill:currentColor;fill-opacity:1;stroke:none"
78 +- d="M 3 2 L 3 3 L 3 4 L 2 4 L 2 6 L 3 6 L 3 10 L 2 10 L 2 12 L 3 12 L 3 13.5 L 3 14 L 14 14 L 14 13 L 14 3 L 14 2 L 3 2 z M 4 3 L 5 3 L 5 13 L 4 13 L 4 3 z M 6 3 L 13 3 L 13 13 L 6 13 L 6 3 z "
79 +- class="ColorScheme-Text"
80 +- />
81 +-</svg>
82 +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
83 +new file mode 120000
84 +index 00000000..328a27f3
85 +--- /dev/null
86 ++++ b/icons/places/16/folder-book.svg
87 +@@ -0,0 +1 @@
88 ++../../actions/16/address-book-new.svg
89 +\ No newline at end of file
90 +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
91 +deleted file mode 100644
92 +index e2f5c9f3..00000000
93 +--- a/icons/places/16/folder-comic.svg
94 ++++ /dev/null
95 +@@ -1,13 +0,0 @@
96 +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
97 +- <defs id="defs3051">
98 +- <style type="text/css" id="current-color-scheme">
99 +- .ColorScheme-Text {
100 +- color:#232629;
101 +- }
102 +- </style>
103 +- </defs>
104 +- <path style="fill:currentColor;fill-opacity:1;stroke:none"
105 +- d="M 5 2 L 5 5 L 2 5 L 2 11 L 5 14 L 5 11 L 10 11 L 10 8 L 11 8 L 11 11 L 14 8 L 14 2 L 5 2 z M 6 3 L 13 3 L 13 7 L 6 7 L 6 3 z M 3 6 L 5 6 L 5 8 L 9 8 L 9 10 L 3 10 L 3 6 z "
106 +- class="ColorScheme-Text"
107 +- />
108 +-</svg>
109 +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
110 +new file mode 120000
111 +index 00000000..0725f950
112 +--- /dev/null
113 ++++ b/icons/places/16/folder-comic.svg
114 +@@ -0,0 +1 @@
115 ++../../actions/16/kmouth-phrasebook.svg
116 +\ No newline at end of file
117 +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
118 +deleted file mode 100644
119 +index d78dee94..00000000
120 +--- a/icons/places/16/folder-library.svg
121 ++++ /dev/null
122 +@@ -1,14 +0,0 @@
123 +-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
124 +- <defs id="defs3051">
125 +- <style type="text/css" id="current-color-scheme">
126 +- .ColorScheme-Text {
127 +- color:#232629;
128 +- }
129 +- </style>
130 +- </defs>
131 +-<path
132 +- d="m8 2.0039062-6 3.8984376v1.0976562h1v6h-1v1h12v-1h-1v-6h1v-1.0976562zm0 1.1933594 4.310547 2.8027344h-8.6210939zm-4 3.8027344h1v6h-1zm2 0h4v6h-1v-2h-2v2h-1zm5 0h1v6h-1z"
133 +- style="fill:currentColor;fill-opacity:1;stroke:none"
134 +- class="ColorScheme-Text"
135 +- />
136 +-</svg>
137 +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
138 +new file mode 120000
139 +index 00000000..1ce765df
140 +--- /dev/null
141 ++++ b/icons/places/16/folder-library.svg
142 +@@ -0,0 +1 @@
143 ++../../actions/16/view-institution.svg
144 +\ No newline at end of file
145 +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
146 +deleted file mode 100644
147 +index d124463e..00000000
148 +--- a/icons/places/22/folder-book.svg
149 ++++ /dev/null
150 +@@ -1,14 +0,0 @@
151 +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
152 +- <defs id="defs3051">
153 +- <style type="text/css" id="current-color-scheme">
154 +- .ColorScheme-Text {
155 +- color:#232629;
156 +- }
157 +- </style>
158 +- </defs>
159 +- <path
160 +- style="fill:currentColor;fill-opacity:1;stroke:none"
161 +- d="m5 3v1 1h-2v3h2v6h-2v3h2v2h1 13v-1-14-1h-14m1 1h2v14h-2v-14m3 0h9v14h-9v-14"
162 +- class="ColorScheme-Text"
163 +- />
164 +-</svg>
165 +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
166 +new file mode 120000
167 +index 00000000..69db4d57
168 +--- /dev/null
169 ++++ b/icons/places/22/folder-book.svg
170 +@@ -0,0 +1 @@
171 ++../../actions/22/address-book-new.svg
172 +\ No newline at end of file
173 +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
174 +deleted file mode 100644
175 +index 75c26bc4..00000000
176 +--- a/icons/places/22/folder-comic.svg
177 ++++ /dev/null
178 +@@ -1,14 +0,0 @@
179 +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
180 +- <defs id="defs3051">
181 +- <style type="text/css" id="current-color-scheme">
182 +- .ColorScheme-Text {
183 +- color:#232629;
184 +- }
185 +- </style>
186 +- </defs>
187 +- <path
188 +- style="fill:currentColor;fill-opacity:1;stroke:none"
189 +- d="M 7 4 L 7 7 L 3 7 L 3 15 L 6 18 L 6 15 L 15 15 L 15 12 L 16 12 L 16 15 L 19 12 L 19 4 L 7 4 z M 8 5 L 18 5 L 18 11 L 15 11 L 14 11 L 8 11 L 8 8 L 8 7 L 8 5 z M 4 8 L 7 8 L 7 12 L 14 12 L 14 14 L 4 14 L 4 8 z "
190 +- class="ColorScheme-Text"
191 +- />
192 +-</svg>
193 +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
194 +new file mode 120000
195 +index 00000000..097a5a84
196 +--- /dev/null
197 ++++ b/icons/places/22/folder-comic.svg
198 +@@ -0,0 +1 @@
199 ++../../actions/22/kmouth-phrasebook.svg
200 +\ No newline at end of file
201 +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
202 +deleted file mode 100644
203 +index d62c7ddf..00000000
204 +--- a/icons/places/22/folder-library.svg
205 ++++ /dev/null
206 +@@ -1,14 +0,0 @@
207 +-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
208 +- <defs id="defs3051">
209 +- <style type="text/css" id="current-color-scheme">
210 +- .ColorScheme-Text {
211 +- color:#232629;
212 +- }
213 +- </style>
214 +- </defs>
215 +- <path
216 +- style="fill:currentColor;fill-opacity:1;stroke:none"
217 +- d="M 11 3 L 3 7.6230469 L 3 7.9980469 L 3 9 L 4 9 L 4 10 L 4 18 L 3 18 L 3 19 L 19 19 L 19 18 L 18 18 L 18 10 L 18 9 L 19 9 L 19 7.9980469 L 19 7.6230469 L 11 3 z M 11 4.15625 L 17.650391 7.9980469 L 4.3496094 7.9980469 L 11 4.15625 z M 5 9 L 7 9 L 7 10 L 7 18 L 5 18 L 5 10 L 5 9 z M 8 9 L 14 9 L 14 10 L 14 18 L 13 18 L 13 14 L 9 14 L 9 18 L 8 18 L 8 10 L 8 9 z M 15 9 L 17 9 L 17 10 L 17 18 L 15 18 L 15 10 L 15 9 z "
218 +- class="ColorScheme-Text"
219 +- />
220 +-</svg>
221 +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
222 +new file mode 120000
223 +index 00000000..d95f23aa
224 +--- /dev/null
225 ++++ b/icons/places/22/folder-library.svg
226 +@@ -0,0 +1 @@
227 ++../../actions/22/view-institution.svg
228 +\ No newline at end of file
229 +--
230 +GitLab
231 +