[arch-commits] Commit in sugar/repos/community-any (4 files)

[Balló György]

    Date: Wednesday, May 27, 2020 @ 19:40:56
  Author: bgyorgy
Revision: 636024

archrelease: copy trunk to community-any

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

-------------------------------+
 PKGBUILD                      |   84 ++++++++++++++++++++--------------------
 dont-overwrite-settings.patch |   55 +++++++++++++++-----------
 2 files changed, 75 insertions(+), 64 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 19:40:52 UTC (rev 636023)
+++ PKGBUILD	2020-05-27 19:40:56 UTC (rev 636024)
@@ -1,42 +0,0 @@
-# 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-any/PKGBUILD (from rev 636023, sugar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-27 19:40:56 UTC (rev 636024)
@@ -0,0 +1,42 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=sugar
+pkgver=0.117
+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=('e44619e4df2425671e840cf557cdb6449bf65574d4e16e6647eb2fef739d75aa'
+            '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/
+}

Deleted: dont-overwrite-settings.patch
===================================================================
--- dont-overwrite-settings.patch	2020-05-27 19:40:52 UTC (rev 636023)
+++ dont-overwrite-settings.patch	2020-05-27 19:40:56 UTC (rev 636024)
@@ -1,22 +0,0 @@
-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()

Copied: sugar/repos/community-any/dont-overwrite-settings.patch (from rev 636023, sugar/trunk/dont-overwrite-settings.patch)
===================================================================
--- dont-overwrite-settings.patch	                        (rev 0)
+++ dont-overwrite-settings.patch	2020-05-27 19:40:56 UTC (rev 636024)
@@ -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()
+ 
+