[arch-commits] Commit in sugar/trunk (PKGBUILD dont-overwrite-settings.patch)

[Balló György]

    Date: Wednesday, May 27, 2020 @ 19:40:52
  Author: bgyorgy
Revision: 636023

upgpkg: sugar 0.117-1: Update to new version

Modified:
  sugar/trunk/PKGBUILD
  sugar/trunk/dont-overwrite-settings.patch

-------------------------------+
 PKGBUILD                      |    6 +++---
 dont-overwrite-settings.patch |   29 ++++++++++++++++++++---------
 2 files changed, 23 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 19:32:54 UTC (rev 636022)
+++ PKGBUILD	2020-05-27 19:40:52 UTC (rev 636023)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=sugar
-pkgver=0.116
+pkgver=0.117
 pkgrel=1
 pkgdesc="Sugar GTK shell"
 arch=('any')
@@ -14,8 +14,8 @@
 makedepends=('intltool' 'python-empy')
 source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
         dont-overwrite-settings.patch)
-sha256sums=('7d0ec1619c3167cb32ccbbed1da2cb42e9c7846aff5c9a45a35085067590a09c'
-            '3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
+sha256sums=('e44619e4df2425671e840cf557cdb6449bf65574d4e16e6647eb2fef739d75aa'
+            'a426e295f8810c5b6b1a136338b630c67c5b98c7ca368a261e0390e42b6d1465')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: dont-overwrite-settings.patch
===================================================================
--- dont-overwrite-settings.patch	2020-05-27 19:32:54 UTC (rev 636022)
+++ dont-overwrite-settings.patch	2020-05-27 19:40:52 UTC (rev 636023)
@@ -1,7 +1,7 @@
-diff -Naur sugar-0.112.orig/src/jarabe/main.py sugar-0.112/src/jarabe/main.py
---- sugar-0.112.orig/src/jarabe/main.py	2017-05-16 01:47:18.000000000 +0200
-+++ sugar-0.112/src/jarabe/main.py	2017-10-15 20:08:57.040726987 +0200
-@@ -195,7 +195,7 @@
+diff -Naur sugar-0.117.orig/src/jarabe/main.py sugar-0.117/src/jarabe/main.py
+--- sugar-0.117.orig/src/jarabe/main.py	2020-03-17 01:02:30.000000000 +0100
++++ sugar-0.117/src/jarabe/main.py	2020-05-27 21:38:18.454003200 +0200
+@@ -188,7 +188,7 @@
      global _metacity_process, _metacity_sid
  
      _metacity_process = subprocess.Popen(
@@ -8,15 +8,26 @@
 -        ['metacity', '--no-force-fullscreen', '--no-composite'],
 +        ['metacity', '--no-force-fullscreen'],
          stdout=subprocess.PIPE)
-     _metacity_sid = GObject.io_add_watch(_metacity_process.stdout, GLib.IO_HUP,
-                                          __window_manager_failed_cb)
-@@ -203,9 +203,6 @@
+     _metacity_sid = GLib.io_add_watch(_metacity_process.stdout, GLib.IO_HUP,
+                                       __window_manager_failed_cb)
+@@ -196,12 +196,6 @@
  
  
  def _start_window_manager():
--    settings = Gio.Settings.new('org.gnome.desktop.interface')
--    settings.set_string('cursor-theme', 'sugar')
+-    global _cursor_theme_settings, _cursor_theme
 -
+-    _cursor_theme_settings = Gio.Settings.new('org.gnome.desktop.interface')
+-    _cursor_theme = _cursor_theme_settings.get_string('cursor-theme')
+-    _cursor_theme_settings.set_string('cursor-theme', 'sugar')
+-
      _restart_window_manager()
  
      screen = Wnck.Screen.get_default()
+@@ -211,7 +205,6 @@
+ 
+ 
+ def _stop_window_manager():
+-    _cursor_theme_settings.set_string('cursor-theme', _cursor_theme)
+     _metacity_process.terminate()
+ 
+