Hello community,
here is the log from the commit of package cinnamon-desktop for
openSUSE:Factory checked in at 2020-03-17 13:10:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-desktop (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-desktop.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-desktop"
Tue Mar 17 13:10:45 2020 rev:16 rq:785762 version:4.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon-desktop/cinnamon-desktop.changes
2019-07-22 12:21:02.539654104 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-desktop.new.3160/cinnamon-desktop.changes
2020-03-17 13:10:58.413837124 +0100
@@ -1,0 +2,12 @@
+Mon Mar 16 14:42:30 UTC 2020 - Marguerite Su <i...@marguerite.su>
+
+- update version 4.4.1
+ * Clock: Fix date format when LC_TIME and LANGUAGE are the same,
+ or LC_TIME is NULL
+- changes in 4.4.0
+ * org.cinnamon.desktop.session schema: Remove logind/consolekit
+ settings
+ * Fetch clock formats using LC_TIME (as opposed to LANGUAGE)
+ * Fix unused GIR transfer notation on integer values
+
+-------------------------------------------------------------------
Old:
----
cinnamon-desktop-4.2.0.tar.gz
New:
----
cinnamon-desktop-4.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-desktop.spec ++++++
--- /var/tmp/diff_new_pack.tM3d4T/_old 2020-03-17 13:10:59.065837624 +0100
+++ /var/tmp/diff_new_pack.tM3d4T/_new 2020-03-17 13:10:59.069837628 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-desktop
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
%define typelib typelib-1_0-CinnamonDesktop-3_0
%define typelib_cvc typelib-1_0-Cvc-1_0
Name: cinnamon-desktop
-Version: 4.2.0
+Version: 4.4.1
Release: 0
Summary: Libcinnamon-desktop API
License: GPL-2.0-or-later AND MIT
++++++ cinnamon-desktop-4.2.0.tar.gz -> cinnamon-desktop-4.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.2.0/debian/changelog
new/cinnamon-desktop-4.4.1/debian/changelog
--- old/cinnamon-desktop-4.2.0/debian/changelog 2019-06-14 13:45:56.000000000
+0200
+++ new/cinnamon-desktop-4.4.1/debian/changelog 2019-12-12 12:02:11.000000000
+0100
@@ -1,3 +1,22 @@
+cinnamon-desktop (4.4.1) tricia; urgency=medium
+
+ * Clock: Fix date format when LC_TIME and LANGUAGE are the same, or LC_TIME
is NULL (#142)
+
+ -- Clement Lefebvre <r...@linuxmint.com> Thu, 12 Dec 2019 11:01:34 +0000
+
+cinnamon-desktop (4.4.0) tricia; urgency=medium
+
+ [ Leigh Scott ]
+ * Fix unused GIR transfer notation on integer values (#130)
+
+ [ Clement Lefebvre ]
+ * Fetch clock formats using LC_TIME (as opposed to LANGUAGE) (#132)
+
+ [ Michael Webster ]
+ * org.cinnamon.desktop.session schema: Remove logind/consolekit settings for
cinnamon-session and cinnamon-settings-daemon.
+
+ -- Clement Lefebvre <r...@linuxmint.com> Sat, 16 Nov 2019 11:50:26 +0100
+
cinnamon-desktop (4.2.0) tina; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.2.0/libcinnamon-desktop/gnome-wall-clock.c
new/cinnamon-desktop-4.4.1/libcinnamon-desktop/gnome-wall-clock.c
--- old/cinnamon-desktop-4.2.0/libcinnamon-desktop/gnome-wall-clock.c
2019-06-14 13:45:56.000000000 +0200
+++ new/cinnamon-desktop-4.4.1/libcinnamon-desktop/gnome-wall-clock.c
2019-12-12 12:02:11.000000000 +0100
@@ -254,7 +254,7 @@
guint i;
gchar *old_format;
gboolean use_24h, show_date, show_seconds;
- const gchar *default_format;
+ const gchar *default_format, *env_language, *env_lc_time;
static const gchar* seconds_tokens[] = {
"\%s",
@@ -275,6 +275,16 @@
show_date = g_settings_get_boolean (self->priv->desktop_settings,
"clock-show-date");
show_seconds = g_settings_get_boolean (self->priv->desktop_settings,
"clock-show-seconds");
+ /* Override LANGUAGE with the LC_TIME environment variable
+ * This is needed for gettext to fetch our clock format
+ * according to LC_TIME, and not according to the DE LANGUAGE.
+ */
+ env_language = g_getenv("LANGUAGE");
+ env_lc_time = g_getenv("LC_TIME");
+ if (env_language != NULL && env_lc_time != NULL && env_language !=
env_lc_time) {
+ g_setenv("LANGUAGE", env_lc_time, TRUE);
+ }
+
if (use_24h) {
if (show_date) {
/* Translators: This is the time format with full date used
@@ -329,6 +339,11 @@
}
}
+ /* Set back LANGUAGE the way it was before */
+ if (env_language != NULL && env_lc_time != NULL && env_language !=
env_lc_time) {
+ g_setenv("LANGUAGE", env_language, TRUE);
+ }
+
/* Then look at our custom format if we received one, and test it out.
* If it's ok, it's used, otherwise we use the default format */
@@ -568,3 +583,42 @@
return ret;
}
+
+/**
+ * gnome_wall_clock_lctime_format:
+ * @clock: The GnomeWallClock
+ * @gettext_domain: (nullable)
+ * @format_string: (nullable)
+ *
+ * Returns the translation of the format string according to
+ * the LC_TIME locale.
+ *
+ * Returns: (transfer none): The translated format string.
+ **/
+gchar *
+gnome_wall_clock_lctime_format (const gchar * gettext_domain, const gchar *
format_string)
+{
+ const gchar *env_language, *env_lc_time;
+ gchar *string;
+ gboolean use_lctime;
+
+ /* Use LC_TIME if it's set and different than LANGUAGE */
+ env_language = g_getenv("LANGUAGE");
+ env_lc_time = g_getenv("LC_TIME");
+
+ use_lctime = (env_language != NULL) && (env_lc_time != NULL) && (g_strcmp0
(env_language, env_lc_time) != 0);
+
+ if (use_lctime) {
+ /* Set LANGUAGE to the LC_TIME value, so we can get the right date format
via gettext */
+ g_setenv("LANGUAGE", env_lc_time, TRUE);
+ }
+
+ string = dgettext(gettext_domain, format_string);
+
+ if (use_lctime) {
+ /* Set back LANGUAGE the way it was before */
+ g_setenv("LANGUAGE", env_language, TRUE);
+ }
+
+ return string;
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.2.0/libcinnamon-desktop/gnome-wall-clock.h
new/cinnamon-desktop-4.4.1/libcinnamon-desktop/gnome-wall-clock.h
--- old/cinnamon-desktop-4.2.0/libcinnamon-desktop/gnome-wall-clock.h
2019-06-14 13:45:56.000000000 +0200
+++ new/cinnamon-desktop-4.4.1/libcinnamon-desktop/gnome-wall-clock.h
2019-12-12 12:02:11.000000000 +0100
@@ -68,6 +68,9 @@
GnomeWallClock * gnome_wall_clock_new (void);
gboolean gnome_wall_clock_set_format_string (GnomeWallClock *clock,
const gchar
*format_string);
+gchar * gnome_wall_clock_lctime_format (const gchar * gettext_domain,
+ const gchar * format_string);
+
G_END_DECLS
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.2.0/libcvc/gvc-mixer-stream.c
new/cinnamon-desktop-4.4.1/libcvc/gvc-mixer-stream.c
--- old/cinnamon-desktop-4.2.0/libcvc/gvc-mixer-stream.c 2019-06-14
13:45:56.000000000 +0200
+++ new/cinnamon-desktop-4.4.1/libcvc/gvc-mixer-stream.c 2019-12-12
12:02:11.000000000 +0100
@@ -166,7 +166,7 @@
* gvc_mixer_stream_get_volume:
* @stream:
*
- * Returns: (type guint32) (transfer none):
+ * Returns: (type guint32):
*/
pa_volume_t
gvc_mixer_stream_get_volume (GvcMixerStream *stream)
@@ -494,7 +494,7 @@
* gvc_mixer_stream_get_base_volume:
* @stream:
*
- * Returns: (type guint32) (transfer none):
+ * Returns: (type guint32):
*/
pa_volume_t
gvc_mixer_stream_get_base_volume (GvcMixerStream *stream)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-desktop-4.2.0/meson.build
new/cinnamon-desktop-4.4.1/meson.build
--- old/cinnamon-desktop-4.2.0/meson.build 2019-06-14 13:45:56.000000000
+0200
+++ new/cinnamon-desktop-4.4.1/meson.build 2019-12-12 12:02:11.000000000
+0100
@@ -1,7 +1,7 @@
# Meson build file
# https://github.com/linuxmint/cinnamon-desktop
-project('cinnamon-desktop', 'c', version: '4.2.0',
+project('cinnamon-desktop', 'c', version: '4.4.1',
meson_version: '>=0.41.0'
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-desktop-4.2.0/schemas/org.cinnamon.desktop.session.gschema.xml.in.in
new/cinnamon-desktop-4.4.1/schemas/org.cinnamon.desktop.session.gschema.xml.in.in
---
old/cinnamon-desktop-4.2.0/schemas/org.cinnamon.desktop.session.gschema.xml.in.in
2019-06-14 13:45:56.000000000 +0200
+++
new/cinnamon-desktop-4.4.1/schemas/org.cinnamon.desktop.session.gschema.xml.in.in
2019-12-12 12:02:11.000000000 +0100
@@ -13,13 +13,11 @@
</key>
<key name="session-manager-uses-logind" type="b">
<default>true</default>
- <_summary>Whether or not cinnamon-session uses logind to
suspend/hibernate/shutdown/restart (usually from the shutdown dialog)</_summary>
- <_description>If true, it uses logind. Otherwise it uses consolekit to
shutdown/restart and upower to suspend/hibernate. It is only compatible with
upower 0.9 and lower versions (not 0.99 or later).</_description>
+ <_summary>*no longer used*</_summary>
</key>
<key name="settings-daemon-uses-logind" type="b">
<default>true</default>
- <_summary>Whether or not cinnamon-settings-daemon uses logind to
suspend/hibernate/shutdown (either from media-keys or power-manager)</_summary>
- <_description>If true, it uses logind for all three actions. Otherwise
it uses consolekit for shutdown and upower for suspend/hibernate.</_description>
+ <_summary>*no longer used*</_summary>
</key>
</schema>
</schemalist>
