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

2020-05-27 Thread Balló György via arch-commits 
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
===
--- PKGBUILD2020-05-27 19:40:52 UTC (rev 636023)
+++ PKGBUILD2020-05-27 19:40:56 UTC (rev 636024)
@@ -1,42 +0,0 @@
-# Maintainer: Balló György 
-
-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)
+++ PKGBUILD2020-05-27 19:40:56 UTC (rev 636024)
@@ -0,0 +1,42 @@
+# Maintainer: Balló György 
+
+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.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():
--settings = Gio.Settings.new('org.gnome.desktop.interface')

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

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

archrelease: copy trunk to community-any

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

---+
 PKGBUILD  |   82 
 dont-overwrite-settings.patch |   44 ++---
 2 files changed, 63 insertions(+), 63 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-06-19 11:02:58 UTC (rev 482335)
+++ PKGBUILD2019-06-19 11:03:03 UTC (rev 482336)
@@ -1,41 +0,0 @@
-# Maintainer: Balló György 
-
-pkgname=sugar
-pkgver=0.113
-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' 
'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)
-sha256sums=('dd0f8d632db5f1123cca34106ebdd3a984145c33c0e3f530853e0819947bd2a0'
-'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
-  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 482335, 
sugar/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-06-19 11:03:03 UTC (rev 482336)
@@ -0,0 +1,41 @@
+# Maintainer: Balló György 
+
+pkgname=sugar
+pkgver=0.114
+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' 
'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)
+sha256sums=('0917276ed41684b885bdac063562fcdfb682660700ee142a02b516a3eeecdbb1'
+'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
+  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   2019-06-19 11:02:58 UTC (rev 482335)
+++ dont-overwrite-settings.patch   2019-06-19 11:03:03 UTC (rev 482336)
@@ -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.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():
--settings = Gio.Settings.new('org.gnome.desktop.interface')
--settings.set_string('cursor-theme', 'sugar')
--
- _restart_window_manager()
- 
- screen = Wnck.Screen.get_default()

Copied:

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

2017-10-15 Thread Balló György 
Date: Sunday, October 15, 2017 @ 18:12:08
  Author: bgyorgy
Revision: 262973

archrelease: copy trunk to community-any

Added:
  sugar/repos/community-any/PKGBUILD
(from rev 262972, sugar/trunk/PKGBUILD)
  sugar/repos/community-any/dont-overwrite-settings.patch
(from rev 262972, 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 |   38 ++
 2 files changed, 64 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-10-15 18:11:53 UTC (rev 262972)
+++ PKGBUILD2017-10-15 18:12:08 UTC (rev 262973)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Balló György 
-
-pkgname=sugar
-pkgver=0.110.0
-pkgrel=2
-pkgdesc="Sugar GTK shell"
-arch=('any')
-url="https://sugarlabs.org/;
-license=('GPL')
-depends=('gconf' '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)
-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() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-  --disable-schemas-install --disable-schemas-compile \
-  --with-gconf-schema-file-dir=/usr/share/gconf/schemas
-  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 262972, 
sugar/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-10-15 18:12:08 UTC (rev 262973)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Balló György 
+
+pkgname=sugar
+pkgver=0.112
+pkgrel=1
+pkgdesc="Sugar GTK shell"
+arch=('any')
+url="https://sugarlabs.org/;
+license=('GPL')
+depends=('gconf' '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)
+sha256sums=('39aa7ffe866c9f1b4a113e7a400686d60277a3517db1fed62f536b1fdc71c38b'
+'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
+
+  # Don't overwrite default GNOME settings
+  patch -Np1 -i ../dont-overwrite-settings.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+  --disable-schemas-install --disable-schemas-compile \
+  --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+  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   2017-10-15 18:11:53 UTC (rev 262972)
+++ dont-overwrite-settings.patch   2017-10-15 18:12:08 UTC (rev 262973)
@@ -1,16 +0,0 @@
-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(
--