CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'orca-backport' into 'etiona'

Browse source 
Orca backport

See merge request trisquel/package-helpers!289
This commit is contained in:
Ruben Rodriguez 2020-01-31 18:35:12 +00:00
commit 0b0991a9c3
4 changed files with 124 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

43
helpers/DATA/mate-control-center/patches/mcc-f461_mate-da-capplet.c.patch Normal file
View file

@ -0,0 +1,43 @@
diff -Naur mate-control-center-1.20.2/capplets/default-applications/mate-da-capplet.c mate-control-center-1.20.2-c/capplets/default-applications/mate-da-capplet.c
--- mate-control-center-1.20.2/capplets/default-applications/mate-da-capplet.c 2018-03-27 06:15:26.000000000 -0600
+++ mate-control-center-1.20.2-c/capplets/default-applications/mate-da-capplet.c 2020-01-26 17:18:15.047144000 -0600
@@ -587,7 +587,13 @@
capplet->spreadsheet_editors = g_app_info_get_all_for_type("application/vnd.ms-excel");
capplet->visual_ats = NULL;
- capplet->visual_ats = fill_list_from_desktop_file (capplet->visual_ats, APPLICATIONSDIR "/orca.desktop");
+ const gchar *const *sys_config_dirs = g_get_system_config_dirs();
+ for (const gchar* c = *sys_config_dirs; c; c=*++sys_config_dirs)
+ {
+ gchar* path = g_strconcat (c, "/autostart/orca-autostart.desktop", NULL);
+ capplet->visual_ats = fill_list_from_desktop_file (capplet->visual_ats, path);
+ g_free (path);
+ }
capplet->visual_ats = g_list_reverse (capplet->visual_ats);
capplet->mobility_ats = NULL;
@@ -642,7 +648,7 @@
g_signal_connect(capplet->spreadsheet_combo_box, "changed", G_CALLBACK(spreadsheet_combo_changed_cb), capplet);
g_settings_bind (capplet->mobility_settings, MOBILITY_STARTUP_KEY, capplet->mobility_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (capplet->visual_settings, VISUAL_STARTUP_KEY, capplet->visual_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (capplet->visual_startup_settings, VISUAL_STARTUP_KEY, capplet->visual_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
gtk_window_set_icon_name(GTK_WINDOW (capplet->window), "preferences-desktop-default-applications");
@@ -706,6 +712,7 @@
capplet->terminal_settings = g_settings_new (TERMINAL_SCHEMA);
capplet->mobility_settings = g_settings_new (MOBILITY_SCHEMA);
capplet->visual_settings = g_settings_new (VISUAL_SCHEMA);
+ capplet->visual_startup_settings = g_settings_new (VISUAL_STARTUP_SCHEMA);
show_dialog(capplet, start_page);
g_free(start_page);
@@ -715,6 +722,7 @@
g_object_unref (capplet->terminal_settings);
g_object_unref (capplet->mobility_settings);
g_object_unref (capplet->visual_settings);
+ g_object_unref (capplet->visual_startup_settings);
return 0;
}

21
helpers/DATA/mate-control-center/patches/mcc-f461_mate-da-capplet.h.patch Normal file
View file

@ -0,0 +1,21 @@
diff -Naur mate-control-center-1.20.2-c/capplets/default-applications/mate-da-capplet.h mate-control-center-1.20.2-f461/capplets/default-applications/mate-da-capplet.h
--- mate-control-center-1.20.2-c/capplets/default-applications/mate-da-capplet.h 2018-03-27 06:15:26.000000000 -0600
+++ mate-control-center-1.20.2-f461/capplets/default-applications/mate-da-capplet.h 2020-01-26 17:19:36.795605940 -0600
@@ -29,7 +29,8 @@
#define VISUAL_SCHEMA "org.mate.applications-at-visual"
#define VISUAL_KEY "exec"
-#define VISUAL_STARTUP_KEY "startup"
+#define VISUAL_STARTUP_SCHEMA "org.gnome.desktop.a11y.applications"
+#define VISUAL_STARTUP_KEY "screen-reader-enabled"
#define MOBILITY_SCHEMA "org.mate.applications-at-mobility"
#define MOBILITY_KEY "exec"
@@ -80,6 +81,7 @@
/* Settings objects */
GSettings* terminal_settings;
GSettings* visual_settings;
+ GSettings* visual_startup_settings;
GSettings* mobility_settings;
} MateDACapplet;

30
helpers/make-mate-control-center Normal file
View file

@ -0,0 +1,30 @@
#!/bin/sh
#
# Copyright (C) 2020 Luis Guzmán <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
#Keep patching 'til v1.23.0 where upstream add it.
patch -p1 < $DATA/patches/mcc-f461_mate-da-capplet.c.patch
patch -p1 < $DATA/patches/mcc-f461_mate-da-capplet.h.patch
changelog "Backport Fix #461 mate-control-center"
compile

30
helpers/make-orca Normal file
View file

@ -0,0 +1,30 @@
#!/bin/sh
#
# Copyright (C) 2020 Luis Guzmán <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe'
REPOKEY="3B4FE6ACC0B21F32"
. ./config
sed '/speech-dispatcher/s/$/ speech-dispatcher-espeak-ng,/' -i debian/control*
changelog "Backported from Focal"
compile