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

[Balló György]

    Date: Sunday, October 15, 2017 @ 18:11:53
  Author: bgyorgy
Revision: 262972

upgpkg: sugar 0.112-1

Update to new version

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

-------------------------------+
 PKGBUILD                      |    8 ++++----
 dont-overwrite-settings.patch |   26 ++++++++++++++++----------
 2 files changed, 20 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-15 18:04:27 UTC (rev 262971)
+++ PKGBUILD	2017-10-15 18:11:53 UTC (rev 262972)
@@ -2,8 +2,8 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=sugar
-pkgver=0.110.0
-pkgrel=2
+pkgver=0.112
+pkgrel=1
 pkgdesc="Sugar GTK shell"
 arch=('any')
 url="https://sugarlabs.org/"
@@ -15,8 +15,8 @@
 makedepends=('intltool')
 source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
         dont-overwrite-settings.patch)
-sha256sums=('c5b662442a404f4dab7f67514aae5f887533262e4a98aa4b4c675e4f63b2203d'
-            'ef7dc12e1e9ded529a950ac79eb3ec3e1644dcbfe137572c7319a4cbe9d7db07')
+sha256sums=('39aa7ffe866c9f1b4a113e7a400686d60277a3517db1fed62f536b1fdc71c38b'
+            '3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: dont-overwrite-settings.patch
===================================================================
--- dont-overwrite-settings.patch	2017-10-15 18:04:27 UTC (rev 262971)
+++ dont-overwrite-settings.patch	2017-10-15 18:11:53 UTC (rev 262972)
@@ -1,16 +1,22 @@
-diff -Naur sugar-0.110.0.orig/src/jarabe/main.py sugar-0.110.0/src/jarabe/main.py
---- sugar-0.110.0.orig/src/jarabe/main.py	2016-10-07 12:46:55.000000000 +0200
-+++ sugar-0.110.0/src/jarabe/main.py	2017-03-30 19:35:47.528931067 +0200
-@@ -186,11 +186,8 @@
+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 @@
+     global _metacity_process, _metacity_sid
+ 
+     _metacity_process = subprocess.Popen(
+-        ['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 @@
+ 
+ 
  def _start_window_manager():
-     global _metacity_process
- 
 -    settings = Gio.Settings.new('org.gnome.desktop.interface')
 -    settings.set_string('cursor-theme', 'sugar')
 -
-     _metacity_process = subprocess.Popen(
--        ['metacity', '--no-force-fullscreen', '--no-composite'])
-+        ['metacity', '--no-force-fullscreen'])
+     _restart_window_manager()
  
      screen = Wnck.Screen.get_default()
-     screen.connect('window-manager-changed', __window_manager_changed_cb)