From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5DDB1382C5 for ; Sun, 23 May 2021 23:27:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41F2AE086A; Sun, 23 May 2021 23:27:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 134A7E086A for ; Sun, 23 May 2021 23:27:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A26FC335DED for ; Sun, 23 May 2021 23:27:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5FA1753 for ; Sun, 23 May 2021 23:27:02 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1621812418.272c2ca3526d0219b3902ca4cb2cb085588aa93b.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/jerryscript/, dev-lang/jerryscript/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch dev-lang/jerryscript/jerryscript-2.4.0-r1.ebuild dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild X-VCS-Directories: dev-lang/jerryscript/files/ dev-lang/jerryscript/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 272c2ca3526d0219b3902ca4cb2cb085588aa93b X-VCS-Branch: master Date: Sun, 23 May 2021 23:27:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5189e64-1d39-4396-822a-29424dbd6ef4 X-Archives-Hash: 8a7a1c2463d8d20db0c3bfefb7f269cc commit: 272c2ca3526d0219b3902ca4cb2cb085588aa93b Author: Zac Medico gentoo org> AuthorDate: Sun May 23 23:24:43 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun May 23 23:26:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272c2ca3 dev-lang/jerryscript: 2.4.0-r2 revbump for python3 debugger fixes Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Zac Medico gentoo.org> .../files/jerryscript-2.4.0-python3.patch | 42 +++++++++++++++++++--- ...2.4.0-r1.ebuild => jerryscript-2.4.0-r2.ebuild} | 0 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch b/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch index 4a358ac5ce9..7da285c5d3c 100644 --- a/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch +++ b/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch @@ -16,7 +16,7 @@ JerryScript-DCO-1.0-Signed-off-by: Zac Medico 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/jerry-debugger/jerry_client_main.py b/jerry-debugger/jerry_client_main.py -index e65d0e14..b877a159 100644 +index e65d0e14..e3176c86 100644 --- a/jerry-debugger/jerry_client_main.py +++ b/jerry-debugger/jerry_client_main.py @@ -151,2 +151,12 @@ def arguments_parse(): @@ -32,7 +32,16 @@ index e65d0e14..b877a159 100644 + + class JerryBreakpoint(object): -@@ -866,5 +876,5 @@ class JerryDebugger(object): +@@ -563,2 +573,3 @@ class JerryDebugger(object): + def _send_string(self, args, message_type, index=0): ++ args = args.encode("utf8") + +@@ -810,3 +821,3 @@ class JerryDebugger(object): + elif buffer_type in [JERRY_DEBUGGER_SCOPE_VARIABLES, JERRY_DEBUGGER_SCOPE_VARIABLES_END]: +- self.scope_vars += "".join(data[1:]) ++ self.scope_vars += "".join(data[1:].decode("utf8")) + +@@ -866,5 +877,5 @@ class JerryDebugger(object): def _parse_source(self, data): - source_code = "" - source_code_name = "" @@ -41,7 +50,7 @@ index e65d0e14..b877a159 100644 + source_code_name = b"" + function_name = b"" stack = [{"line": 1, -@@ -905,7 +915,7 @@ class JerryDebugger(object): +@@ -905,7 +916,7 @@ class JerryDebugger(object): - stack.append({"source": source_code, - "source_name": source_code_name, @@ -52,13 +61,38 @@ index e65d0e14..b877a159 100644 - "name": function_name, + "name": function_name.decode("utf8"), "lines": [], -@@ -939,4 +949,4 @@ class JerryDebugger(object): +@@ -939,4 +950,4 @@ class JerryDebugger(object): if not stack: - func_desc["source"] = source_code - func_desc["source_name"] = source_code_name + func_desc["source"] = source_code.decode("utf8") + func_desc["source_name"] = source_code_name.decode("utf8") +@@ -1153,3 +1164,3 @@ class JerryDebugger(object): + message = self.current_out + message +- lines = message.split("\n") ++ lines = message.decode("utf8").split("\n") + self.current_out = lines.pop() +@@ -1162,3 +1173,3 @@ class JerryDebugger(object): + message = self.current_log + message +- lines = message.split("\n") ++ lines = message.decode("utf8").split("\n") + self.current_log = lines.pop() +@@ -1171,7 +1182,7 @@ class JerryDebugger(object): + if subtype == JERRY_DEBUGGER_OUTPUT_WARNING: +- return "%swarning: %s%s" % (self.yellow, self.nocolor, message) ++ return "%swarning: %s%s" % (self.yellow, self.nocolor, message.decode("utf8")) + elif subtype == JERRY_DEBUGGER_OUTPUT_ERROR: +- return "%serr: %s%s" % (self.red, self.nocolor, message) ++ return "%serr: %s%s" % (self.red, self.nocolor, message.decode("utf8")) + elif subtype == JERRY_DEBUGGER_OUTPUT_TRACE: +- return "%strace: %s%s" % (self.blue, self.nocolor, message) ++ return "%strace: %s%s" % (self.blue, self.nocolor, message.decode("utf8")) + +@@ -1180,2 +1191,3 @@ class JerryDebugger(object): + ++ message = message.decode("utf8") + if not message.endswith("\n"): diff --git a/jerry-debugger/jerry_client_websocket.py b/jerry-debugger/jerry_client_websocket.py index fe2c761a..07c75e53 100644 --- a/jerry-debugger/jerry_client_websocket.py diff --git a/dev-lang/jerryscript/jerryscript-2.4.0-r1.ebuild b/dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild similarity index 100% rename from dev-lang/jerryscript/jerryscript-2.4.0-r1.ebuild rename to dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild