[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/
commit: 5fd1216b00df2f9deb676dae853ede558e03478a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 31 20:56:22 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 31 20:57:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd1216b kde-frameworks/breeze-icons: Fix dupe tests Reported-by: Frank Krömmelbein gmx.de> Bug: https://bugs.gentoo.org/831587 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../breeze-icons/breeze-icons-5.90.0.ebuild| 2 + .../files/breeze-icons-5.90.0-fix-dupe-tests.patch | 193 + 2 files changed, 195 insertions(+) diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild index 152a388fe1ee..9ff7256479ab 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild @@ -23,6 +23,8 @@ BDEPEND="${PYTHON_DEPS} test? ( app-misc/fdupes ) " +PATCHES=( "${FILESDIR}/${P}-fix-dupe-tests.patch" ) + python_check_deps() { has_version "dev-python/lxml[${PYTHON_USEDEP}]" } diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.90.0-fix-dupe-tests.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.90.0-fix-dupe-tests.patch new file mode 100644 index ..af066fda766b --- /dev/null +++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.90.0-fix-dupe-tests.patch @@ -0,0 +1,193 @@ +From eb684892d7528cf4790cbcaf65b2fe1abda5e114 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +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 => 12 icons/places/16/folder-book.svg + mode change 100644 => 12 icons/places/16/folder-comic.svg + mode change 100644 => 12 icons/places/16/folder-library.svg + mode change 100644 => 12 icons/places/22/folder-book.svg + mode change 100644 => 12 icons/places/22/folder-comic.svg + mode change 100644 => 12 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.. +--- a/icons/places/16/folder-book.svg /dev/null +@@ -1,13 +0,0 @@ +-http://www.w3.org/2000/svg; viewBox="0 0 16 16"> +- +- +- .ColorScheme-Text { +-color:#232629; +- } +- +- +- +- +diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg +new file mode 12 +index ..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.. +--- a/icons/places/16/folder-comic.svg /dev/null +@@ -1,13 +0,0 @@ +-http://www.w3.org/2000/svg; viewBox="0 0 16 16"> +- +- +- .ColorScheme-Text { +-color:#232629; +- } +- +- +- +- +diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg +new file mode 12 +index ..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.. +--- a/icons/places/16/folder-library.svg /dev/null +@@ -1,14 +0,0 @@ +-http://www.w3.org/2000/svg;> +- +- +- .ColorScheme-Text { +-color:#232629; +- } +- +- +- +- +diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg +new file mode 12 +index ..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.. +--- a/icons/places/22/folder-book.svg /dev/null +@@ -1,14 +0,0 @@ +-http://www.w3.org/2000/svg; viewBox="0 0 22 22"> +- +- +- .ColorScheme-Text { +-color:#232629; +- } +- +- +- +- +diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg +new file
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/
commit: 46e66ec519600c8fbd110a0bb93a02730ebf1757 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 15 10:36:52 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 15 11:28:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46e66ec5 kde-frameworks/breeze-icons: Upstream backport request See also: https://mail.kde.org/pipermail/distributions/2021-December/001100.html Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../breeze-icons/breeze-icons-5.89.0-r1.ebuild | 61 ++ .../breeze-icons-5.89.0-fix-icon_files-list.patch | 41 +++ 0-improv-install-of-light-fallback-icons.patch | 125 + 3 files changed, 227 insertions(+) diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild new file mode 100644 index ..86ca0137188a --- /dev/null +++ b/kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-2) +PYTHON_COMPAT=( python3_{8..10} ) +inherit cmake kde.org python-any-r1 xdg-utils + +DESCRIPTION="Breeze SVG icon theme" + +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-qt/qttest:5 )" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') + dev-qt/qtcore:5 + >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 + test? ( app-misc/fdupes ) +" + +PATCHES=( + "${FILESDIR}"/${P}-improv-install-of-light-fallback-icons.patch + "${FILESDIR}"/${P}-fix-icon_files-list.patch +) + +python_check_deps() { + has_version "dev-python/lxml[${PYTHON_USEDEP}]" +} + +src_prepare() { + cmake_src_prepare + use test || cmake_comment_add_subdirectory autotests +} + +src_configure() { + local mycmakeargs=( + -DPython_EXECUTABLE="${PYTHON}" + -DBINARY_ICONS_RESOURCE=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # bug 770988 + find "${ED}"/usr/share/icons/ -type d -empty -delete || die + find "${ED}"/usr/share/icons/ -xtype l -delete || die +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch new file mode 100644 index ..b294711e3aac --- /dev/null +++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch @@ -0,0 +1,41 @@ +From 08bf45db9b883b4201ac3cbb666821472f17ad97 Mon Sep 17 00:00:00 2001 +From: Rodney Dawes +Date: Mon, 6 Dec 2021 15:13:22 -0500 +Subject: [PATCH] Include "*@*" in the icon_files list for installation + +As some of the directories of the theme are symlinks for scaled sizes +we need to include them in the list of files to install as well. +--- + icons-dark/CMakeLists.txt | 2 +- + icons/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt +index ab582c13..6ceddc5c 100644 +--- a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt +@@ -22,7 +22,7 @@ if(NOT WIN32) + endif() + + if(NOT SKIP_INSTALL_ICONS) +-file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") ++file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*") + foreach (icon_file ${icon_files}) + install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) + endforeach() +diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt +index 8f31db4a..b48852eb 100644 +--- a/icons/CMakeLists.txt b/icons/CMakeLists.txt +@@ -23,7 +23,7 @@ endif() + + if(NOT SKIP_INSTALL_ICONS) + # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too +-file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") ++file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*") + set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE) + foreach (icon_file ${icon_files}) + install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) +-- +GitLab + diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch new file mode
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/
commit: 7da0b2832e16a611209ac691ebbcbf33d0ed216f Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 1 22:37:19 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 1 22:45:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da0b283 kde-frameworks/breeze-icons: Add image-missing icon to theme Hard to believe, but this made GTK applications crash. KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=428388 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> .../breeze-icons/breeze-icons-5.77.0-r1.ebuild | 43 ++ .../files/breeze-icons-5.77.0-image-missing.patch | 164 + 2 files changed, 207 insertions(+) diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.77.0-r1.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.77.0-r1.ebuild new file mode 100644 index 000..bb4f6fc78bc --- /dev/null +++ b/kde-frameworks/breeze-icons/breeze-icons-5.77.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PVCUT=$(ver_cut 1-2) +inherit cmake kde.org xdg-utils + +DESCRIPTION="Breeze SVG icon theme" +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="test" + +BDEPEND=" + dev-qt/qtcore:5 + >=kde-frameworks/extra-cmake-modules-${PVCUT}:5 + test? ( app-misc/fdupes ) +" +DEPEND="test? ( dev-qt/qttest:5 )" + +RESTRICT+=" !test? ( test )" + +PATCHES=( "${FILESDIR}/${P}-image-missing.patch" ) + +src_prepare() { + cmake_src_prepare + use test || cmake_comment_add_subdirectory autotests +} + +src_configure() { + local mycmakeargs=( + -DBINARY_ICONS_RESOURCE=OFF + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.77.0-image-missing.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.77.0-image-missing.patch new file mode 100644 index 000..ac283b4febd --- /dev/null +++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.77.0-image-missing.patch @@ -0,0 +1,164 @@ +From 408fe187d38ffa6d2883046c30a404062524e2a9 Mon Sep 17 00:00:00 2001 +From: Henry Heino +Date: Sat, 12 Dec 2020 16:37:48 -0800 +Subject: [PATCH] Add image-missing icon to theme + +Gtk expects an `image-missing` icon to be present. When not present, it +can cause applications to crash. +Fixes issue ID 428388. +--- + icons-dark/status/16/image-missing.svg | 11 ++ + icons-dark/status/22/image-missing.svg | 12 +++ + icons-dark/status/64/image-missing.svg | 28 ++ + icons/status/16/image-missing.svg | 11 ++ + icons/status/22/image-missing.svg | 12 +++ + icons/status/64/image-missing.svg | 28 ++ + 6 files changed, 102 insertions(+) + create mode 100644 icons-dark/status/16/image-missing.svg + create mode 100644 icons-dark/status/22/image-missing.svg + create mode 100644 icons-dark/status/64/image-missing.svg + create mode 100644 icons/status/16/image-missing.svg + create mode 100644 icons/status/22/image-missing.svg + create mode 100644 icons/status/64/image-missing.svg + +diff --git a/icons-dark/status/16/image-missing.svg b/icons-dark/status/16/image-missing.svg +new file mode 100644 +index ..16306dd7 +--- /dev/null b/icons-dark/status/16/image-missing.svg +@@ -0,0 +1,11 @@ ++http://www.w3.org/2000/svg;> ++ ++ .ColorScheme-NegativeText { ++ color:#da4453; ++ } ++ ++ ++ ++ ++ ++ +diff --git a/icons-dark/status/22/image-missing.svg b/icons-dark/status/22/image-missing.svg +new file mode 100644 +index ..6f386a60 +--- /dev/null b/icons-dark/status/22/image-missing.svg +@@ -0,0 +1,12 @@ ++http://www.w3.org/2000/svg;> ++ ++ ++.ColorScheme-NegativeText { ++color:#da4453; ++} ++ ++ ++ ++ ++ ++ +diff --git a/icons-dark/status/64/image-missing.svg b/icons-dark/status/64/image-missing.svg +new file mode 100644 +index ..4ddd57dd +--- /dev/null b/icons-dark/status/64/image-missing.svg +@@ -0,0 +1,28 @@ ++http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/icons/status/16/image-missing.svg b/icons/status/16/image-missing.svg +new file mode 100644 +index ..16306dd7 +--- /dev/null b/icons/status/16/image-missing.svg +@@ -0,0 +1,11 @@ ++http://www.w3.org/2000/svg;> ++ ++ .ColorScheme-NegativeText { ++ color:#da4453; ++ } ++ ++ ++ ++ ++ ++ +diff --git a/icons/status/22/image-missing.svg b/icons/status/22/image-missing.svg +new file mode 100644 +index ..6f386a60 +--- /dev/null