[arch-commits] Commit in sugar/repos (3 files)

[Felix Yan]

    Date: Thursday, December 2, 2021 @ 23:28:19
  Author: felixonmars
Revision: 1063037

archrelease: copy trunk to community-staging-any

Added:
  sugar/repos/community-staging-any/
  sugar/repos/community-staging-any/PKGBUILD
    (from rev 1063033, sugar/trunk/PKGBUILD)
  sugar/repos/community-staging-any/dont-overwrite-settings.patch
    (from rev 1063035, sugar/trunk/dont-overwrite-settings.patch)

-------------------------------+
 PKGBUILD                      |   42 ++++++++++++++++++++++++++++++++++++++++
 dont-overwrite-settings.patch |   33 +++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)

Copied: sugar/repos/community-staging-any/PKGBUILD (from rev 1063033, sugar/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD	                        (rev 0)
+++ community-staging-any/PKGBUILD	2021-12-02 23:28:19 UTC (rev 1063037)
@@ -0,0 +1,42 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=sugar
+pkgver=0.118
+pkgrel=2
+pkgdesc="Sugar GTK shell"
+arch=('any')
+url="https://sugarlabs.org/"
+license=('GPL')
+depends=('gnome-keyring' 'gst-plugins-espeak' 'gtksourceview3' 'gvfs' 'libwnck3'
+         'libxklavier' 'metacity' 'mobile-broadband-provider-info' 'openssh' 'python-gwebsockets'
+         'sugar-toolkit-gtk3' 'telepathy-gabble' 'telepathy-salut' 'upower' 'webkit2gtk'
+         'xdg-user-dirs')
+makedepends=('intltool' 'python-empy')
+source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
+        dont-overwrite-settings.patch)
+sha256sums=('5b8b64140e3457655f1c7758710da7c28939be025c2ddfbdee065e0322e9f2e8'
+            'a426e295f8810c5b6b1a136338b630c67c5b98c7ca368a261e0390e42b6d1465')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # 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
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-schemas-compile \
+              EMPY=`echo /usr/lib/python3.*/site-packages/em.py`
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/share/sugar/extensions/cpsection/updater/
+}

Copied: sugar/repos/community-staging-any/dont-overwrite-settings.patch (from rev 1063035, sugar/trunk/dont-overwrite-settings.patch)
===================================================================
--- community-staging-any/dont-overwrite-settings.patch	                        (rev 0)
+++ community-staging-any/dont-overwrite-settings.patch	2021-12-02 23:28:19 UTC (rev 1063037)
@@ -0,0 +1,33 @@
+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(
+-        ['metacity', '--no-force-fullscreen', '--no-composite'],
++        ['metacity', '--no-force-fullscreen'],
+         stdout=subprocess.PIPE)
+     _metacity_sid = GLib.io_add_watch(_metacity_process.stdout, GLib.IO_HUP,
+                                       __window_manager_failed_cb)
+@@ -196,12 +196,6 @@
+ 
+ 
+ def _start_window_manager():
+-    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()
+ 
+