From 8403c1727a36a19e427a6ad7792cb2df98079c34 Mon Sep 17 00:00:00 2001 From: Himadri Sekhar Basu <41947504+hsbasu@users.noreply.github.com> Date: Fri, 12 Apr 2024 18:00:35 +0530 Subject: [PATCH] Move cinnamon style accents (#80) - Move cinnamon accent styles file to cinnamon theme sources - Modify meson build script to include cinnamon accent styles --- .../src}/22_sucharu-artwork.styles | 0 cinnamon-shell/src/meson.build | 15 +++++++++++++++ files/meson.build | 14 -------------- meson.build | 1 - 4 files changed, 15 insertions(+), 15 deletions(-) rename {files/accents => cinnamon-shell/src}/22_sucharu-artwork.styles (100%) delete mode 100644 files/meson.build diff --git a/files/accents/22_sucharu-artwork.styles b/cinnamon-shell/src/22_sucharu-artwork.styles similarity index 100% rename from files/accents/22_sucharu-artwork.styles rename to cinnamon-shell/src/22_sucharu-artwork.styles diff --git a/cinnamon-shell/src/meson.build b/cinnamon-shell/src/meson.build index e0df6519..d01def2f 100644 --- a/cinnamon-shell/src/meson.build +++ b/cinnamon-shell/src/meson.build @@ -244,3 +244,18 @@ foreach variant: variants # install_dir: theme_dir # ) endforeach + +# install accent to share/cinnamon/styles.d +cinnamon_accents_dir = join_paths(get_option('datadir'), 'cinnamon/styles.d') + +accent_style_asset_dir = meson.current_source_dir() +accent_style_assets = files( + run_command( + 'find', accent_style_asset_dir, '-name', '*.styles', check: true + ).stdout().strip().split('\n') +) + +# install accent style assets +foreach accent_style_asset: accent_style_assets + install_data(accent_style_asset, install_dir: cinnamon_accents_dir) +endforeach diff --git a/files/meson.build b/files/meson.build deleted file mode 100644 index ad2160c3..00000000 --- a/files/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -# install accent to /usr/share/cinnamon/styles.d -cinnamon_accents_dir = join_paths(get_option('datadir'), 'cinnamon/styles.d') - -accent_style_asset_dir = meson.current_source_dir() + '/accents' -accent_style_assets = files( - run_command( - 'find', accent_style_asset_dir, '-name', '*.styles', check: true - ).stdout().strip().split('\n') -) - -# install accent style assets -foreach accent_style_asset: accent_style_assets - install_data(accent_style_asset, install_dir: cinnamon_accents_dir) -endforeach diff --git a/meson.build b/meson.build index 9d4ead4c..b19171b0 100644 --- a/meson.build +++ b/meson.build @@ -11,7 +11,6 @@ python = find_program('python3') sassc = find_program('sassc') subdir('common') -subdir('files') components = [ 'metacity',