Date: Monday, March 9, 2020 @ 18:58:54 Author: bgyorgy Revision: 593207
archrelease: copy trunk to community-testing-any Added: sugar/repos/community-testing-any/ sugar/repos/community-testing-any/PKGBUILD (from rev 593206, sugar/trunk/PKGBUILD) sugar/repos/community-testing-any/dont-overwrite-settings.patch (from rev 593206, sugar/trunk/dont-overwrite-settings.patch) -------------------------------+ PKGBUILD | 42 ++++++++++++++++++++++++++++++++++++++++ dont-overwrite-settings.patch | 22 ++++++++++++++++++++ 2 files changed, 64 insertions(+) Copied: sugar/repos/community-testing-any/PKGBUILD (from rev 593206, sugar/trunk/PKGBUILD) =================================================================== --- community-testing-any/PKGBUILD (rev 0) +++ community-testing-any/PKGBUILD 2020-03-09 18:58:54 UTC (rev 593207) @@ -0,0 +1,42 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=sugar +pkgver=0.116 +pkgrel=1 +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=('7d0ec1619c3167cb32ccbbed1da2cb42e9c7846aff5c9a45a35085067590a09c' + '3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c') + +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-testing-any/dont-overwrite-settings.patch (from rev 593206, sugar/trunk/dont-overwrite-settings.patch) =================================================================== --- community-testing-any/dont-overwrite-settings.patch (rev 0) +++ community-testing-any/dont-overwrite-settings.patch 2020-03-09 18:58:54 UTC (rev 593207) @@ -0,0 +1,22 @@ +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(): +- settings = Gio.Settings.new('org.gnome.desktop.interface') +- settings.set_string('cursor-theme', 'sugar') +- + _restart_window_manager() + + screen = Wnck.Screen.get_default()