[arch-commits] Commit in sugar-runner/repos/community-testing-x86_64 (4 files)
Balló György
bgyorgy at archlinux.org
Sun Mar 15 17:31:54 UTC 2020
Date: Sunday, March 15, 2020 @ 17:31:53
Author: bgyorgy
Revision: 598370
archrelease: copy trunk to community-testing-x86_64
Added:
sugar-runner/repos/community-testing-x86_64/0001-Python-3-port.patch
(from rev 598369, sugar-runner/trunk/0001-Python-3-port.patch)
sugar-runner/repos/community-testing-x86_64/PKGBUILD
(from rev 598369, sugar-runner/trunk/PKGBUILD)
Deleted:
sugar-runner/repos/community-testing-x86_64/0001-Python-3-port.patch
sugar-runner/repos/community-testing-x86_64/PKGBUILD
--------------------------+
0001-Python-3-port.patch | 177 ++++++++++++++++++++++++++-------------------
PKGBUILD | 67 +++++++++--------
2 files changed, 142 insertions(+), 102 deletions(-)
Deleted: 0001-Python-3-port.patch
===================================================================
--- 0001-Python-3-port.patch 2020-03-15 17:31:49 UTC (rev 598369)
+++ 0001-Python-3-port.patch 2020-03-15 17:31:53 UTC (rev 598370)
@@ -1,71 +0,0 @@
-From aa22afcc5e26f81706a52141cbb064ebc1d2f2f7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Mon, 9 Mar 2020 20:06:25 +0100
-Subject: [PATCH] Python 3 port
-
----
- scripts/sugar-runner.in | 4 ++--
- scripts/tweak-xwrapper | 2 +-
- scripts/xephyr-window | 4 ++--
- scripts/xinitrc | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/scripts/sugar-runner.in b/scripts/sugar-runner.in
-index f39bdfb..8f3f9e9 100644
---- a/scripts/sugar-runner.in
-+++ b/scripts/sugar-runner.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2 -u
-+#!/usr/bin/python -u
-
- # Copyright (C) 2013, Daniel Narvaez
- #
-@@ -66,7 +66,7 @@ def _allow_to_run_x():
- except IOError:
- return
-
-- print "We need to allow everybody to run the X server"
-+ print("We need to allow everybody to run the X server")
- tweak_wrapper = os.path.join(helpers_dir, "tweak-xwrapper")
- subprocess.check_call(["sudo", "-k", tweak_wrapper])
-
-diff --git a/scripts/tweak-xwrapper b/scripts/tweak-xwrapper
-index 05f9c6e..87ceec1 100644
---- a/scripts/tweak-xwrapper
-+++ b/scripts/tweak-xwrapper
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2 -u
-+#!/usr/bin/python -u
-
- # Copyright (C) 2013, Daniel Narvaez
- #
-diff --git a/scripts/xephyr-window b/scripts/xephyr-window
-index 0c5e98b..c43434a 100644
---- a/scripts/xephyr-window
-+++ b/scripts/xephyr-window
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2 -u
-+#!/usr/bin/python -u
-
- # Copyright (C) 2013, Daniel Narvaez
- #
-@@ -40,5 +40,5 @@ SugarRunner.window_create(int(width), int(height), fullscreen)
- while SugarRunner.window_wait():
- if not fullscreen or SugarRunner.window_is_fullscreen():
- if not xid_printed:
-- print SugarRunner.window_get_xid()
-+ print(SugarRunner.window_get_xid())
- xid_printed = True
-diff --git a/scripts/xinitrc b/scripts/xinitrc
-index 904822e..1488880 100644
---- a/scripts/xinitrc
-+++ b/scripts/xinitrc
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2
-+#!/usr/bin/python
-
- # Copyright (C) 2013, Daniel Narvaez
- #
---
-2.25.1
-
Copied: sugar-runner/repos/community-testing-x86_64/0001-Python-3-port.patch (from rev 598369, sugar-runner/trunk/0001-Python-3-port.patch)
===================================================================
--- 0001-Python-3-port.patch (rev 0)
+++ 0001-Python-3-port.patch 2020-03-15 17:31:53 UTC (rev 598370)
@@ -0,0 +1,106 @@
+From 2bbb41c38f81f53e5c8d0be7a1847bc0674fd424 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Mon, 9 Mar 2020 20:06:25 +0100
+Subject: [PATCH] Python 3 port
+
+---
+ scripts/sugar-runner.in | 6 +++---
+ scripts/tweak-xwrapper | 2 +-
+ scripts/xephyr-window | 4 ++--
+ scripts/xinitrc | 8 ++++----
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/scripts/sugar-runner.in b/scripts/sugar-runner.in
+index f39bdfb..9aa83ff 100644
+--- a/scripts/sugar-runner.in
++++ b/scripts/sugar-runner.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2 -u
++#!/usr/bin/python -u
+
+ # Copyright (C) 2013, Daniel Narvaez
+ #
+@@ -66,7 +66,7 @@ def _allow_to_run_x():
+ except IOError:
+ return
+
+- print "We need to allow everybody to run the X server"
++ print("We need to allow everybody to run the X server")
+ tweak_wrapper = os.path.join(helpers_dir, "tweak-xwrapper")
+ subprocess.check_call(["sudo", "-k", tweak_wrapper])
+
+@@ -83,7 +83,7 @@ def _run_xephyr_window(resolution):
+
+ def _get_tty_number():
+ tty = subprocess.check_output(["tty"])
+- head, tail = os.path.split(tty)
++ head, tail = os.path.split(tty.decode('ascii'))
+ return tail.strip().replace("tty", "")
+
+
+diff --git a/scripts/tweak-xwrapper b/scripts/tweak-xwrapper
+index 05f9c6e..87ceec1 100644
+--- a/scripts/tweak-xwrapper
++++ b/scripts/tweak-xwrapper
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2 -u
++#!/usr/bin/python -u
+
+ # Copyright (C) 2013, Daniel Narvaez
+ #
+diff --git a/scripts/xephyr-window b/scripts/xephyr-window
+index 0c5e98b..c43434a 100644
+--- a/scripts/xephyr-window
++++ b/scripts/xephyr-window
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2 -u
++#!/usr/bin/python -u
+
+ # Copyright (C) 2013, Daniel Narvaez
+ #
+@@ -40,5 +40,5 @@ SugarRunner.window_create(int(width), int(height), fullscreen)
+ while SugarRunner.window_wait():
+ if not fullscreen or SugarRunner.window_is_fullscreen():
+ if not xid_printed:
+- print SugarRunner.window_get_xid()
++ print(SugarRunner.window_get_xid())
+ xid_printed = True
+diff --git a/scripts/xinitrc b/scripts/xinitrc
+index 904822e..de75d8f 100644
+--- a/scripts/xinitrc
++++ b/scripts/xinitrc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2
++#!/usr/bin/python
+
+ # Copyright (C) 2013, Daniel Narvaez
+ #
+@@ -48,7 +48,7 @@ def _load_xkb_config():
+ if "SUGAR_RUNNER_XKBCONFIG" not in os.environ:
+ return
+
+- with open(os.environ["SUGAR_RUNNER_XKBCONFIG"]) as f:
++ with open(os.environ["SUGAR_RUNNER_XKBCONFIG"], 'rb') as f:
+ config = f.read()
+
+ process = subprocess.Popen(["xkbcomp", "-", os.environ["DISPLAY"]],
+@@ -65,14 +65,14 @@ def _add_output_to_environ(output):
+
+ def _start_dbus():
+ output = subprocess.check_output(["dbus-launch", "--exit-with-session"])
+- _add_output_to_environ(output)
++ _add_output_to_environ(output.decode('ascii'))
+
+
+ def _start_keyring():
+ output = subprocess.check_output(["gnome-keyring-daemon",
+ "--start", "-d",
+ "--components=secrets,pkcs11,ssh,gpg"])
+- _add_output_to_environ(output)
++ _add_output_to_environ(output.decode('ascii'))
+
+
+ def _setup_xdg_user_dirs():
+--
+2.25.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-15 17:31:49 UTC (rev 598369)
+++ PKGBUILD 2020-03-15 17:31:53 UTC (rev 598370)
@@ -1,31 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=sugar-runner
-pkgver=0.110.0
-pkgrel=3
-pkgdesc="Scripts to run Sugar"
-arch=('x86_64')
-url="https://sugarlabs.org/"
-license=('GPL')
-depends=('sugar' 'xorg-xinit' 'xorg-server-xephyr' 'xorg-xrandr')
-makedepends=('gobject-introspection')
-source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
- 0001-Python-3-port.patch)
-sha256sums=('383db309d4444f4758892b57614ace47d7cc395fdf01d1894d3da94354ff6870'
- '960e7e2606ffcb09c3ae309570768438920613227d3ecaf903b8c8e0e4ae7fa0')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 -i ../0001-Python-3-port.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: sugar-runner/repos/community-testing-x86_64/PKGBUILD (from rev 598369, sugar-runner/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-15 17:31:53 UTC (rev 598370)
@@ -0,0 +1,36 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=sugar-runner
+pkgver=0.110.0
+pkgrel=4
+pkgdesc="Scripts to run Sugar"
+arch=('x86_64')
+url="https://sugarlabs.org/"
+license=('GPL')
+depends=('sugar' 'xorg-xinit' 'xorg-server-xephyr' 'xorg-xrandr')
+makedepends=('gobject-introspection')
+source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
+ 0001-Python-3-port.patch)
+sha256sums=('383db309d4444f4758892b57614ace47d7cc395fdf01d1894d3da94354ff6870'
+ 'f0969d827b5799d2f86f4e38dd4eae14ec1ee1b31b33ef0bb8c609185cb3eec6')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # https://github.com/sugarlabs/sugar-runner/pull/5
+ patch -Np1 -i ../0001-Python-3-port.patch
+
+ # Fix launch from the application menu
+ echo 'Terminal=true' >>data/sugar-runner.desktop
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
More information about the arch-commits
mailing list