Skip to content

Commit 48886ec

Browse files
committed
backport cinnamon-desktop changes, nightlight
1 parent bcc2dc3 commit 48886ec

33 files changed

+5193
-3761
lines changed

data/org.cinnamon.settings-daemon.plugins.color.gschema.xml.in.in

+30
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,35 @@
1010
<summary>The duration a printer profile is valid</summary>
1111
<description>This is the number of days after which the printer color profile is considered invalid.</description>
1212
</key>
13+
<key name="night-light-enabled" type="b">
14+
<default>false</default>
15+
<summary>If the night light mode is enabled</summary>
16+
<description>Night light mode changes the color temperature of your display when the sun has gone down or at preset times.</description>
17+
</key>
18+
<key name="night-light-temperature" type="u">
19+
<default>2700</default>
20+
<summary>Temperature of the display when enabled</summary>
21+
<description>This temperature in Kelvin is used to modify the screen tones when night light mode is enabled. Higher values are bluer, lower redder.</description>
22+
</key>
23+
<key name="night-light-schedule-automatic" type="b">
24+
<default>true</default>
25+
<summary>Use the sunrise and sunset</summary>
26+
<description>Calculate the sunrise and sunset times automatically, from the current location.</description>
27+
</key>
28+
<key name="night-light-schedule-from" type="d">
29+
<default>20.00</default>
30+
<summary>The start time</summary>
31+
<description>When “night-light-schedule-automatic” is disabled, use this start time in hours from midnight.</description>
32+
</key>
33+
<key name="night-light-schedule-to" type="d">
34+
<default>6.00</default>
35+
<summary>The end time</summary>
36+
<description>When “night-light-schedule-automatic” is disabled, use this end time in hours from midnight.</description>
37+
</key>
38+
<key name="night-light-last-coordinates" type="(dd)">
39+
<default>(91,181)</default>
40+
<summary>The last detected position</summary>
41+
<description>When location services are available this represents the last detected location. The default value is an invalid value to ensure it is always updated at startup.</description>
42+
</key>
1343
</schema>
1444
</schemalist>

meson.build

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ endif
9898
cc = meson.get_compiler('c')
9999
math = cc.find_library('m', required: false)
100100

101+
has_timerfd_create = cc.has_function('timerfd_create')
102+
101103
csd_conf = configuration_data()
102104
csd_conf.set_quoted('GTKBUILDERDIR', gtkbuilderdir)
103105
csd_conf.set_quoted('CINNAMON_SETTINGS_LOCALEDIR', localedir)
@@ -108,6 +110,7 @@ csd_conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
108110
csd_conf.set_quoted('LIBEXECDIR', join_paths(prefix, libexecdir))
109111
csd_conf.set_quoted('SYSCONFDIR', sysconfdir)
110112
csd_conf.set_quoted('LIBDIR', libdir)
113+
csd_conf.set10('HAVE_TIMERFD', has_timerfd_create)
111114

112115
if gudev.found()
113116
cargs += '-DHAVE_GUDEV'

0 commit comments

Comments
 (0)