From f5cb0b455988d1329428f9563095be201f02b909 Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Thu, 2 Aug 2018 18:31:17 +0100 Subject: [PATCH] Suru is Yaru for ubuntu - but don't install icon by default. --- ChangeLog | 2 ++ INSTALL | 5 ++-- icons/CMakeLists.txt | 26 ++++++++++---------- icons/{suru => yaru}/CMakeLists.txt | 2 +- icons/{suru => yaru}/cantata-16x16.png | Bin icons/{suru => yaru}/cantata-16x16@2x.png | Bin icons/{suru => yaru}/cantata-24x24.png | Bin icons/{suru => yaru}/cantata-24x24@2x.png | Bin icons/{suru => yaru}/cantata-256x256.png | Bin icons/{suru => yaru}/cantata-256x256@2x.png | Bin icons/{suru => yaru}/cantata-32x32.png | Bin icons/{suru => yaru}/cantata-32x32@2x.png | Bin icons/{suru => yaru}/cantata-48x48.png | Bin icons/{suru => yaru}/cantata-48x48@2x.png | Bin icons/{suru => yaru}/cantata.svg | 0 icons/{suru => yaru}/render-bitmaps.py | 0 16 files changed, 19 insertions(+), 16 deletions(-) rename icons/{suru => yaru}/CMakeLists.txt (97%) rename icons/{suru => yaru}/cantata-16x16.png (100%) rename icons/{suru => yaru}/cantata-16x16@2x.png (100%) rename icons/{suru => yaru}/cantata-24x24.png (100%) rename icons/{suru => yaru}/cantata-24x24@2x.png (100%) rename icons/{suru => yaru}/cantata-256x256.png (100%) rename icons/{suru => yaru}/cantata-256x256@2x.png (100%) rename icons/{suru => yaru}/cantata-32x32.png (100%) rename icons/{suru => yaru}/cantata-32x32@2x.png (100%) rename icons/{suru => yaru}/cantata-48x48.png (100%) rename icons/{suru => yaru}/cantata-48x48@2x.png (100%) rename icons/{suru => yaru}/cantata.svg (100%) rename icons/{suru => yaru}/render-bitmaps.py (100%) diff --git a/ChangeLog b/ChangeLog index 12b556112e..588aeae84d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ drive. 14. If a dynamic playlist has rating 0..5 stars, then include all songs (even those without an explicit rating). +15. Ubuntu icon theme is now named Yaru, so install there. +16. Don't install Yaru icon by default. 2.3.1 ----- diff --git a/INSTALL b/INSTALL index a345ad02c7..8fd5dff211 100644 --- a/INSTALL +++ b/INSTALL @@ -61,8 +61,9 @@ The following options may be passed to CMake: Build UDisks2 backend for solid-lite. Default: ON - -DINSTALL_UBUNTU_ICONS= - Install Suru icons for Ubuntu. + -DINSTALL_UBUNTU_ICONS=ON + Install Yaru icons for Ubuntu. + Default: OFF -DCANTATA_HELPERS_LIB_DIR= For 64 bit builds, this may be used to control the lib sub-dir diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 589446d1cb..3d3c0de47b 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -19,21 +19,21 @@ if (NOT HAIKU AND NOT WIN32 AND NOT APPLE) endforeach() update_iconcache(hicolor) - if (EXISTS /etc/lsb-release) - file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS) - string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS}) - if (IS_UBUNTU) - set(INSTALL_UBUNTU_ICONS_DEFAULT ON) - else(IS_UBUNTU) - set(INSTALL_UBUNTU_ICONS_DEFAULT OFF) - endif(IS_UBUNTU) - else(EXISTS /etc/lsb-release) + #if (EXISTS /etc/lsb-release) + # file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS) + # string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS}) + # if (IS_UBUNTU) + # set(INSTALL_UBUNTU_ICONS_DEFAULT ON) + # else(IS_UBUNTU) + # set(INSTALL_UBUNTU_ICONS_DEFAULT OFF) + # endif(IS_UBUNTU) + #else(EXISTS /etc/lsb-release) set(INSTALL_UBUNTU_ICONS_DEFAULT OFF) - endif(EXISTS /etc/lsb-release) - option(INSTALL_UBUNTU_ICONS "Install the Ubuntu Suru icons" ${INSTALL_UBUNTU_ICONS_DEFAULT}) + #endif(EXISTS /etc/lsb-release) + option(INSTALL_UBUNTU_ICONS "Install the Ubuntu Yaru icons" ${INSTALL_UBUNTU_ICONS_DEFAULT}) if (INSTALL_UBUNTU_ICONS) - add_subdirectory(suru) - update_iconcache(Suru) + add_subdirectory(yaru) + update_iconcache(Yaru) endif () endif () diff --git a/icons/suru/CMakeLists.txt b/icons/yaru/CMakeLists.txt similarity index 97% rename from icons/suru/CMakeLists.txt rename to icons/yaru/CMakeLists.txt index 45fcaaeea8..5b9ae2d3b7 100644 --- a/icons/suru/CMakeLists.txt +++ b/icons/yaru/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CANTATA_SURU_ICON_INSTALL_PREFIX ${SHARE_INSTALL_PREFIX}/icons/Suru) +set(CANTATA_SURU_ICON_INSTALL_PREFIX ${SHARE_INSTALL_PREFIX}/icons/Yaru) install(FILES ../cantata-symbolic.svg DESTINATION ${CANTATA_SURU_ICON_INSTALL_PREFIX}/scalable/apps) foreach (SIZE 16 24 32 48 256) diff --git a/icons/suru/cantata-16x16.png b/icons/yaru/cantata-16x16.png similarity index 100% rename from icons/suru/cantata-16x16.png rename to icons/yaru/cantata-16x16.png diff --git a/icons/suru/cantata-16x16@2x.png b/icons/yaru/cantata-16x16@2x.png similarity index 100% rename from icons/suru/cantata-16x16@2x.png rename to icons/yaru/cantata-16x16@2x.png diff --git a/icons/suru/cantata-24x24.png b/icons/yaru/cantata-24x24.png similarity index 100% rename from icons/suru/cantata-24x24.png rename to icons/yaru/cantata-24x24.png diff --git a/icons/suru/cantata-24x24@2x.png b/icons/yaru/cantata-24x24@2x.png similarity index 100% rename from icons/suru/cantata-24x24@2x.png rename to icons/yaru/cantata-24x24@2x.png diff --git a/icons/suru/cantata-256x256.png b/icons/yaru/cantata-256x256.png similarity index 100% rename from icons/suru/cantata-256x256.png rename to icons/yaru/cantata-256x256.png diff --git a/icons/suru/cantata-256x256@2x.png b/icons/yaru/cantata-256x256@2x.png similarity index 100% rename from icons/suru/cantata-256x256@2x.png rename to icons/yaru/cantata-256x256@2x.png diff --git a/icons/suru/cantata-32x32.png b/icons/yaru/cantata-32x32.png similarity index 100% rename from icons/suru/cantata-32x32.png rename to icons/yaru/cantata-32x32.png diff --git a/icons/suru/cantata-32x32@2x.png b/icons/yaru/cantata-32x32@2x.png similarity index 100% rename from icons/suru/cantata-32x32@2x.png rename to icons/yaru/cantata-32x32@2x.png diff --git a/icons/suru/cantata-48x48.png b/icons/yaru/cantata-48x48.png similarity index 100% rename from icons/suru/cantata-48x48.png rename to icons/yaru/cantata-48x48.png diff --git a/icons/suru/cantata-48x48@2x.png b/icons/yaru/cantata-48x48@2x.png similarity index 100% rename from icons/suru/cantata-48x48@2x.png rename to icons/yaru/cantata-48x48@2x.png diff --git a/icons/suru/cantata.svg b/icons/yaru/cantata.svg similarity index 100% rename from icons/suru/cantata.svg rename to icons/yaru/cantata.svg diff --git a/icons/suru/render-bitmaps.py b/icons/yaru/render-bitmaps.py similarity index 100% rename from icons/suru/render-bitmaps.py rename to icons/yaru/render-bitmaps.py