From 588d59d83a98e19c3c4b2c41fda1ea603ebbac42 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Fri, 2 Dec 2022 10:57:26 -0500 Subject: [PATCH] sugar: fix browse activity failure --- helpers/make-sugar | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/helpers/make-sugar b/helpers/make-sugar index 2ec1fd58..378f9ffa 100644 --- a/helpers/make-sugar +++ b/helpers/make-sugar @@ -17,11 +17,28 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu kinetic universe' . ./config +# https://github.com/sugarlabs/sugar/issues/962 +cat << EOF | patch -p1 +--- a/src/jarabe/main.py 2022-04-23 02:53:15.000000000 -0400 ++++ b/src/jarabe/main.py 2022-12-02 09:08:53.666508572 -0500 +@@ -297,10 +297,6 @@ + os.environ['no_proxy'] = ",".join(Gio.Settings.new( + 'org.sugarlabs.system.proxy').get_strv('ignore-hosts')) + +- elif g_mode == 'none': +- for each_env_variable in env_variables: +- os.environ[each_env_variable] = '' +- + + def setup_theme(): + settings = Gtk.Settings.get_default() +EOF + changelog "Backported from kinetic" compile -- GitLab