[arch-commits] Commit in sugar-runner/trunk (0001-Python-3-port.patch PKGBUILD)

[Balló György]

    Date: Monday, March 9, 2020 @ 19:29:57
  Author: bgyorgy
Revision: 593295

upgpkg: sugar-runner 0.110.0-3: Port to Python 3

Added:
  sugar-runner/trunk/0001-Python-3-port.patch
Modified:
  sugar-runner/trunk/PKGBUILD

--------------------------+
 0001-Python-3-port.patch |   71 +++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                 |   13 ++++++--
 2 files changed, 81 insertions(+), 3 deletions(-)

Added: 0001-Python-3-port.patch
===================================================================
--- 0001-Python-3-port.patch	                        (rev 0)
+++ 0001-Python-3-port.patch	2020-03-09 19:29:57 UTC (rev 593295)
@@ -0,0 +1,71 @@
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-09 19:28:46 UTC (rev 593294)
+++ PKGBUILD	2020-03-09 19:29:57 UTC (rev 593295)
@@ -2,7 +2,7 @@
 
 pkgname=sugar-runner
 pkgver=0.110.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Scripts to run Sugar"
 arch=('x86_64')
 url="https://sugarlabs.org/"
@@ -9,9 +9,16 @@
 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)
-sha256sums=('383db309d4444f4758892b57614ace47d7cc395fdf01d1894d3da94354ff6870')
+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