commit: d125adf91da3a6a0e3f2e9bbc36ed842833a36e2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 31 20:57:16 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jan 31 20:57:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d125adf9
kde-frameworks/breeze-icons-rcc: Fix dupe tests Reported-by: Frank Krömmelbein <kroemmelbein <AT> gmx.de> Bug: https://bugs.gentoo.org/831587 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../breeze-icons-rcc-5.90.0.ebuild | 2 + .../breeze-icons-rcc-5.90.0-fix-dupe-tests.patch | 193 +++++++++++++++++++++ 2 files changed, 195 insertions(+) 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 index 98610eaa6083..a85058e7c6f3 100644 --- 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 @@ -23,6 +23,8 @@ BDEPEND="${PYTHON_DEPS} " DEPEND="test? ( dev-qt/qttest:5 )" +PATCHES=( "${FILESDIR}/${P}-fix-dupe-tests.patch" ) + python_check_deps() { has_version "dev-python/lxml[${PYTHON_USEDEP}]" } 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 new file mode 100644 index 000000000000..af066fda766b --- /dev/null +++ b/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch @@ -0,0 +1,193 @@ +From eb684892d7528cf4790cbcaf65b2fe1abda5e114 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <[email protected]> +Date: Tue, 4 Jan 2022 22:43:49 +0100 +Subject: [PATCH] Fix dupe tests by replacing icons with symlinks + +[1] introduced new icons which are apparently duplicates of already +existing icons and made the dupe test fail. + +[1] 9073eb1f7c34045930ac375e288827c29c0553fc +--- + icons/places/16/folder-book.svg | 14 +------------- + icons/places/16/folder-comic.svg | 14 +------------- + icons/places/16/folder-library.svg | 15 +-------------- + icons/places/22/folder-book.svg | 15 +-------------- + icons/places/22/folder-comic.svg | 15 +-------------- + icons/places/22/folder-library.svg | 15 +-------------- + 6 files changed, 6 insertions(+), 82 deletions(-) + mode change 100644 => 120000 icons/places/16/folder-book.svg + mode change 100644 => 120000 icons/places/16/folder-comic.svg + mode change 100644 => 120000 icons/places/16/folder-library.svg + mode change 100644 => 120000 icons/places/22/folder-book.svg + mode change 100644 => 120000 icons/places/22/folder-comic.svg + mode change 100644 => 120000 icons/places/22/folder-library.svg + +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg +deleted file mode 100644 +index eff7ce86..00000000 +--- a/icons/places/16/folder-book.svg ++++ /dev/null +@@ -1,13 +0,0 @@ +-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 16 16"> +- <defs id="defs3051"> +- <style type="text/css" id="current-color-scheme"> +- .ColorScheme-Text { +- color:#232629; +- } +- </style> +- </defs> +- <path style="fill:currentColor;fill-opacity:1;stroke:none" +- 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 " +- class="ColorScheme-Text" +- /> +-</svg> +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg +new file mode 120000 +index 00000000..328a27f3 +--- /dev/null ++++ b/icons/places/16/folder-book.svg +@@ -0,0 +1 @@ ++../../actions/16/address-book-new.svg +\ No newline at end of file +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg +deleted file mode 100644 +index e2f5c9f3..00000000 +--- a/icons/places/16/folder-comic.svg ++++ /dev/null +@@ -1,13 +0,0 @@ +-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 16 16"> +- <defs id="defs3051"> +- <style type="text/css" id="current-color-scheme"> +- .ColorScheme-Text { +- color:#232629; +- } +- </style> +- </defs> +- <path style="fill:currentColor;fill-opacity:1;stroke:none" +- 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 " +- class="ColorScheme-Text" +- /> +-</svg> +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg +new file mode 120000 +index 00000000..0725f950 +--- /dev/null ++++ b/icons/places/16/folder-comic.svg +@@ -0,0 +1 @@ ++../../actions/16/kmouth-phrasebook.svg +\ No newline at end of file +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg +deleted file mode 100644 +index d78dee94..00000000 +--- a/icons/places/16/folder-library.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";> +- <defs id="defs3051"> +- <style type="text/css" id="current-color-scheme"> +- .ColorScheme-Text { +- color:#232629; +- } +- </style> +- </defs> +-<path +- 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" +- style="fill:currentColor;fill-opacity:1;stroke:none" +- class="ColorScheme-Text" +- /> +-</svg> +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg +new file mode 120000 +index 00000000..1ce765df +--- /dev/null ++++ b/icons/places/16/folder-library.svg +@@ -0,0 +1 @@ ++../../actions/16/view-institution.svg +\ No newline at end of file +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg +deleted file mode 100644 +index d124463e..00000000 +--- a/icons/places/22/folder-book.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 22 22"> +- <defs id="defs3051"> +- <style type="text/css" id="current-color-scheme"> +- .ColorScheme-Text { +- color:#232629; +- } +- </style> +- </defs> +- <path +- style="fill:currentColor;fill-opacity:1;stroke:none" +- d="m5 3v1 1h-2v3h2v6h-2v3h2v2h1 13v-1-14-1h-14m1 1h2v14h-2v-14m3 0h9v14h-9v-14" +- class="ColorScheme-Text" +- /> +-</svg> +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg +new file mode 120000 +index 00000000..69db4d57 +--- /dev/null ++++ b/icons/places/22/folder-book.svg +@@ -0,0 +1 @@ ++../../actions/22/address-book-new.svg +\ No newline at end of file +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg +deleted file mode 100644 +index 75c26bc4..00000000 +--- a/icons/places/22/folder-comic.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 22 22"> +- <defs id="defs3051"> +- <style type="text/css" id="current-color-scheme"> +- .ColorScheme-Text { +- color:#232629; +- } +- </style> +- </defs> +- <path +- style="fill:currentColor;fill-opacity:1;stroke:none" +- 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 " +- class="ColorScheme-Text" +- /> +-</svg> +diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg +new file mode 120000 +index 00000000..097a5a84 +--- /dev/null ++++ b/icons/places/22/folder-comic.svg +@@ -0,0 +1 @@ ++../../actions/22/kmouth-phrasebook.svg +\ No newline at end of file +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg +deleted file mode 100644 +index d62c7ddf..00000000 +--- a/icons/places/22/folder-library.svg ++++ /dev/null +@@ -1,14 +0,0 @@ +-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 22 22"> +- <defs id="defs3051"> +- <style type="text/css" id="current-color-scheme"> +- .ColorScheme-Text { +- color:#232629; +- } +- </style> +- </defs> +- <path +- style="fill:currentColor;fill-opacity:1;stroke:none" +- 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 " +- class="ColorScheme-Text" +- /> +-</svg> +diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg +new file mode 120000 +index 00000000..d95f23aa +--- /dev/null ++++ b/icons/places/22/folder-library.svg +@@ -0,0 +1 @@ ++../../actions/22/view-institution.svg +\ No newline at end of file +-- +GitLab +
