Compare commits
25 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
76e828a4f2 | ||
|
f8fec3c7fd | ||
|
bc805ca4e7 | ||
|
f5e09f17bd | ||
|
6c86803937 | ||
|
ad2d00ae79 | ||
|
0ad4cb31e8 | ||
|
d988c0fea0 | ||
|
41af657d61 | ||
|
6888162a47 | ||
|
2ce4079652 | ||
|
0d72bfa79b | ||
|
9376abefb7 | ||
|
e9f4af8bb4 | ||
|
371177a16b | ||
|
02c9b09cd2 | ||
|
f05d78f1d0 | ||
|
fcca224131 | ||
|
7a53fda6aa | ||
|
95896a7ddb | ||
|
c3422cb933 | ||
|
ec0c59456c | ||
|
2b16385172 | ||
|
362699729b | ||
|
307bac9169 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -8,8 +8,11 @@
|
||||
/mate-settings-daemon-1.6.0.tar.xz
|
||||
/mate-settings-daemon-1.6.1.tar.xz
|
||||
/mate-settings-daemon-1.6.2.gitd2d3aa7.tar.xz
|
||||
/mate-settings-daemon-1.6.2.tar.xz
|
||||
/mate-settings-daemon-1.7.0.tar.xz
|
||||
/mate-settings-daemon-1.7.1.tar.xz
|
||||
/mate-settings-daemon-1.7.90.tar.xz
|
||||
/mate-settings-daemon-1.8.0.tar.xz
|
||||
/mate-settings-daemon-1.8.1.tar.xz
|
||||
/mate-settings-daemon-1.8.2.tar.xz
|
||||
/mate-settings-daemon-1.8.3.tar.xz
|
||||
|
@ -1,12 +1,20 @@
|
||||
Name: mate-settings-daemon
|
||||
Version: 1.8.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.8.3
|
||||
Release: 1%{?dist}
|
||||
Summary: MATE Desktop settings daemon
|
||||
License: GPLv2+
|
||||
URL: http://mate-desktop.org
|
||||
|
||||
Source0: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
|
||||
|
||||
# rhbz (1102581)
|
||||
# https://github.com/mate-desktop/mate-settings-daemon/pull/91
|
||||
Patch0: mate-settings-daemon_safer-access-to-list-element-data.patch
|
||||
# rhbz (#1157698)
|
||||
# https://github.com/mate-desktop/mate-settings-daemon/pull/99
|
||||
Patch1: mate-settings-daemon_changed-reaction-to-numlock-state.patch
|
||||
# https://github.com/mate-desktop/mate-settings-daemon/pull/97
|
||||
Patch2: mate-settings-daemon_a11y-keyboard-crash.patch
|
||||
|
||||
# To generate tarball
|
||||
# wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
|
||||
#Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
|
||||
@ -30,6 +38,10 @@ Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
|
||||
# needed for xrandr capplet
|
||||
Requires: mate-control-center-filesystem
|
||||
|
||||
Requires: libmatekbd%{?_isa} >= 0:1.6.1-1
|
||||
# needed for xrandr capplet
|
||||
Requires: mate-control-center-filesystem
|
||||
|
||||
%description
|
||||
This package contains the daemon which is responsible for setting the
|
||||
various parameters of a MATE session and the applications that run
|
||||
@ -46,6 +58,12 @@ under it.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
#%%setup -q -n %%{name}-%%{_internal_version}
|
||||
#NOCONFIGURE=1 ./autogen.sh
|
||||
|
||||
%patch0 -p1 -b .safer-access
|
||||
%patch1 -p1 -b .changed-reaction
|
||||
%patch2 -p1 -b .a11y-keyboard
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -110,27 +128,35 @@ fi
|
||||
%{_includedir}/mate-settings-daemon
|
||||
%{_libdir}/pkgconfig/mate-settings-daemon.pc
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
* Wed Mar 11 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.3.1
|
||||
- update to 1.8.3 release
|
||||
- fix rhbz (#1157698)
|
||||
|
||||
* Tue May 06 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.1-1
|
||||
- update to 1.8.1
|
||||
- add mate-settings-daemon_a11y-keyboard-crash.patch
|
||||
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-2
|
||||
- fix rhbz (1102581)
|
||||
|
||||
* Wed Mar 05 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.8.0-1
|
||||
- Update to 1.8.0
|
||||
* Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.2-1
|
||||
- update to 1.8.2 release
|
||||
|
||||
* Tue Feb 18 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.7.90-1
|
||||
- update to 1.7.90
|
||||
- use --with-gnome --all-name for find locale
|
||||
* Sat Jul 26 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.8.1-2
|
||||
- update to 1.8.1 release
|
||||
- clean up spec file
|
||||
- use modern 'make install' macro
|
||||
- add man dir
|
||||
- add --with-gnome --all-name for find language
|
||||
- update file section
|
||||
|
||||
* Sun Feb 09 2014 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.1-1
|
||||
- Update to 1.7.1
|
||||
* Thu Jul 17 2014 Rex Dieter <rdieter@fedoraproject.org> 1.6.2-3
|
||||
- rebuild (for pulseaudio, bug #1117683)
|
||||
|
||||
* Thu Dec 05 2013 Dan Mashal <dan.mashal@fedoraproject.org> - 1.7.0-1
|
||||
- Update to 1.7.0
|
||||
* Sat Jan 04 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-2
|
||||
- revert https://github.com/mate-desktop/mate-settings-daemon/commit/b4d8c8e
|
||||
- to fix rhbz (#1048409) thumbnailer issue for < f20
|
||||
|
||||
* Fri Dec 20 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-1
|
||||
- update to 1.6.2 release
|
||||
|
||||
* Thu Oct 03 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.6.2-0.3.gitd2d3aa7
|
||||
- enable pulsaudio support
|
||||
|
86
mate-settings-daemon_a11y-keyboard-crash.patch
Normal file
86
mate-settings-daemon_a11y-keyboard-crash.patch
Normal file
@ -0,0 +1,86 @@
|
||||
diff --git a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
|
||||
index 72d42ff..675b993 100644
|
||||
--- a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
|
||||
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
|
||||
@@ -458,7 +458,7 @@ on_sticky_keys_checkbutton_toggled (GtkToggleButton *button,
|
||||
|
||||
static void
|
||||
on_bounce_keys_checkbutton_toggled (GtkToggleButton *button,
|
||||
- MsdA11yPreferencesDialog *dialog)
|
||||
+ MsdA11yPreferencesDialog *dialog)
|
||||
{
|
||||
config_set_bounce_keys (dialog, gtk_toggle_button_get_active (button));
|
||||
}
|
||||
@@ -649,7 +649,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_sticky_keys_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_sticky_keys (dialog, &is_writable);
|
||||
ui_set_sticky_keys (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -662,7 +662,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_bounce_keys_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_bounce_keys (dialog, &is_writable);
|
||||
ui_set_bounce_keys (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -675,7 +675,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_slow_keys_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_slow_keys (dialog, &is_writable);
|
||||
ui_set_slow_keys (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -688,7 +688,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_high_contrast_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_high_contrast (dialog, &is_writable);
|
||||
ui_set_high_contrast (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -701,7 +701,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_at_screen_keyboard_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_at_screen_keyboard (dialog, &is_writable);
|
||||
ui_set_at_screen_keyboard (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -720,7 +720,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_at_screen_reader_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_at_screen_reader (dialog, &is_writable);
|
||||
ui_set_at_screen_reader (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -739,7 +739,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_at_screen_magnifier_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_at_screen_magnifier (dialog, &is_writable);
|
||||
ui_set_at_screen_magnifier (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
@@ -758,7 +758,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog,
|
||||
g_signal_connect (widget,
|
||||
"toggled",
|
||||
G_CALLBACK (on_large_print_checkbutton_toggled),
|
||||
- NULL);
|
||||
+ dialog);
|
||||
enabled = config_get_large_print (&is_writable);
|
||||
ui_set_large_print (dialog, enabled);
|
||||
if (! is_writable) {
|
||||
|
31
mate-settings-daemon_changed-reaction-to-numlock-state.patch
Normal file
31
mate-settings-daemon_changed-reaction-to-numlock-state.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c
|
||||
index a4b97e5..8d261b6 100644
|
||||
--- a/plugins/keyboard/msd-keyboard-manager.c
|
||||
+++ b/plugins/keyboard/msd-keyboard-manager.c
|
||||
@@ -267,10 +267,6 @@ apply_settings (GSettings *settings,
|
||||
bell_volume = (volume_string && !strcmp (volume_string, "on")) ? 50 : 0;
|
||||
g_free (volume_string);
|
||||
|
||||
-#ifdef HAVE_X11_EXTENSIONS_XKB_H
|
||||
- rnumlock = g_settings_get_boolean (settings, KEY_NUMLOCK_REMEMBER);
|
||||
-#endif /* HAVE_X11_EXTENSIONS_XKB_H */
|
||||
-
|
||||
gdk_error_trap_push ();
|
||||
if (repeat) {
|
||||
gboolean rate_set = FALSE;
|
||||
@@ -306,8 +302,12 @@ apply_settings (GSettings *settings,
|
||||
&kbdcontrol);
|
||||
|
||||
#ifdef HAVE_X11_EXTENSIONS_XKB_H
|
||||
- if (manager->priv->have_xkb && rnumlock) {
|
||||
- numlock_set_xkb_state (numlock_get_settings_state (settings));
|
||||
+ rnumlock = g_settings_get_boolean (settings, KEY_NUMLOCK_REMEMBER);
|
||||
+
|
||||
+ if (rnumlock == 0 || key == NULL) {
|
||||
+ if (manager->priv->have_xkb && rnumlock) {
|
||||
+ numlock_set_xkb_state (numlock_get_settings_state (settings));
|
||||
+ }
|
||||
}
|
||||
#endif /* HAVE_X11_EXTENSIONS_XKB_H */
|
||||
|
||||
|
14
mate-settings-daemon_safer-access-to-list-element-data.patch
Normal file
14
mate-settings-daemon_safer-access-to-list-element-data.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c
|
||||
index 215be80..5b6a04b 100644
|
||||
--- a/plugins/background/msd-background-manager.c
|
||||
+++ b/plugins/background/msd-background-manager.c
|
||||
@@ -269,7 +269,7 @@ on_screen_size_changed (GdkScreen *screen,
|
||||
return;
|
||||
|
||||
gint scr_num = gdk_screen_get_number (screen);
|
||||
- gchar *old_size = g_list_nth (manager->priv->scr_sizes, scr_num)->data;
|
||||
+ gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num);
|
||||
gchar *new_size = g_strdup_printf ("%dx%d", gdk_screen_get_width (screen),
|
||||
gdk_screen_get_height (screen));
|
||||
if (g_strcmp0 (old_size, new_size) != 0)
|
||||
|
Loading…
Reference in New Issue
Block a user