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

2020-05-27 Thread Balló György via arch-commits 
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
===
--- PKGBUILD2020-05-27 19:32:54 UTC (rev 636022)
+++ PKGBUILD2020-05-27 19:40:52 UTC (rev 636023)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György 
 
 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.py2017-05-16 01:47:18.0 
+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.py2020-03-17 01:02:30.0 
+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()
+ 
+

[arch-commits] Commit in sugar/trunk (PKGBUILD)

2020-03-09 Thread Balló György via arch-commits 
Date: Monday, March 9, 2020 @ 18:58:51
  Author: bgyorgy
Revision: 593206

upgpkg: sugar 0.116-1: Update to new version

Modified:
  sugar/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-09 18:57:59 UTC (rev 593205)
+++ PKGBUILD2020-03-09 18:58:51 UTC (rev 593206)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György 
 
 pkgname=sugar
-pkgver=0.114
+pkgver=0.116
 pkgrel=1
 pkgdesc="Sugar GTK shell"
 arch=('any')
@@ -8,13 +8,13 @@
 url="https://sugarlabs.org/;
 license=('GPL')
 depends=('gnome-keyring' 'gst-plugins-espeak' 'gtksourceview3' 'gvfs' 
'libwnck3'
- 'libxklavier' 'metacity' 'mobile-broadband-provider-info' 'openssh' 
'python2-gwebsockets'
+ 'libxklavier' 'metacity' 'mobile-broadband-provider-info' 'openssh' 
'python-gwebsockets'
  'sugar-toolkit-gtk3' 'telepathy-gabble' 'telepathy-salut' 'upower' 
'webkit2gtk'
  'xdg-user-dirs')
-makedepends=('intltool')
+makedepends=('intltool' 'python-empy')
 
source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
 dont-overwrite-settings.patch)
