Skip to content

Commit

Permalink
Update to v28. Fix start-here-solus-mono install and add Celeste wall…
Browse files Browse the repository at this point in the history
…paper
  • Loading branch information
JoshStrobl committed Feb 2, 2021
1 parent 5120697 commit 3199db8
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 4 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Solus Artwork contains many backgrounds graciously provided by the community for
- Except when declared otherwise, the majority of the photo images in `backgrounds/` have been kindly provided by John McCormack for inclusion into Solus. We are incredibly grateful for the beautiful images he has provided.
- AerialDesert.jpg is provided by [NASA](https://unsplash.com/photos/whDrFMucHkc) and licensed under [Unsplash License](https://unsplash.com/license).
- BluePeaks.jpg is provided by [Fabrizio Conti](https://unsplash.com/photos/k6GpdsPJSZw) and licensed under [Unsplash License](https://unsplash.com/license).
- Celeste.jpg is a modified wallpaper, originally sourced from [Paweł Czerwiński](https://unsplash.com/photos/SoB70WFVWGU) and licensed under [Unsplash License](https://unsplash.com/license).
- LakeSideView.jpg is provided by [Jake Hills](https://unsplash.com/photos/mI02K_LxlfU) and licensed under [Unsplash License](https://unsplash.com/license).
- Peeks.jpg is a modified wallpaper from [Pexels](https://www.pexels.com/photo/green-pine-trees-covered-with-fogs-under-white-sky-during-daytime-167699/) and is licensed under the [Pexels License](https://www.pexels.com/photo-license/).
- SolusFresh.png, book.png, and chalk.jpeg were kindly provided by Alejandro Seoane and are available under the main package license, GPL-2.0.
Expand All @@ -22,7 +23,7 @@ Solus Artwork contains many backgrounds graciously provided by the community for

## Branding and Logos

- Copyright © 2015-2020 Solus Project.
- Copyright © 2015-2021 Solus Project.
- The contents of `icons/` and the Solus logo itself is Copyright © 2016-2019 Solus Project. All Rights Reserved.

## Tooling
Expand Down
Binary file added backgrounds/Celeste.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions backgrounds/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ wallpapers = [
'BluePeaks.jpg',
'BogFlower.jpg',
'BrittasLake.jpg',
'Celeste.jpg',
'Cliffs_of_Moher.png',
'Crags.png',
'Excl_Autumn_Leaf.jpg',
Expand Down
8 changes: 8 additions & 0 deletions backgrounds/solus-wallpapers.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
<scolor>#000000</scolor>
<shade_type>solid</shade_type>
</wallpaper>
<wallpaper deleted="false">
<name>Celeste</name>
<filename>@prefix@/share/backgrounds/solus/Celeste.jpg</filename>
<options>zoom</options>
<pcolor>#000000</pcolor>
<scolor>#000000</scolor>
<shade_type>solid</shade_type>
</wallpaper>
<wallpaper deleted="false">
<name>Cliffs of Moher</name>
<filename>@prefix@/share/backgrounds/solus/Cliffs_of_Moher.png</filename>
Expand Down
2 changes: 1 addition & 1 deletion icons/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ foreach icon_size : icon_sizes
icons = [
'@0@/distributor-logo-solus@1@'.format(icon_size, suffix),
'@0@/start-here-solus@1@'.format(icon_size, suffix),
'@0@/start-here-solus-mono@1@'.format(icon_size, suffix),
]
target_dir = join_paths(icons_dir, icon_size, 'places')
install_data(
Expand All @@ -31,6 +30,7 @@ foreach icon_size : icon_sizes
)
endforeach

install_data(['scalable/start-here-solus-mono.svg',], install_dir: join_paths(icons_dir, 'scalable', 'places'))

# Install the mimetypes icons
foreach icon_size : icon_sizes
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'artwork',
['c'],
version: '27',
version: '28',
license: [
'CC-BY-3.0 ',
'CC-BY-SA-4.0',
Expand Down
2 changes: 1 addition & 1 deletion mkrelease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ meson --prefix /usr build
ninja dist -C build

# Bump in tandem with meson.build, run script once new tag is up.
VERSION="27"
VERSION=$(grep "version:" meson.build | head -n1 | cut -d"'" -f2)
TAR="artwork-${VERSION}.tar.xz"
mv build/meson-dist/$TAR .

Expand Down
3 changes: 3 additions & 0 deletions tooling/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module github.com/getsolus/artwork/tooling/generate-wallpaper

go 1.15

0 comments on commit 3199db8

Please sign in to comment.