From f6c5e13d92bb353ab805680a43344c116d317639 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 16 Jan 2019 22:12:09 +0100 Subject: [PATCH] asciinema: Update from 2.0.1 to 2.0.2 --- .../asciinema/asciinema-__main__.py.patch | 14 +++++++++++ .../asciinema/asciinema-asciicast-v2.py.patch | 23 ------------------- packages/asciinema/build.sh | 5 ++-- packages/asciinema/no_langinfo.patch | 13 ----------- 4 files changed, 16 insertions(+), 39 deletions(-) create mode 100644 packages/asciinema/asciinema-__main__.py.patch delete mode 100644 packages/asciinema/asciinema-asciicast-v2.py.patch delete mode 100644 packages/asciinema/no_langinfo.patch diff --git a/packages/asciinema/asciinema-__main__.py.patch b/packages/asciinema/asciinema-__main__.py.patch new file mode 100644 index 000000000..58dda9a06 --- /dev/null +++ b/packages/asciinema/asciinema-__main__.py.patch @@ -0,0 +1,14 @@ +diff -u -r ../asciinema-2.0.2/asciinema/__main__.py ./asciinema/__main__.py +--- ../asciinema-2.0.2/asciinema/__main__.py 2019-01-12 18:58:29.000000000 +0000 ++++ ./asciinema/__main__.py 2019-01-16 21:07:50.834574609 +0000 +@@ -50,10 +50,6 @@ + + + def main(): +- if locale.nl_langinfo(locale.CODESET).upper() not in ['US-ASCII', 'UTF-8']: +- print("asciinema needs an ASCII or UTF-8 character encoding to run. Check the output of `locale` command.") +- sys.exit(1) +- + try: + cfg = config.load() + except config.ConfigError as e: diff --git a/packages/asciinema/asciinema-asciicast-v2.py.patch b/packages/asciinema/asciinema-asciicast-v2.py.patch deleted file mode 100644 index 7ac0b7cd5..000000000 --- a/packages/asciinema/asciinema-asciicast-v2.py.patch +++ /dev/null @@ -1,23 +0,0 @@ -See https://github.com/asciinema/asciinema/issues/271 - -diff -u -r ../asciinema-2.0.1/asciinema/asciicast/v2.py ./asciinema/asciicast/v2.py ---- ../asciinema-2.0.1/asciinema/asciicast/v2.py 2018-04-04 09:05:41.000000000 +0200 -+++ ./asciinema/asciicast/v2.py 2018-04-06 23:24:44.432657505 +0200 -@@ -4,7 +4,16 @@ - import json.decoder - import time - import codecs --from multiprocessing import Process, Queue -+ -+try: -+ # Importing synchronize is to detect platforms where -+ # multiprocessing does not work (python issue 3770) -+ # and cause an ImportError. Otherwise it will happen -+ # later when trying to use Queue(). -+ from multiprocessing import synchronize, Process, Queue -+except ImportError: -+ from threading import Thread as Process -+ from queue import Queue - - from asciinema.pty_recorder import PtyRecorder - diff --git a/packages/asciinema/build.sh b/packages/asciinema/build.sh index 118878087..f51d2b4a2 100644 --- a/packages/asciinema/build.sh +++ b/packages/asciinema/build.sh @@ -1,8 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://asciinema.org/ TERMUX_PKG_DESCRIPTION="Record and share your terminal sessions, the right way" -TERMUX_PKG_VERSION=2.0.1 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=7087b247dae36d04821197bc14ebd4248049592b299c9878d8953c025ac802e4 +TERMUX_PKG_VERSION=2.0.2 +TERMUX_PKG_SHA256=2578a1b5611e5375771ef6582a6533ef8d40cdbed1ba1c87786fd23af625ab68 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_PLATFORM_INDEPENDENT=yes diff --git a/packages/asciinema/no_langinfo.patch b/packages/asciinema/no_langinfo.patch deleted file mode 100644 index ce23dbfe6..000000000 --- a/packages/asciinema/no_langinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ../__main__.py.orig 2018-12-28 15:18:49.567468833 +0100 -+++ ./asciinema/__main__.py 2018-12-28 15:19:17.550800251 +0100 -@@ -50,10 +50,6 @@ - - - def main(): -- if locale.nl_langinfo(locale.CODESET).upper() != 'UTF-8': -- print("asciinema needs a UTF-8 native locale to run. Check the output of `locale` command.") -- sys.exit(1) -- - try: - cfg = config.load() - except config.ConfigError as e: