From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- kde-frameworks/breeze-icons/Manifest | 6 +- .../breeze-icons/breeze-icons-5.89.0-r1.ebuild | 62 ---------- .../breeze-icons/breeze-icons-5.90.0.ebuild | 56 +++++++++ .../breeze-icons-5.89.0-fix-icon_files-list.patch | 41 ------- ....0-improv-install-of-light-fallback-icons.patch | 125 --------------------- 5 files changed, 58 insertions(+), 232 deletions(-) delete mode 100644 kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild create mode 100644 kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild delete mode 100644 kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch delete mode 100644 kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch (limited to 'kde-frameworks/breeze-icons') diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest index 6803704bef9a..ad84906b5020 100644 --- a/kde-frameworks/breeze-icons/Manifest +++ b/kde-frameworks/breeze-icons/Manifest @@ -1,7 +1,5 @@ -AUX breeze-icons-5.89.0-fix-icon_files-list.patch 1874 BLAKE2B f48ac134cf679352ecc55363a240417689daa23ec9bf218057384aefb023f08460bcb637bec9f9012d912ba1a0fba1de6c0a7f602e21837c219f719a75b7d9c1 SHA512 65acda0f37c4a965080d9452408a299f3f9d12b54ec7a725d2377ff485149a69e2fe606b08cadcb1cbf4b89bca3346c9fd9c05da400df2653d72c0df16461af9 -AUX breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch 5390 BLAKE2B c02023feb187d231295860f9b8e7113006019a97edd1d879707b8126964ea642a70f5f5a2c797d5adb63b4aaa76efbd75f5c9e915f362762e6822b1576942c75 SHA512 5c49affb62266d3de92cb2518a852ff0356fb279802da5574bdd4e706d4fe7ae36445986ea66dbf5b93c8b8f5e54a683b2765457d5a9c70ea7afbc42ae08c0de DIST breeze-icons-5.88.0.tar.xz 2128308 BLAKE2B e96b04d524d99227ee09935c63ed8362b0a75a88e89835afc8537d03e360c202957392eee329397c0c502a47140d975ac2bde79738b911fd0600c6d2a3a079ab SHA512 e66ee04a2e073fe954e97dfd377581715313a041d62740eda7c4b599fd6785ca241f58508afafcb2fb3a8803df72f5e451a213dff7329f6beca87197e8e1f00d -DIST breeze-icons-5.89.0.tar.xz 2142816 BLAKE2B 7d420b05eb7ffcd98ac89ee36bd709feed2d71c2f54aa413e49f41b4cadd62730372bc3d8bcf003f11f7e59fc7bb00fcf262bdf733a24d49ddb93fe7a4636031 SHA512 8aeade18fde4c45df10a396987473220741c4dad736f2077f7075ebdc4ca4ed3cdb8975c5a9604a2f56b81b7cb4bf53117e33f7faff4e5b3b6293fefe8cccc70 +DIST breeze-icons-5.90.0.tar.xz 2145144 BLAKE2B af9c5b771d164441fee38bdb82c86909391abf0e3b91db203bbc2775c75e88abc8d1d1762e71ae07a9374391d280fe737ffb34f49c02932eb4a3620dcdacbdc4 SHA512 17279b11fa221a81c488f832826b28a02343b74e4d0ff486503b79aca399c25a1ce0f7c905a2f4b35e47fe86ed7dbb93442daba452676e117773e47031697280 EBUILD breeze-icons-5.88.0.ebuild 1117 BLAKE2B 44177793428397a14ad50b7773ee87eff50273a4510efe605d2dbc707a360b3c2cc15d721455ee883b65ca5de35898b91c0ec3f4c9525ae794aab3df99f01d77 SHA512 c04e87bf3eed2efda2956ae4c55ccabd271e23d23eb2a75fd39d81bfe83b64c42b4fb0bae7abd57abe41785f87668d6e5aa6a26a533f054ab2a302d03da91c99 -EBUILD breeze-icons-5.89.0-r1.ebuild 1267 BLAKE2B e0e2d4b949e8e8d2d81ef894755300f15161f4f3ca5b0cf69670f637393cf7756c58b3e3403f495f59994dbea03747f6970ec7721189e7a297b0b2d5de00513c SHA512 d5016cd962baaa65ceefe6ec65e42e649c66b92afb14d9d7ea69375d798b6459f72f26bd9138943dc697bf1dede6bb8e14e26b307f4230eee41ce45b524444ef +EBUILD breeze-icons-5.90.0.ebuild 1120 BLAKE2B 5358e9e8c7a8bea406ac478b7ef2e1251323494e5605446474a5ed68a8a7113d776b102c50653d0f7a0eb61c81d80887fb79622a42917c9f3a42d4a6dd43fdb5 SHA512 e275eaeb54aafa2ddece39e07e4fad45037b9815105ab1e2522788c56d0a82bfe566a9fa58063bd2cb452aa69c17de4f1e8e4a2b1f1117cc56e7dca346c4d960 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 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 deleted file mode 100644 index 74e862541125..000000000000 --- a/kde-frameworks/breeze-icons/breeze-icons-5.89.0-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# 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 - >=dev-util/cmake-3.21 - >=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/breeze-icons-5.90.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild new file mode 100644 index 000000000000..152a388fe1ee --- /dev/null +++ b/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 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 ) +" + +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 deleted file mode 100644 index b294711e3aac..000000000000 --- a/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-fix-icon_files-list.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 30bc17dd60be..000000000000 --- a/kde-frameworks/breeze-icons/files/breeze-icons-5.89.0-improv-install-of-light-fallback-icons.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 05f11af435edc57650d0221ed8a74ecfb997e576 Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -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 - -- cgit v1.2.3