Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-settings-daemon for
openSUSE:Factory checked in at 2021-01-21 21:57:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-settings-daemon"
Thu Jan 21 21:57:30 2021 rev:25 rq:865385 version:4.8.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes
2020-12-13 17:30:50.684416784 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new.28504/cinnamon-settings-daemon.changes
2021-01-21 21:57:31.169860381 +0100
@@ -1,0 +2,12 @@
+Thu Jan 14 11:37:20 UTC 2021 - andy great <[email protected]>
+
+- Update to version 4.8.5.
+ * do not delete programs and replace them with broken symlinks to
+ themselves
+- Updates for version 4.8.4.
+ * plugins: Add symbolic links from the old to the new binary
+ locations. (#320)
+ * meson: Always install binary links
+ * xdg autostart: Refer directly to the executable name
+
+-------------------------------------------------------------------
Old:
----
cinnamon-settings-daemon-4.8.2.tar.gz
New:
----
cinnamon-settings-daemon-4.8.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.XFrUCD/_old 2021-01-21 21:57:31.721860604 +0100
+++ /var/tmp/diff_new_pack.XFrUCD/_new 2021-01-21 21:57:31.725860605 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-settings-daemon
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cinnamon-settings-daemon
-Version: 4.8.2
+Version: 4.8.5
Release: 0
Summary: The settings Daemon for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-only
@@ -118,6 +118,7 @@
%{_datadir}/polkit-1/actions/org.cinnamon.settings-daemon.plugins.*.policy
%{_datadir}/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy
%{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service
+%{_libdir}/cinnamon-settings-daemon
%files devel
%{_libdir}/pkgconfig/%{name}.pc
++++++ cinnamon-settings-daemon-4.8.2.tar.gz ->
cinnamon-settings-daemon-4.8.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.2/debian/changelog
new/cinnamon-settings-daemon-4.8.5/debian/changelog
--- old/cinnamon-settings-daemon-4.8.2/debian/changelog 2020-12-02
17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/debian/changelog 2021-01-14
00:02:29.000000000 +0100
@@ -1,3 +1,38 @@
+cinnamon-settings-daemon (4.8.5) ulyssa; urgency=medium
+
+ [ Eli Schwartz ]
+ * do not delete programs and replace them with broken symlinks to themselves
+
+ -- Clement Lefebvre <[email protected]> Wed, 13 Jan 2021 23:02:05 +0000
+
+cinnamon-settings-daemon (4.8.4) ulyssa; urgency=medium
+
+ [ Michael Webster ]
+ * plugins: Add symbolic links from the old to the new binary locations.
(#320)
+
+ [ Clement Lefebvre ]
+ * meson: Always install binary links
+ * xdg autostart: Refer directly to the executable name
+
+ -- Clement Lefebvre <[email protected]> Wed, 13 Jan 2021 09:36:35 +0000
+
+cinnamon-settings-daemon (4.8.3) ulyssa; urgency=medium
+
+ [ Michael Webster ]
+ * csd-media-keys-manager.c: Keep the volume inside 0 - 100% and keep it
divisible by VOLUME_STEP (5).
+ * csd-mediakeys: Remove grab requirement for full screenshots.
+
+ [ Clement Lefebvre ]
+ * meson: Fix incorrect path for system locale
+ * meson: Fix incorrect path for UI file
+ * meson: Fix incorrect path in xsettings plugin
+ * xsettings: Use a unified gtk-modules path for all versions of CSD
+
+ [ Michael Webster ]
+ * xsettings: Go back to looking for the gtk-modules folder in the same place
as libcsd.
+
+ -- Clement Lefebvre <[email protected]> Sat, 02 Jan 2021 18:28:17 +0000
+
cinnamon-settings-daemon (4.8.2) ulyssa; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/debian/cinnamon-settings-daemon.install
new/cinnamon-settings-daemon-4.8.5/debian/cinnamon-settings-daemon.install
--- old/cinnamon-settings-daemon-4.8.2/debian/cinnamon-settings-daemon.install
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/debian/cinnamon-settings-daemon.install
2021-01-14 00:02:29.000000000 +0100
@@ -1,6 +1,7 @@
etc/xdg/autostart/*
usr/lib/*/cinnamon-settings-daemon*/*.so
usr/libexec
+usr/lib/*/cinnamon-settings-daemon/
usr/share/applications/*
usr/share/cinnamon-settings-daemon
usr/share/dbus-1/*/org.cinnamon.SettingsDaemon.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/install-scripts/meson_link_binfiles.py
new/cinnamon-settings-daemon-4.8.5/install-scripts/meson_link_binfiles.py
--- old/cinnamon-settings-daemon-4.8.2/install-scripts/meson_link_binfiles.py
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/install-scripts/meson_link_binfiles.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import subprocess
-import sys
-
-libexecdir = sys.argv[1]
-bindir =sys.argv[2]
-exec_name = sys.argv[3]
-
-prefix = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX')
-
-orig_path = os.path.join(prefix, libexecdir, exec_name)
-dest_path = os.path.join(prefix, bindir, exec_name)
-
-if os.path.lexists(dest_path):
- print('%s already exists, skipping symlink creation' % dest_path)
-else:
- print('Adding bin symlink %s -> %s' % (orig_path, dest_path))
- subprocess.call(['mkdir', '-p', os.path.dirname(dest_path)])
- subprocess.call(['ln', '-rs', orig_path, dest_path])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/install-scripts/meson_mk_symlink.py
new/cinnamon-settings-daemon-4.8.5/install-scripts/meson_mk_symlink.py
--- old/cinnamon-settings-daemon-4.8.2/install-scripts/meson_mk_symlink.py
1970-01-01 01:00:00.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/install-scripts/meson_mk_symlink.py
2021-01-14 00:02:29.000000000 +0100
@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+
+import os
+import subprocess
+import sys
+
+orig_arg = sys.argv[1]
+target_arg =sys.argv[2]
+exec_name = sys.argv[3]
+
+prefix = os.environ.get('MESON_INSTALL_DESTDIR_PREFIX')
+
+orig_path = os.path.join(prefix, orig_arg, exec_name)
+dest_path = os.path.join(prefix, target_arg, exec_name)
+
+if os.path.lexists(dest_path):
+ subprocess.call(['unlink', dest_path])
+
+print('Adding symlink %s -> %s' % (orig_path, dest_path))
+subprocess.call(['mkdir', '-p', os.path.dirname(dest_path)])
+
+if not os.environ.get('DESTDIR'):
+ subprocess.call(['ln', '-s', orig_path, dest_path])
+else:
+ subprocess.call(['ln', '-rs', orig_path, dest_path])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.2/meson.build
new/cinnamon-settings-daemon-4.8.5/meson.build
--- old/cinnamon-settings-daemon-4.8.2/meson.build 2020-12-02
17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/meson.build 2021-01-14
00:02:29.000000000 +0100
@@ -1,4 +1,4 @@
-project('cinnamon-settings-daemon', 'c', version: '4.8.2', meson_version: '>=
0.47')
+project('cinnamon-settings-daemon', 'c', version: '4.8.5', meson_version: '>=
0.47')
gnome = import('gnome')
i18n = import('i18n')
@@ -22,8 +22,9 @@
pkglibdir = join_paths(libdir, pkgname)
apilibdir = join_paths(libdir, '@0@-@1@'.format(pkgname, api_version))
pkgdatadir = join_paths(datadir, pkgname)
+gtkbuilderdir = join_paths(prefix, datadir, pkgname)
pkgincludedir = join_paths(includedir, pkgname)
-localedir = join_paths(meson.source_root(), 'po')
+localedir = join_paths(prefix, datadir, 'locale')
polkitdir = join_paths(datadir, 'polkit-1', 'actions')
sysconfdir = get_option('sysconfdir')
autostartdir = join_paths(sysconfdir, 'xdg', 'autostart')
@@ -110,7 +111,7 @@
dbus_binding_tool = find_program('dbus-binding-tool')
csd_conf = configuration_data()
-csd_conf.set_quoted('GTKBUILDERDIR', pkgdatadir)
+csd_conf.set_quoted('GTKBUILDERDIR', gtkbuilderdir)
csd_conf.set_quoted('CINNAMON_SETTINGS_LOCALEDIR', localedir)
csd_conf.set_quoted('PACKAGE', meson.project_name())
csd_conf.set_quoted('PACKAGE_NAME', meson.project_name())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.2/meson_options.txt
new/cinnamon-settings-daemon-4.8.5/meson_options.txt
--- old/cinnamon-settings-daemon-4.8.2/meson_options.txt 2020-12-02
17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/meson_options.txt 2021-01-14
00:02:29.000000000 +0100
@@ -51,10 +51,4 @@
type: 'boolean',
value: false,
description: 'Show additional build warnings'
-)
-option(
- 'install_binfiles',
- type: 'boolean',
- value: true,
- description: 'Add symbolic links to the plugin executables into the bin
folder'
)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/a11y-keyboard/cinnamon-settings-daemon-a11y-keyboard.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - a11y-keyboard
-Exec=@libexecdir@/csd-a11y-keyboard
+Exec=csd-a11y-keyboard
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/a11y-keyboard/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/a11y-keyboard/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/a11y-keyboard/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/a11y-keyboard/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -23,8 +23,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-a11y-keyboard')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-a11y-keyboard')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-a11y-keyboard')
endif
test_a11y_prefs_dialog_sources = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/a11y-settings/cinnamon-settings-daemon-a11y-settings.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - a11y-settings
-Exec=@libexecdir@/csd-a11y-settings
+Exec=csd-a11y-settings
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/a11y-settings/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/a11y-settings/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/a11y-settings/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/a11y-settings/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -22,8 +22,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-a11y-settings')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-a11y-settings')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-a11y-settings')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/automount/cinnamon-settings-daemon-automount.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - automount
-Exec=@libexecdir@/csd-automount
+Exec=csd-automount
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/automount/csd-automount.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/automount/csd-automount.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/automount/csd-automount.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/automount/csd-automount.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -26,6 +26,6 @@
Name[zh_CN]=??????
Name[zh_HK]=??????
Icon=folder
-Exec=@libexecdir@/csd-automount
+Exec=csd-automount
OnlyShowIn=X-Cinnamon;
NoDisplay=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/automount/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/automount/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/automount/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/automount/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -24,8 +24,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-automount')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-automount')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-automount')
endif
test_automount_dialog_sources = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/background/cinnamon-settings-daemon-background.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/background/cinnamon-settings-daemon-background.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/background/cinnamon-settings-daemon-background.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/background/cinnamon-settings-daemon-background.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - background
-Exec=@libexecdir@/csd-background
+Exec=csd-background
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/background/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/background/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/background/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/background/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -23,8 +23,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-background')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-background')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-background')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/clipboard/cinnamon-settings-daemon-clipboard.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - clipboard
-Exec=@libexecdir@/csd-clipboard
+Exec=csd-clipboard
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/clipboard/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/clipboard/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/clipboard/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/clipboard/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -24,8 +24,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-clipboard')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-clipboard')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-clipboard')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/color/cinnamon-settings-daemon-color.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/color/cinnamon-settings-daemon-color.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/color/cinnamon-settings-daemon-color.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/color/cinnamon-settings-daemon-color.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - color
-Exec=@libexecdir@/csd-color
+Exec=csd-color
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/color/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/color/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/color/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/color/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -32,8 +32,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-color')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-color')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-color')
endif
test_color_sources = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/common/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/common/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/common/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/common/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -38,8 +38,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-input-helper')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-input-helper')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-input-helper')
endif
install_data(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/cursor/cinnamon-settings-daemon-cursor.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - cursor
-Exec=@libexecdir@/csd-cursor
+Exec=csd-cursor
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/cursor/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/cursor/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/cursor/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/cursor/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -23,8 +23,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-cursor')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-cursor')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-cursor')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/datetime/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/datetime/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/datetime/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/datetime/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -59,8 +59,10 @@
install: true,
install_dir: libexecdir,
)
- if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-datetime-mechanism')
+
+ meson.add_install_script(ln_script, libexecdir, bindir,
'csd-datetime-mechanism')
+ if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-datetime-mechanism')
endif
executable(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
new/cinnamon-settings-daemon-4.8.5/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/datetime/org.cinnamon.SettingsDaemon.DateTimeMechanism.service.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.cinnamon.SettingsDaemon.DateTimeMechanism
-Exec=@LIBEXECDIR@/csd-datetime-mechanism
+Exec=csd-datetime-mechanism
User=root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/dummy/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/dummy/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/dummy/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/dummy/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -23,6 +23,5 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-dummy')
-endif
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-dummy')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/housekeeping/cinnamon-settings-daemon-housekeeping.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - housekeeping
-Exec=@libexecdir@/csd-housekeeping
+Exec=csd-housekeeping
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/housekeeping/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/housekeeping/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/housekeeping/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/housekeeping/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -29,8 +29,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-housekeeping')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-housekeeping')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-housekeeping')
endif
test_disk_space_sources = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/keyboard/cinnamon-settings-daemon-keyboard.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - keyboard
-Exec=@libexecdir@/csd-keyboard
+Exec=csd-keyboard
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/keyboard/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/keyboard/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/keyboard/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/keyboard/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -29,8 +29,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-keyboard')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-keyboard')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-keyboard')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/media-keys/cinnamon-settings-daemon-media-keys.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - media-keys
-Exec=@libexecdir@/csd-media-keys
+Exec=csd-media-keys
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/media-keys/csd-media-keys-manager.c
new/cinnamon-settings-daemon-4.8.5/plugins/media-keys/csd-media-keys-manager.c
---
old/cinnamon-settings-daemon-4.8.2/plugins/media-keys/csd-media-keys-manager.c
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/media-keys/csd-media-keys-manager.c
2021-01-14 00:02:29.000000000 +0100
@@ -169,6 +169,7 @@
gint inhibit_keys_fd;
GSettings *desktop_session_settings;
GSettings *cinnamon_session_settings;
+ GSettings *sound_settings;
/* Multihead stuff */
GdkScreen *current_screen;
@@ -837,19 +838,19 @@
gboolean quiet)
{
const char *icon;
- vol = CLAMP (vol, 0, max_vol);
+
icon = get_icon_name_for_volume (muted, vol, is_mic);
+
show_osd (manager, icon, vol, OSD_ALL_OUTPUTS);
+
if (quiet == FALSE && sound_changed != FALSE && muted == FALSE) {
- GSettings *settings = g_settings_new ("org.cinnamon.desktop.sound");
- gboolean enabled = g_settings_get_boolean (settings,
"volume-sound-enabled");
- char *sound = g_settings_get_string (settings, "volume-sound-file");
+ gboolean enabled = g_settings_get_boolean
(manager->priv->sound_settings, "volume-sound-enabled");
+ char *sound = g_settings_get_string (manager->priv->sound_settings,
"volume-sound-file");
if (enabled) {
ca_context_change_device (manager->priv->ca,
gvc_mixer_stream_get_name (stream));
ca_context_play (manager->priv->ca, 1, CA_PROP_MEDIA_FILENAME,
sound, NULL);
}
g_free(sound);
- g_object_unref (settings);
}
}
@@ -969,9 +970,11 @@
{
GvcMixerStream *stream;
gboolean old_muted, new_muted;
- guint old_vol, new_vol, norm_vol_step, osd_vol, osd_max_vol;
+ guint old_vol_pa, new_vol_pa, max_vol_pa;
+ gint vol_step_pa;
+ gdouble max_vol_setting_multiplier;
+ gint osd_vol, osd_max_vol;
gboolean sound_changed;
- GSettings *settings;
/* Find the stream that corresponds to the device, if any */
gboolean is_source_stream =
@@ -990,14 +993,25 @@
if (stream == NULL)
return;
- norm_vol_step = PA_VOLUME_NORM * VOLUME_STEP / 100;
+ osd_max_vol = g_settings_get_int (manager->priv->sound_settings,
"maximum-volume");
+ max_vol_setting_multiplier = (gdouble) osd_max_vol / 100;
- settings = g_settings_new ("org.cinnamon.desktop.sound");
- osd_max_vol = PA_VOLUME_NORM * g_settings_get_int (settings,
"maximum-volume") / 100;
- g_object_unref (settings);
+ max_vol_pa = MIN ((guint) PA_VOLUME_NORM * max_vol_setting_multiplier,
PA_VOLUME_MAX);
+ vol_step_pa = (max_vol_pa * ((double) VOLUME_STEP) / 100);
+
+ // Make the max volume divisible by our 5% step.
+ max_vol_pa = (max_vol_pa / vol_step_pa) * vol_step_pa;
+
+
+// The volume snaps to PA_VALUE_NORM when adjusting - this is done outside our
control here,
+// And this messes up the 5% step: Below we try to always end up with a
percent divisible by
+// VOLUME_STEP. We round up or down to the next closest, but have to give it
an extra bump at the PA_VOLUME_NORM
+// threshold or else it gets stuck.
+#define CROSSING_PA_NORM(val,step)(val >= PA_VOLUME_NORM && val - step <
PA_VOLUME_NORM || \
+ val <= PA_VOLUME_NORM && val + step >
PA_VOLUME_NORM)
/* FIXME: this is racy */
- new_vol = old_vol = gvc_mixer_stream_get_volume (stream);
+ new_vol_pa = old_vol_pa = gvc_mixer_stream_get_volume (stream);
new_muted = old_muted = gvc_mixer_stream_get_is_muted (stream);
sound_changed = FALSE;
@@ -1007,18 +1021,27 @@
new_muted = !old_muted;
break;
case C_DESKTOP_MEDIA_KEY_VOLUME_DOWN:
- if (old_vol <= norm_vol_step) {
- new_vol = 0;
+ if (old_vol_pa <= vol_step_pa) {
+ new_vol_pa = 0;
new_muted = TRUE;
} else {
- new_vol = old_vol - norm_vol_step;
+ if (old_vol_pa % vol_step_pa > 0 && !CROSSING_PA_NORM
(old_vol_pa, vol_step_pa)) {
+ new_vol_pa = (old_vol_pa / vol_step_pa *
vol_step_pa);
+ } else {
+
+ new_vol_pa = (old_vol_pa / vol_step_pa *
vol_step_pa) - vol_step_pa;
+ }
}
break;
case C_DESKTOP_MEDIA_KEY_VOLUME_UP:
new_muted = FALSE;
/* When coming out of mute only increase the volume if it was
0 */
- if (!old_muted || old_vol == 0)
- new_vol = MIN (old_vol + norm_vol_step, osd_max_vol);
+ if (!old_muted || old_vol_pa == 0)
+ if (old_vol_pa % vol_step_pa > 0 && !CROSSING_PA_NORM
(old_vol_pa, vol_step_pa)) {
+ new_vol_pa = MIN (old_vol_pa / vol_step_pa *
vol_step_pa, max_vol_pa);
+ } else {
+ new_vol_pa = MIN (old_vol_pa / vol_step_pa *
vol_step_pa + vol_step_pa, max_vol_pa);
+ }
break;
}
@@ -1027,19 +1050,20 @@
sound_changed = TRUE;
}
- if (old_vol != new_vol) {
- if (gvc_mixer_stream_set_volume (stream, new_vol) != FALSE) {
+ if (old_vol_pa != new_vol_pa) {
+ if (gvc_mixer_stream_set_volume (stream, new_vol_pa) != FALSE)
{
gvc_mixer_stream_push_volume (stream);
sound_changed = TRUE;
}
}
- if (type == C_DESKTOP_MEDIA_KEY_VOLUME_DOWN && old_vol == 0 &&
old_muted)
- osd_vol = -1;
- else if (type == C_DESKTOP_MEDIA_KEY_VOLUME_UP && old_vol ==
osd_max_vol && !old_muted)
- osd_vol = 101;
+ if (type == C_DESKTOP_MEDIA_KEY_VOLUME_DOWN && old_vol_pa == 0 &&
old_muted)
+ // This should bottom out at 0. At -1 (old value), the OSD
doesn't show a bar.
+ osd_vol = 0;
+ else if (type == C_DESKTOP_MEDIA_KEY_VOLUME_UP && (old_vol_pa ==
max_vol_pa) && !old_muted)
+ osd_vol = 100;
else if (!new_muted)
- osd_vol = (int) (100 * (double) new_vol / osd_max_vol);
+ osd_vol = CLAMP ((int) (100 * ((double) new_vol_pa /
max_vol_pa)), 0, 100);
else
osd_vol = 0;
show_sound_osd (manager, stream, is_source_stream, osd_vol,
osd_max_vol, new_muted, sound_changed, quiet);
@@ -1826,7 +1850,7 @@
do_url_action (manager, "ghelp", timestamp);
break;
case C_DESKTOP_MEDIA_KEY_SCREENSHOT:
- execute (manager, "gnome-screenshot", FALSE, TRUE);
+ execute (manager, "gnome-screenshot", FALSE, FALSE);
break;
case C_DESKTOP_MEDIA_KEY_WINDOW_SCREENSHOT:
execute (manager, "gnome-screenshot --window", FALSE, TRUE);
@@ -1835,7 +1859,7 @@
execute (manager, "gnome-screenshot --area", FALSE, TRUE);
break;
case C_DESKTOP_MEDIA_KEY_SCREENSHOT_CLIP:
- execute (manager, "gnome-screenshot --clipboard", FALSE, TRUE);
+ execute (manager, "gnome-screenshot --clipboard", FALSE,
FALSE);
break;
case C_DESKTOP_MEDIA_KEY_WINDOW_SCREENSHOT_CLIP:
execute (manager, "gnome-screenshot --window --clipboard",
FALSE, TRUE);
@@ -1966,6 +1990,8 @@
manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR);
manager->priv->media_key_settings = g_settings_new
("org.cinnamon.settings-daemon.plugins.media-keys");
+ manager->priv->sound_settings = g_settings_new
("org.cinnamon.desktop.sound");
+
/* Logic from
http://git.gnome.org/browse/gnome-shell/tree/js/ui/status/accessibility.js#n163
*/
manager->priv->interface_settings = g_settings_new
(SETTINGS_INTERFACE_DIR);
g_signal_connect (G_OBJECT (manager->priv->interface_settings),
"changed::gtk-theme",
@@ -2102,6 +2128,8 @@
priv->media_key_settings = NULL;
}
+ g_clear_object (&priv->sound_settings);
+
if (priv->power_screen_proxy) {
g_object_unref (priv->power_screen_proxy);
priv->power_screen_proxy = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/media-keys/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/media-keys/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/media-keys/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/media-keys/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -29,8 +29,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-media-keys')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-media-keys')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-media-keys')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-settings-daemon-4.8.2/plugins/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/meson.build 2020-12-02
17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/meson.build 2021-01-14
00:02:29.000000000 +0100
@@ -1,8 +1,7 @@
desktop_conf = configuration_data()
desktop_conf.set('libexecdir', join_paths(prefix, libexecdir))
-install_binfiles = get_option('install_binfiles')
-ln_script = join_paths(meson.source_root(), 'install-scripts',
'meson_link_binfiles.py')
+ln_script = join_paths(meson.source_root(), 'install-scripts',
'meson_mk_symlink.py')
# subdir('dummy')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/mouse/cinnamon-settings-daemon-mouse.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - mouse
-Exec=@libexecdir@/csd-mouse
+Exec=csd-mouse
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/mouse/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/mouse/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/mouse/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/mouse/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -28,8 +28,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-mouse')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-mouse')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-mouse')
endif
executable(
@@ -40,8 +42,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-locate-pointer')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-locate-pointer')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-locate-pointer')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/orientation/cinnamon-settings-daemon-orientation.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - orientation
-Exec=@libexecdir@/csd-orientation
+Exec=csd-orientation
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/orientation/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/orientation/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/orientation/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/orientation/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -23,8 +23,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-orientation')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-orientation')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-orientation')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/power/cinnamon-settings-daemon-power.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/power/cinnamon-settings-daemon-power.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/power/cinnamon-settings-daemon-power.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/power/cinnamon-settings-daemon-power.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - power
-Exec=@libexecdir@/csd-power
+Exec=csd-power
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/power/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/power/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/power/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/power/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -65,8 +65,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-power')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-power')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-power')
endif
if gudev.found()
@@ -81,8 +83,10 @@
install: true,
install_dir: libexecdir,
)
- if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-backlight-helper')
+
+ meson.add_install_script(ln_script, libexecdir, bindir,
'csd-backlight-helper')
+ if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-backlight-helper')
endif
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/print-notifications/cinnamon-settings-daemon-print-notifications.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/print-notifications/cinnamon-settings-daemon-print-notifications.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/print-notifications/cinnamon-settings-daemon-print-notifications.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/print-notifications/cinnamon-settings-daemon-print-notifications.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - print-notifications
-Exec=@libexecdir@/csd-print-notifications
+Exec=csd-print-notifications
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/print-notifications/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/print-notifications/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/print-notifications/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/print-notifications/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -28,8 +28,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-print-notifications')
+
+meson.add_install_script(ln_script, libexecdir, bindir,
'csd-print-notifications')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-print-notifications')
endif
executable(
@@ -40,8 +42,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-printer')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-printer')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-printer')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/screensaver-proxy/cinnamon-settings-daemon-screensaver-proxy.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - screensaver-proxy
-Exec=@libexecdir@/csd-screensaver-proxy
+Exec=csd-screensaver-proxy
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/screensaver-proxy/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/screensaver-proxy/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/screensaver-proxy/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/screensaver-proxy/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -22,8 +22,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-screensaver-proxy')
+
+meson.add_install_script(ln_script, libexecdir, bindir,
'csd-screensaver-proxy')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-screensaver-proxy')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/smartcard/cinnamon-settings-daemon-smartcard.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - smartcard
-Exec=@libexecdir@/csd-smartcard
+Exec=csd-smartcard
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/smartcard/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/smartcard/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/smartcard/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/smartcard/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -24,8 +24,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-smartcard')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-smartcard')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-smartcard')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/sound/cinnamon-settings-daemon-sound.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - sound
-Exec=@libexecdir@/csd-sound
+Exec=csd-sound
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/sound/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/sound/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/sound/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/sound/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -26,8 +26,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-sound')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-sound')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-sound')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/wacom/cinnamon-settings-daemon-wacom.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - wacom
-Exec=@libexecdir@/csd-wacom
+Exec=csd-wacom
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/wacom/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/wacom/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/wacom/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/wacom/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -60,8 +60,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-wacom')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-wacom')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-wacom')
endif
if gudev.found()
@@ -73,8 +75,10 @@
install: true,
install_dir: libexecdir,
)
- if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir,
'csd-wacom-led-helper')
+
+ meson.add_install_script(ln_script, libexecdir, bindir,
'csd-wacom-led-helper')
+ if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-wacom-led-helper')
endif
endif
@@ -86,8 +90,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-list-wacom')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-list-wacom')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir,
'csd-list-wacom')
endif
executable(
@@ -98,8 +104,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-wacom-osd')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-wacom-osd')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-wacom-osd')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/xrandr/cinnamon-settings-daemon-xrandr.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - xrandr
-Exec=@libexecdir@/csd-xrandr
+Exec=csd-xrandr
OnlyShowIn=X-Cinnamon;
NoDisplay=false
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/xrandr/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/xrandr/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/xrandr/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/xrandr/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -25,8 +25,10 @@
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-xrandr')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-xrandr')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-xrandr')
endif
configure_file(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
new/cinnamon-settings-daemon-4.8.5/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
---
old/cinnamon-settings-daemon-4.8.2/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
2020-12-02 17:48:18.000000000 +0100
+++
new/cinnamon-settings-daemon-4.8.5/plugins/xsettings/cinnamon-settings-daemon-xsettings.desktop.in
2021-01-14 00:02:29.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Cinnamon Settings Daemon - xsettings
-Exec=@libexecdir@/csd-xsettings
+Exec=csd-xsettings
OnlyShowIn=X-Cinnamon;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-settings-daemon-4.8.2/plugins/xsettings/meson.build
new/cinnamon-settings-daemon-4.8.5/plugins/xsettings/meson.build
--- old/cinnamon-settings-daemon-4.8.2/plugins/xsettings/meson.build
2020-12-02 17:48:18.000000000 +0100
+++ new/cinnamon-settings-daemon-4.8.5/plugins/xsettings/meson.build
2021-01-14 00:02:29.000000000 +0100
@@ -33,13 +33,15 @@
dependencies: xsettings_deps,
c_args: [
'-DPLUGIN_NAME="@0@"'.format(plugin_name),
-
'-DGTK_MODULES_DIRECTORY="@0@/cinnamon-settings-daemon-@1@/gtk-modules/"'.format(libdir,
meson.project_version()),
+
'-DGTK_MODULES_DIRECTORY="@0@/@1@/cinnamon-settings-daemon-@2@/gtk-modules/"'.format(prefix,
libdir, api_version),
],
install: true,
install_dir: libexecdir,
)
-if install_binfiles
- meson.add_install_script(ln_script, libexecdir, bindir, 'csd-xsettings')
+
+meson.add_install_script(ln_script, libexecdir, bindir, 'csd-xsettings')
+if libexecdir != pkglibdir
+ meson.add_install_script(ln_script, libexecdir, pkglibdir, 'csd-xsettings')
endif
executable(
@@ -48,7 +50,7 @@
include_directories: [include_dirs, common_inc],
dependencies: xsettings_deps,
c_args: [
-
'-DGTK_MODULES_DIRECTORY="@0@/cinnamon-settings-daemon-@1@/gtk-modules/"'.format(libdir,
meson.project_version()),
+
'-DGTK_MODULES_DIRECTORY="@0@/@1@/cinnamon-settings-daemon-@2@/gtk-modules/"'.format(prefix,
libdir, api_version),
],
)
