Skip to content

Commit 4b32455

Browse files
cassidyjamesdanirabbit
cassidyjames
authored and
danirabbit
committed
Release 5.1.0 (#828)
1 parent 34aac49 commit 4b32455

File tree

5 files changed

+107
-25
lines changed

5 files changed

+107
-25
lines changed

‎.editorconfig‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# EditorConfig <http://EditorConfig.org>
2+
root = true
3+
4+
# elementary defaults
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
indent_size = tab
9+
indent_style = space
10+
insert_final_newline = true
11+
max_line_length = 80
12+
tab_width = 4
13+
14+
[{*.policy,*.xml,*.xml.in,*.yml}]
15+
tab_width = 2

‎elementary.gpl‎ renamed to ‎data/elementary.gpl‎

File renamed without changes.

‎data/icons.appdata.xml.in‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Copyright 2019 elementary, Inc. <[email protected]> -->
3+
<component type="icon-theme">
4+
<id>io.elementary.icons</id>
5+
<metadata_license>CC0-1.0</metadata_license>
6+
<project_license>GPL-3.0+</project_license>
7+
​ <name>elementary Icons</name>
8+
​ <summary>Named, vector icons for elementary OS</summary>
9+
​ <description>
10+
​ <p>An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon.</p>
11+
​ </description>
12+
<releases>
13+
<release version="5.1.0" date="2019-10-31" urgency="medium">
14+
<description>
15+
<ul>
16+
<li>Add 64px prefs locale</li>
17+
<li>Make symbol on 32px places home larger</li>
18+
<li>New icons for Workspace preferences</li>
19+
<li>Add symbolic variant for updates icon</li>
20+
<li>Give browser-download its own unique icon</li>
21+
<li>Use a more scalable metaphor for system updates</li>
22+
<li>New view-reader icon</li>
23+
<li>Add 32px wireless signal icons</li>
24+
<li>Add 24px user status icons</li>
25+
</ul>
26+
</description>
27+
</release>
28+
</releases>
29+
<content_rating type="oars-1.1">
30+
<content_attribute id="violence-cartoon">none</content_attribute>
31+
<content_attribute id="violence-fantasy">none</content_attribute>
32+
<content_attribute id="violence-realistic">none</content_attribute>
33+
<content_attribute id="violence-bloodshed">none</content_attribute>
34+
<content_attribute id="violence-sexual">none</content_attribute>
35+
<content_attribute id="violence-desecration">none</content_attribute>
36+
<content_attribute id="violence-slavery">none</content_attribute>
37+
<content_attribute id="violence-worship">none</content_attribute>
38+
<content_attribute id="drugs-alcohol">none</content_attribute>
39+
<content_attribute id="drugs-narcotics">none</content_attribute>
40+
<content_attribute id="drugs-tobacco">none</content_attribute>
41+
<content_attribute id="sex-nudity">none</content_attribute>
42+
<content_attribute id="sex-themes">none</content_attribute>
43+
<content_attribute id="sex-homosexuality">none</content_attribute>
44+
<content_attribute id="sex-prostitution">none</content_attribute>
45+
<content_attribute id="sex-adultery">none</content_attribute>
46+
<content_attribute id="sex-appearance">none</content_attribute>
47+
<content_attribute id="language-profanity">none</content_attribute>
48+
<content_attribute id="language-humor">none</content_attribute>
49+
<content_attribute id="language-discrimination">none</content_attribute>
50+
<content_attribute id="social-chat">none</content_attribute>
51+
<content_attribute id="social-info">none</content_attribute>
52+
<content_attribute id="social-audio">none</content_attribute>
53+
<content_attribute id="social-location">none</content_attribute>
54+
<content_attribute id="social-contacts">none</content_attribute>
55+
<content_attribute id="money-purchasing">none</content_attribute>
56+
<content_attribute id="money-gambling">none</content_attribute>
57+
</content_rating>
58+
<translation type="gettext">io.elementary.icons</translation>
59+
<compulsory_for_desktop>Pantheon</compulsory_for_desktop>
60+
<developer_name>elementary, Inc.</developer_name>
61+
<url type="homepage">https://elementary.io</url>
62+
<url type="bugtracker">https://github.com/elementary/icons/issues</url>
63+
​</component>

‎data/meson.build‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
i18n.merge_file(
2+
input: 'icons.appdata.xml.in',
3+
output: meson.project_name() + '.appdata.xml',
4+
po_dir: join_paths(meson.source_root(), 'po', 'extra'),
5+
type: 'xml',
6+
install: true,
7+
install_dir: join_paths(get_option('datadir'), 'metainfo'),
8+
)
9+
10+
if (get_option ('palettes'))
11+
install_data(
12+
'elementary.gpl',
13+
install_dir: join_paths (get_option('datadir'), 'gimp', '2.0', 'palettes')
14+
)
15+
16+
install_data(
17+
'elementary.gpl',
18+
install_dir: join_paths (get_option('datadir'), 'inkscape', 'palettes')
19+
)
20+
endif

‎meson.build‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
project (
2-
'elementary',
3-
version: '5.0.4',
2+
'io.elementary.icons',
3+
version: '5.1.0',
44
license : 'GPL3+'
55
)
66

7+
i18n = import('i18n')
78

8-
icon_dir = join_paths(get_option('datadir'), 'icons', meson.project_name())
9-
9+
icon_dir = join_paths(get_option('datadir'), 'icons', 'elementary')
1010

1111
scale_factors = get_option('scale_factors')
1212

1313
# Add a directory here to the list if needed.
14-
1514
directories = [
1615
# The first argument is the name of the folder,
1716
# the second is the associated Context
@@ -26,23 +25,18 @@ directories = [
2625
['status', 'Status']
2726
]
2827

29-
# Add a directory here to the list if needed.
30-
28+
# Add a size here to the list if needed.
3129
sizes = ['16', '24', '32', '48', '64', '128', 'symbolic']
3230

3331
# Symbolic icons are made to have a maximum size.
34-
3532
max_size_symbolic = '512'
3633

3734
# This is the minimal size all icons can theorically have.
38-
3935
min_size_ever = '8'
4036

4137
# Let's do fancy things
42-
4338
msg_warning = false
44-
msg = 'This is the @0@ stylesheet version @1@ 🤩\n'.format (meson.project_name(), meson.project_version())
45-
msg += '\nPLEASE VERIFY THE CONFIGURATION:'
39+
msg = '\nPLEASE VERIFY THE CONFIGURATION:'
4640

4741
if (sizes.length() >= 7)
4842
msg += '\nAvailable sizes: @0@ ✔'.format (', '.join (sizes))
@@ -72,7 +66,6 @@ else
7266
endif
7367

7468
# Here beggins the real work
75-
7669
foreach directory : directories
7770
install_subdir(
7871
directory[0],
@@ -179,19 +172,10 @@ foreach directory_entry : directories
179172
endforeach
180173
endforeach
181174

182-
if (get_option ('palettes'))
183-
install_data(
184-
'elementary.gpl',
185-
install_dir: join_paths (get_option('datadir'), 'gimp', '2.0', 'palettes')
186-
)
187-
188-
install_data(
189-
'elementary.gpl',
190-
install_dir: join_paths (get_option('datadir'), 'inkscape', 'palettes')
191-
)
192-
endif
193-
194175
subdir('cursors')
176+
195177
if (get_option ('volume_icons'))
196178
subdir('volumeicon')
197179
endif
180+
181+
subdir('data')

0 commit comments

Comments
 (0)