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

[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
===================================================================
--- PKGBUILD	2017-03-30 15:30:41 UTC (rev 220111)
+++ PKGBUILD	2017-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.000000000 +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)