-sha256sums=('0917276ed41684b885bdac063562fcdfb682660700ee142a02b516a3eeecdbb1'
+sha256sums=('7d0ec1619c3167cb32ccbbed1da2cb42e9c7846aff5c9a45a35085067590a09c'
 '3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
 
 prepare() {
@@ -30,7 +30,8 @@
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-  --disable-schemas-compile
+  --disable-schemas-compile \
+  EMPY=`echo /usr/lib/python3.*/site-packages/em.py`
   make
 }

[arch-commits] Commit in sugar/trunk (PKGBUILD)

2019-06-19 Thread Balló György via arch-commits 
Date: Wednesday, June 19, 2019 @ 11:02:58
  Author: bgyorgy
Revision: 482335

upgpkg: sugar 0.114-1

Update to new version

Modified:
  sugar/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-19 11:00:30 UTC (rev 482334)
+++ PKGBUILD2019-06-19 11:02:58 UTC (rev 482335)
@@ -1,7 +1,7 @@
 # Maintainer: Balló György 
 
 pkgname=sugar
-pkgver=0.113
+pkgver=0.114
 pkgrel=1
 pkgdesc="Sugar GTK shell"
 arch=('any')
@@ -14,7 +14,7 @@
 makedepends=('intltool')
 
source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
 dont-overwrite-settings.patch)
-sha256sums=('dd0f8d632db5f1123cca34106ebdd3a984145c33c0e3f530853e0819947bd2a0'
+sha256sums=('0917276ed41684b885bdac063562fcdfb682660700ee142a02b516a3eeecdbb1'
 '3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
 
 prepare() {

[arch-commits] Commit in sugar/trunk (PKGBUILD remove-gconf.patch)

2019-03-28 Thread Balló György via arch-commits 
Date: Thursday, March 28, 2019 @ 22:56:52
  Author: bgyorgy
Revision: 445650

upgpkg: sugar 0.113-1

Update to new version

Modified:
  sugar/trunk/PKGBUILD
Deleted:
  sugar/trunk/remove-gconf.patch

+
 PKGBUILD   |   18 
 remove-gconf.patch | 1019 ---
 2 files changed, 5 insertions(+), 1032 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-28 22:51:37 UTC (rev 445649)
+++ PKGBUILD2019-03-28 22:56:52 UTC (rev 445650)
@@ -1,8 +1,8 @@
 # Maintainer: Balló György 
 
 pkgname=sugar
-pkgver=0.112
-pkgrel=3
+pkgver=0.113
+pkgrel=1
 pkgdesc="Sugar GTK shell"
 arch=('any')
 url="https://sugarlabs.org/;
@@ -13,16 +13,12 @@
  'xdg-user-dirs')
 makedepends=('intltool')
 
source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
-dont-overwrite-settings.patch
-remove-gconf.patch)
-sha256sums=('39aa7ffe866c9f1b4a113e7a400686d60277a3517db1fed62f536b1fdc71c38b'
-'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c'
-'138e652824feae8c0e324e19cc11d3793035c81db868a7bb21d2e05531ea98fc')
+dont-overwrite-settings.patch)
+sha256sums=('dd0f8d632db5f1123cca34106ebdd3a984145c33c0e3f530853e0819947bd2a0'
+'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
 
 prepare() {
   cd $pkgname-$pkgver
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/jarabe/model/update/aslo.py
-  sed -i "s/gi.require_version('WebKit', '3.0')/gi.require_version('WebKit2', 
'4.0')/" src/jarabe/main.py
 
   # Use correct D-Bus config location
   sed -i '/^nmservicedir =/ s/sysconfdir/datadir/' data/Makefile.{am,in}
@@ -29,10 +25,6 @@
 
   # Don't overwrite default GNOME settings
   patch -Np1 -i ../dont-overwrite-settings.patch
-
-  # Remove GConf support
-  patch -Np1 -i ../remove-gconf.patch
-  autoreconf -fi
 }
 
 build() {

Deleted: remove-gconf.patch
===
--- remove-gconf.patch  2019-03-28 22:51:37 UTC (rev 445649)
+++ remove-gconf.patch  2019-03-28 22:56:52 UTC (rev 445650)
@@ -1,1019 +0,0 @@
-From 38b173dd908209852d10501bbd64ce930286fdb7 Mon Sep 17 00:00:00 2001
-From: James Cameron 
-Date: Mon, 26 Mar 2018 14:52:44 +1100
-Subject: [PATCH] jarabe, extensions - remove GConf compatibility
-
-GConf compatibility support in Sugar allowed activities to read or be
-notified of changes to age, gender, nick, user colour, collaboration
-server, backup server, or automatic power management.  Redundant code
-updated GConf values at the same time as updates to Gio.Settings values.
-
-Remove GConf from Sugar;
-
-- remove the autoconf rules,
-
-- remove the Makefile rules,
-
-- remove the schema conversion for upgrades from GTK+ 2 Sugar,
-
-- remove the gsettings-migrated setting key,
-
-- remove the GConf schema from POTFILES.in,
-
-- remove the GConf schema,
-
-- remove redundant code for GConf value updates,
-
-- remove migration from GConf to Gio.Settings.
-
-Warning: may break some activities.  May cause default values to be
-used, traceback, or fail to start for any activity using the removed
-GConf schema to read the removed configuration values for; age, gender,
-nick, user colour, collaboration server, backup server, and automatic
-power management.  Fix GTK+ 2 activities by porting to GTK+ 3 and
-Gio.Settings.  Fix GTK+ 3 activities by porting from GConf to
-Gio.Settings.
-
-Tested on Ubuntu 16.04.
-
-Tested on Ubuntu 18.04 with autogen.sh, distcheck, install, uninstall.

- configure.ac  |  11 +-
- data/Makefile.am  |  16 +-
- data/org.sugarlabs.gschema.xml|   5 -
- data/sugar-schemas.convert|  69 -
- data/sugar.schemas.in | 491 --
- extensions/cpsection/aboutme/model.py |  15 --
- extensions/cpsection/network/model.py |  11 -
- extensions/cpsection/power/model.py   |   5 -
- po/POTFILES.in|   1 -
- src/jarabe/desktop/schoolserver.py|   7 -
- src/jarabe/intro/__init__.py  |   6 +-
- src/jarabe/intro/agepicker.py |   5 -
- src/jarabe/intro/genderpicker.py  |   6 -
- src/jarabe/intro/window.py|  10 -
- src/jarabe/main.py| 106 
- 15 files changed, 4 insertions(+), 760 deletions(-)
- delete mode 100644 data/sugar-schemas.convert
- delete mode 100644 data/sugar.schemas.in
-
-diff --git a/configure.ac b/configure.ac
-index 4e8ae65fa..be64e6731 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,7 @@ AM_MAINTAINER_MODE
- PYTHON=python2
- AM_PATH_PYTHON
- 
--PKG_CHECK_MODULES(SHELL, gtk+-3.0 gconf-2.0)
-+PKG_CHECK_MODULES(SHELL, gtk+-3.0)
- 
- IT_PROG_INTLTOOL([0.35.0])
- GETTEXT_PACKAGE=sugar
-@@ -28,15 +28,6 @@ AC_ARG_ENABLE(update-mimedb,
- enable_update_mimedb=yes)
-

[arch-commits] Commit in sugar/trunk (PKGBUILD)

2019-03-06 Thread Balló György via arch-commits 
Date: Thursday, March 7, 2019 @ 01:15:17
  Author: bgyorgy
Revision: 437978

upgpkg: sugar 0.112-3

Use correct D-Bus config location

Modified:
  sugar/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-07 01:08:58 UTC (rev 437977)
+++ PKGBUILD2019-03-07 01:15:17 UTC (rev 437978)
@@ -2,7 +2,7 @@
 
 pkgname=sugar
 pkgver=0.112
-pkgrel=2
+pkgrel=3
 pkgdesc="Sugar GTK shell"
 arch=('any')
 url="https://sugarlabs.org/;
@@ -24,6 +24,9 @@
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/jarabe/model/update/aslo.py
   sed -i "s/gi.require_version('WebKit', '3.0')/gi.require_version('WebKit2', 
'4.0')/" src/jarabe/main.py
 
+  # Use correct D-Bus config location
+  sed -i '/^nmservicedir =/ s/sysconfdir/datadir/' data/Makefile.{am,in}
+
   # Don't overwrite default GNOME settings
   patch -Np1 -i ../dont-overwrite-settings.patch

[arch-commits] Commit in sugar/trunk (PKGBUILD remove-gconf.patch)

2018-04-10 Thread Balló György via arch-commits 
Date: Tuesday, April 10, 2018 @ 12:38:36
  Author: bgyorgy
Revision: 315586

upgpkg: sugar 0.112-2

Remove GConf support

Added:
  sugar/trunk/remove-gconf.patch
Modified:
  sugar/trunk/PKGBUILD

+
 PKGBUILD   |   17 
 remove-gconf.patch | 1019 +++
 2 files changed, 1030 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 12:10:24 UTC (rev 315585)
+++ PKGBUILD2018-04-10 12:38:36 UTC (rev 315586)
@@ -3,20 +3,22 @@
 
 pkgname=sugar
 pkgver=0.112
-pkgrel=1
+pkgrel=2
 pkgdesc="Sugar GTK shell"
 arch=('any')
 url="https://sugarlabs.org/;
 license=('GPL')
-depends=('gconf' 'gnome-keyring' 'gst-plugins-espeak' 'gtksourceview3' 'gvfs' 
'libwnck3'
+depends=('gnome-keyring' 'gst-plugins-espeak' 'gtksourceview3' 'gvfs' 
'libwnck3'
  'libxklavier' 'metacity' 'mobile-broadband-provider-info' 'openssh' 
'python2-gwebsockets'
  'sugar-toolkit-gtk3' 'telepathy-gabble' 'telepathy-salut' 'upower' 
'webkit2gtk'
  'xdg-user-dirs')
 makedepends=('intltool')
 
source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
-dont-overwrite-settings.patch)
+dont-overwrite-settings.patch
+remove-gconf.patch)
 sha256sums=('39aa7ffe866c9f1b4a113e7a400686d60277a3517db1fed62f536b1fdc71c38b'
-'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
+'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c'
+'138e652824feae8c0e324e19cc11d3793035c81db868a7bb21d2e05531ea98fc')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -25,13 +27,16 @@
 
   # Don't overwrite default GNOME settings
   patch -Np1 -i ../dont-overwrite-settings.patch
+
+  # Remove GConf support
+  patch -Np1 -i ../remove-gconf.patch
+  autoreconf -fi
 }
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-  --disable-schemas-install --disable-schemas-compile \
-  --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  --disable-schemas-compile
   make
 }
 

Added: remove-gconf.patch
===
--- remove-gconf.patch  (rev 0)
+++ remove-gconf.patch  2018-04-10 12:38:36 UTC (rev 315586)
@@ -0,0 +1,1019 @@
+From 38b173dd908209852d10501bbd64ce930286fdb7 Mon Sep 17 00:00:00 2001
+From: James Cameron 
+Date: Mon, 26 Mar 2018 14:52:44 +1100
+Subject: [PATCH] jarabe, extensions - remove GConf compatibility
+
+GConf compatibility support in Sugar allowed activities to read or be
+notified of changes to age, gender, nick, user colour, collaboration
+server, backup server, or automatic power management.  Redundant code
+updated GConf values at the same time as updates to Gio.Settings values.
+
+Remove GConf from Sugar;
+
+- remove the autoconf rules,
+
+- remove the Makefile rules,
+
+- remove the schema conversion for upgrades from GTK+ 2 Sugar,
+
+- remove the gsettings-migrated setting key,
+
+- remove the GConf schema from POTFILES.in,
+
+- remove the GConf schema,
+
+- remove redundant code for GConf value updates,
+
+- remove migration from GConf to Gio.Settings.
+
+Warning: may break some activities.  May cause default values to be
+used, traceback, or fail to start for any activity using the removed
+GConf schema to read the removed configuration values for; age, gender,
+nick, user colour, collaboration server, backup server, and automatic
+power management.  Fix GTK+ 2 activities by porting to GTK+ 3 and
+Gio.Settings.  Fix GTK+ 3 activities by porting from GConf to
+Gio.Settings.
+
+Tested on Ubuntu 16.04.
+
+Tested on Ubuntu 18.04 with autogen.sh, distcheck, install, uninstall.
+---
+ configure.ac  |  11 +-
+ data/Makefile.am  |  16 +-
+ data/org.sugarlabs.gschema.xml|   5 -
+ data/sugar-schemas.convert|  69 -
+ data/sugar.schemas.in | 491 --
+ extensions/cpsection/aboutme/model.py |  15 --
+ extensions/cpsection/network/model.py |  11 -
+ extensions/cpsection/power/model.py   |   5 -
+ po/POTFILES.in|   1 -
+ src/jarabe/desktop/schoolserver.py|   7 -
+ src/jarabe/intro/__init__.py  |   6 +-
+ src/jarabe/intro/agepicker.py |   5 -
+ src/jarabe/intro/genderpicker.py  |   6 -
+ src/jarabe/intro/window.py|  10 -
+ src/jarabe/main.py| 106 
+ 15 files changed, 4 insertions(+), 760 deletions(-)
+ delete mode 100644 data/sugar-schemas.convert
+ delete mode 100644 data/sugar.schemas.in
+
+diff --git a/configure.ac b/configure.ac
+index 4e8ae65fa..be64e6731 100644
+--- a/configure.ac
 b/configure.ac
+@@ -15,7 +15,7 @@ AM_MAINTAINER_MODE
+ PYTHON=python2
+ AM_PATH_PYTHON
+ 
+-PKG_CHECK_MODULES(SHELL, gtk+-3.0

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

2017-10-15 Thread 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
===
--- PKGBUILD2017-10-15 18:04:27 UTC (rev 262971)
+++ PKGBUILD2017-10-15 18:11:53 UTC (rev 262972)
@@ -2,8 +2,8 @@
 # Maintainer: Balló György 
 
 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.0 
+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.py2017-05-16 01:47:18.0 
+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)

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

2017-03-30 Thread Balló György 
Date: Thursday, March 30, 2017 @ 17:40:21
  Author: bgyorgy
Revision: 220112

upgpkg: sugar 0.110.0-2

Don't overwrite default GNOME settings

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

---+
 PKGBUILD  |   11 ---
 dont-overwrite-settings.patch |   16 
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-30 15:30:41 UTC (rev 220111)
+++ PKGBUILD2017-03-30 17:40:21 UTC (rev 220112)
@@ -3,7 +3,7 @@
 
 pkgname=sugar
 pkgver=0.110.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Sugar GTK shell"
 arch=('any')
 url="https://sugarlabs.org/;
@@ -13,13 +13,18 @@
  'sugar-toolkit-gtk3' 'telepathy-gabble' 'telepathy-salut' 'upower' 
'webkit2gtk'
  'xdg-user-dirs')
 makedepends=('intltool')
-source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('c5b662442a404f4dab7f67514aae5f887533262e4a98aa4b4c675e4f63b2203d')
+source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
+dont-overwrite-settings.patch)
+sha256sums=('c5b662442a404f4dab7f67514aae5f887533262e4a98aa4b4c675e4f63b2203d'
+'ef7dc12e1e9ded529a950ac79eb3ec3e1644dcbfe137572c7319a4cbe9d7db07')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/jarabe/model/update/aslo.py
   sed -i "s/gi.require_version('WebKit', '3.0')/gi.require_version('WebKit2', 
'4.0')/" src/jarabe/main.py
+
+  # Don't overwrite default GNOME settings
+  patch -Np1 -i ../dont-overwrite-settings.patch
 }
 
 build() {

Added: dont-overwrite-settings.patch
===
--- dont-overwrite-settings.patch   (rev 0)
+++ dont-overwrite-settings.patch   2017-03-30 17:40:21 UTC (rev 220112)
@@ -0,0 +1,16 @@
+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.0 
+0200
 sugar-0.110.0/src/jarabe/main.py   2017-03-30 19:35:47.528931067 +0200
+@@ -186,11 +186,8 @@
+ 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'])
+ 
+ screen = Wnck.Screen.get_default()
+ screen.connect('window-manager-changed', __window_manager_changed_cb)