* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/
@ 2021-01-01 22:45 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-01-01 22:45 UTC (permalink / raw
To: gentoo-commits
commit: 7da0b2832e16a611209ac691ebbcbf33d0ed216f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 22:37:19 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 22:45:33 2021 +0000
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 <asturm <AT> 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 00000000000..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 00000000000..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 <personalizedrefrigerator@gmail.com>
+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 00000000..16306dd7
+--- /dev/null
++++ b/icons-dark/status/16/image-missing.svg
+@@ -0,0 +1,11 @@
++<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
++ <defs>
++ <style id="current-color-scheme" type="text/css">.ColorScheme-NegativeText {
++ color:#da4453;
++ }</style>
++ </defs>
++ <g transform="translate(-326 -534.36)">
++ <path class="ColorScheme-NegativeText" d="m328 536.36v12h12v-12zm1 1h10v10h-10z" fill="currentColor"/>
++ <path d="m336.52 539.25a4 4 45 0 0-5.5367 0.48199 4 4 45 0 0 0.28865 5.5505 4 4 45 0 0 5.5574-0.0967l0.3646-0.41985a4 4 45 0 0-0.67396-5.516zm-0.39361 0.99022a3 3 45 0 1 0.31765 3.8532l-4.1404-4.1404a3 3 45 0 1 3.8228 0.28726zm-4.5299 0.41985 4.1018 4.1018a3 3 45 0 1-3.8228-0.28726 3 3 45 0 1-0.27897-3.8145z" class="ColorScheme-NegativeText" fill="currentColor"/>
++ </g>
++</svg>
+diff --git a/icons-dark/status/22/image-missing.svg b/icons-dark/status/22/image-missing.svg
+new file mode 100644
+index 00000000..6f386a60
+--- /dev/null
++++ b/icons-dark/status/22/image-missing.svg
+@@ -0,0 +1,12 @@
++<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
++ <defs id="defs1">
++ <style type="text/css" id="current-color-scheme">
++ .ColorScheme-NegativeText {
++ color:#da4453;
++ }
++ </style>
++ </defs>
++ <g transform="translate(-326 -534.36)">
++ <path transform="translate(326 534.36)" d="m3 5v13h16v-13zm1 1h14v11h-14zm6.4883 0.58398a5.0356 4.8826 0 0 0-4.498 5.1953 5.0356 4.8826 0 0 0 5.1973 4.541 5.0356 4.8826 0 0 0 4.8613-4.8809l-0.048828-0.67578a5.0356 4.8826 0 0 0-5.5117-4.1797zm0.09375 0.96289a4.013 3.9098 0 0 1 4.3926 3.3477l0.03906 0.54102a4.013 3.9098 0 0 1-0.93359 2.5059l-5.5195-5.5215a4.013 3.9098 0 0 1 2.0215-0.87305zm-2.7559 1.5527 5.5078 5.5098a4.013 3.9098 0 0 1-2.1953 0.73438 4.013 3.9098 0 0 1-4.1426-3.6367 4.013 3.9098 0 0 1 0.83008-2.6074z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText"/>
++ </g>
++</svg>
+diff --git a/icons-dark/status/64/image-missing.svg b/icons-dark/status/64/image-missing.svg
+new file mode 100644
+index 00000000..4ddd57dd
+--- /dev/null
++++ b/icons-dark/status/64/image-missing.svg
+@@ -0,0 +1,28 @@
++<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
++ <defs>
++ <linearGradient id="a" x2="0" y1="392.36" y2="336.36" gradientTransform="translate(-47.987-332.35)" gradientUnits="userSpaceOnUse">
++ <stop stop-color="#fff" stop-opacity="0" offset="0"/>
++ <stop stop-color="#fff" stop-opacity=".2" offset="1"/>
++ </linearGradient>
++ <linearGradient id="b" x1="40" x2="54" y1="17" y2="31" gradientTransform="translate(.013.016)" gradientUnits="userSpaceOnUse">
++ <stop stop-color="#060606" offset="0"/>
++ <stop stop-opacity="0" offset="1"/>
++ </linearGradient>
++ <path id="c" d="m10.01 61.02v-58h30l14 14v44h-14z"/>
++ <radialGradient id="radialGradient11997" cx="16.5" cy="26.5" r="11.5" gradientTransform="matrix(.9167 .91383 -.9167 .91383 41.189 -4.0389)" gradientUnits="userSpaceOnUse">
++ <stop stop-color="#da4453" offset="0"/>
++ <stop stop-color="#da4453" offset="1"/>
++ </radialGradient>
++ </defs>
++ <use fill="#cccccc" xlink:href="#c"/>
++ <g transform="scale(1-1)" color="#000000" color-rendering="auto" image-rendering="auto" shape-rendering="auto" text-rendering="auto">
++ <rect x="10.01" y="-4.02" width="30" height="1" fill="#fff" opacity=".5"/>
++ <rect x="10.01" y="-61.02" width="44" height="1" opacity=".25"/>
++ </g>
++ <g fill-rule="evenodd">
++ <path d="m54.01 17.02-14-14v14z" fill="#fff" opacity=".5"/>
++ <path d="m40.01 17.02 14 14v-14z" fill="url(#b)" opacity=".2"/>
++ </g>
++ <use fill="url(#a)" xlink:href="#c"/>
++ <path d="m42.564 24.747a14.909 14.862 0 0 0-21.084 0 14.909 14.862 0 0 0 0 21.018 14.909 14.862 0 0 0 21.084 0 14.909 14.862 0 0 0 0-21.018zm-2.7125 2.8147a10.942 10.994 65.686 0 1 1.2264 13.98l-15.199-15.151a10.942 10.994 65.686 0 1 13.973 1.1708zm-16.724 1.5689 15.151 15.103a10.942 10.994 65.686 0 1-13.99-1.1566 10.942 10.994 65.686 0 1-1.1602-13.947z" fill="url(#radialGradient11997)" stroke-width="1.2944"/>
++</svg>
+diff --git a/icons/status/16/image-missing.svg b/icons/status/16/image-missing.svg
+new file mode 100644
+index 00000000..16306dd7
+--- /dev/null
++++ b/icons/status/16/image-missing.svg
+@@ -0,0 +1,11 @@
++<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
++ <defs>
++ <style id="current-color-scheme" type="text/css">.ColorScheme-NegativeText {
++ color:#da4453;
++ }</style>
++ </defs>
++ <g transform="translate(-326 -534.36)">
++ <path class="ColorScheme-NegativeText" d="m328 536.36v12h12v-12zm1 1h10v10h-10z" fill="currentColor"/>
++ <path d="m336.52 539.25a4 4 45 0 0-5.5367 0.48199 4 4 45 0 0 0.28865 5.5505 4 4 45 0 0 5.5574-0.0967l0.3646-0.41985a4 4 45 0 0-0.67396-5.516zm-0.39361 0.99022a3 3 45 0 1 0.31765 3.8532l-4.1404-4.1404a3 3 45 0 1 3.8228 0.28726zm-4.5299 0.41985 4.1018 4.1018a3 3 45 0 1-3.8228-0.28726 3 3 45 0 1-0.27897-3.8145z" class="ColorScheme-NegativeText" fill="currentColor"/>
++ </g>
++</svg>
+diff --git a/icons/status/22/image-missing.svg b/icons/status/22/image-missing.svg
+new file mode 100644
+index 00000000..6f386a60
+--- /dev/null
++++ b/icons/status/22/image-missing.svg
+@@ -0,0 +1,12 @@
++<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
++ <defs id="defs1">
++ <style type="text/css" id="current-color-scheme">
++ .ColorScheme-NegativeText {
++ color:#da4453;
++ }
++ </style>
++ </defs>
++ <g transform="translate(-326 -534.36)">
++ <path transform="translate(326 534.36)" d="m3 5v13h16v-13zm1 1h14v11h-14zm6.4883 0.58398a5.0356 4.8826 0 0 0-4.498 5.1953 5.0356 4.8826 0 0 0 5.1973 4.541 5.0356 4.8826 0 0 0 4.8613-4.8809l-0.048828-0.67578a5.0356 4.8826 0 0 0-5.5117-4.1797zm0.09375 0.96289a4.013 3.9098 0 0 1 4.3926 3.3477l0.03906 0.54102a4.013 3.9098 0 0 1-0.93359 2.5059l-5.5195-5.5215a4.013 3.9098 0 0 1 2.0215-0.87305zm-2.7559 1.5527 5.5078 5.5098a4.013 3.9098 0 0 1-2.1953 0.73438 4.013 3.9098 0 0 1-4.1426-3.6367 4.013 3.9098 0 0 1 0.83008-2.6074z" style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-NegativeText"/>
++ </g>
++</svg>
+diff --git a/icons/status/64/image-missing.svg b/icons/status/64/image-missing.svg
+new file mode 100644
+index 00000000..4ddd57dd
+--- /dev/null
++++ b/icons/status/64/image-missing.svg
+@@ -0,0 +1,28 @@
++<svg version="1.1" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
++ <defs>
++ <linearGradient id="a" x2="0" y1="392.36" y2="336.36" gradientTransform="translate(-47.987-332.35)" gradientUnits="userSpaceOnUse">
++ <stop stop-color="#fff" stop-opacity="0" offset="0"/>
++ <stop stop-color="#fff" stop-opacity=".2" offset="1"/>
++ </linearGradient>
++ <linearGradient id="b" x1="40" x2="54" y1="17" y2="31" gradientTransform="translate(.013.016)" gradientUnits="userSpaceOnUse">
++ <stop stop-color="#060606" offset="0"/>
++ <stop stop-opacity="0" offset="1"/>
++ </linearGradient>
++ <path id="c" d="m10.01 61.02v-58h30l14 14v44h-14z"/>
++ <radialGradient id="radialGradient11997" cx="16.5" cy="26.5" r="11.5" gradientTransform="matrix(.9167 .91383 -.9167 .91383 41.189 -4.0389)" gradientUnits="userSpaceOnUse">
++ <stop stop-color="#da4453" offset="0"/>
++ <stop stop-color="#da4453" offset="1"/>
++ </radialGradient>
++ </defs>
++ <use fill="#cccccc" xlink:href="#c"/>
++ <g transform="scale(1-1)" color="#000000" color-rendering="auto" image-rendering="auto" shape-rendering="auto" text-rendering="auto">
++ <rect x="10.01" y="-4.02" width="30" height="1" fill="#fff" opacity=".5"/>
++ <rect x="10.01" y="-61.02" width="44" height="1" opacity=".25"/>
++ </g>
++ <g fill-rule="evenodd">
++ <path d="m54.01 17.02-14-14v14z" fill="#fff" opacity=".5"/>
++ <path d="m40.01 17.02 14 14v-14z" fill="url(#b)" opacity=".2"/>
++ </g>
++ <use fill="url(#a)" xlink:href="#c"/>
++ <path d="m42.564 24.747a14.909 14.862 0 0 0-21.084 0 14.909 14.862 0 0 0 0 21.018 14.909 14.862 0 0 0 21.084 0 14.909 14.862 0 0 0 0-21.018zm-2.7125 2.8147a10.942 10.994 65.686 0 1 1.2264 13.98l-15.199-15.151a10.942 10.994 65.686 0 1 13.973 1.1708zm-16.724 1.5689 15.151 15.103a10.942 10.994 65.686 0 1-13.99-1.1566 10.942 10.994 65.686 0 1-1.1602-13.947z" fill="url(#radialGradient11997)" stroke-width="1.2944"/>
++</svg>
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/
@ 2021-12-15 11:28 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-12-15 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 46e66ec519600c8fbd110a0bb93a02730ebf1757
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 10:36:52 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 11:28:05 2021 +0000
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 <asturm <AT> 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 000000000000..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 000000000000..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 <dobey.pwns@gmail.com>
+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 100644
index 000000000000..30bc17dd60be
--- /dev/null
+++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch
@@ -0,0 +1,125 @@
+From 05f11af435edc57650d0221ed8a74ecfb997e576 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Mon, 6 Dec 2021 18:12:46 +0000
+Subject: [PATCH] improve installation of light fallback icons
+
+icon install works now like this:
+
+* collect all light icons
+* install them just for light theme
+
+* install dark icons
+* install all missing ones from light theme we collected before
+---
+ icons-dark/CMakeLists.txt | 45 +++++++++++----------------------------
+ icons/CMakeLists.txt | 18 ++++++----------
+ 2 files changed, 20 insertions(+), 43 deletions(-)
+
+diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt
+index 40590a8b..ab582c13 100644
+--- a/icons-dark/CMakeLists.txt
++++ b/icons-dark/CMakeLists.txt
+@@ -4,10 +4,6 @@ endif()
+
+ ########### install files ###############
+
+-set(breeze_icon_dark_dirs
+- actions animations applets apps devices emblems
+- mimetypes places status)
+-
+ set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze-dark)
+
+ if(WITH_ICON_GENERATION)
+@@ -26,36 +22,21 @@ if(NOT WIN32)
+ endif()
+
+ if(NOT SKIP_INSTALL_ICONS)
+- # In order to ensure the dark icons are copied over the light icons which
+- # are installed into the dark theme for BUG:444095, we need to execute the
+- # copy command ourselves rather than using CMake's internal copy mechanism
+- # used by the normal install command, so we use CODE mode of install to
+- # execute_process and print an appropriate status message.
+- # See https://bugs.kde.org/show_bug.cgi?id=445489
+- set(COPY_CMD "cp -a")
+- set(XCOPY_ARGS "")
+- if(WIN32)
+- set(COPY_CMD "xcopy")
+- set(XCOPY_ARGS "/q /e /y")
+- endif(WIN32)
+- install(CODE "cmake_policy(VERSION 3.6)
+- foreach(CAT_DIR ${breeze_icon_dark_dirs})
+- execute_process(COMMAND ${COPY_CMD} \${CAT_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+- endforeach()
+- file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/*.svg)
+- foreach(ICON_FILE IN LISTS ICON_FILES)
+- message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\")
+- endforeach()")
++ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg")
++ foreach (icon_file ${icon_files})
++ install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
++ endforeach()
++
++ # install for all missing icons the light icons as fallback
++ foreach (icon_file ${BREEZE_LIGHT_ICONS})
++ if (NOT ${icon_file} IN_LIST icon_files)
++ install(FILES ${CMAKE_SOURCE_DIR}/icons/${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
++ endif()
++ endforeach()
++
+ install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+ if(WITH_ICON_GENERATION)
+- install(CODE "cmake_policy(VERSION 3.6)
+- foreach(GEN_DIR ${breeze_icon_dark_dirs})
+- execute_process(COMMAND ${COPY_CMD} \${GEN_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated)
+- endforeach()
+- file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/generated LIST_DIRECTORIES false ${CMAKE_CURRENT_BINARY_DIR}/generated/*.svg)
+- foreach(ICON_FILE IN LISTS ICON_FILES)
+- message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\")
+- endforeach()")
++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR})
+ endif()
+ endif()
+
+diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
+index 220b81e9..8f31db4a 100644
+--- a/icons/CMakeLists.txt
++++ b/icons/CMakeLists.txt
+@@ -4,10 +4,6 @@ endif()
+
+ ########### install files ###############
+
+-set(breeze_icon_dirs
+- actions animations applets apps categories preferences devices emblems
+- emotes mimetypes places status)
+-
+ set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze)
+
+ if(WITH_ICON_GENERATION)
+@@ -26,17 +22,17 @@ if(NOT WIN32)
+ endif()
+
+ if(NOT SKIP_INSTALL_ICONS)
+- install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR})
++ # 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")
++ set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE)
++ foreach (icon_file ${icon_files})
++ install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file})
++ endforeach()
++
+ install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR})
+ if(WITH_ICON_GENERATION)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR})
+ endif()
+-
+- # Install the colored icon sizes into breeze-dark theme as well, to ensure
+- # that icons are available on alternate environments which do not support
+- # colorized symbolic icons which are not named as "-symbolic"
+- # NOTE: icons-dark will install /some/ files over top of these
+- install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR}-dark)
+ endif()
+
+ gtk_update_icon_cache(${BREEZE_INSTALL_DIR})
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/
@ 2022-01-31 20:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-01-31 20:57 UTC (permalink / raw
To: gentoo-commits
commit: 5fd1216b00df2f9deb676dae853ede558e03478a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 20:56:22 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 20:57:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd1216b
kde-frameworks/breeze-icons: 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/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 000000000000..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 <heirecka@exherbo.org>
+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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-31 20:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-15 11:28 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/breeze-icons/files/, kde-frameworks/breeze-icons/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-01-31 20:57 Andreas Sturmlechner
2021-01-01 22:45 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox