diff options
author | Linus Groh <mail@linusgroh.de> | 2021-05-06 15:26:49 +0100 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2021-05-06 15:26:49 +0100 |
commit | 8cfbeb78ff484eaeb6375335db339ea0676f11cc (patch) | |
tree | 42af79b03bd6bc838ac8edf8e4f9c6f0adfff31f /Ports/python3 | |
parent | ba6c9423b87a06c802355516f62e91f8da4c2274 (diff) | |
download | serenity-8cfbeb78ff484eaeb6375335db339ea0676f11cc.zip |
Ports: Remove Python printf fraction length patch
This functionality was implemented in f0fe449, making the patch
unnecessary.
Diffstat (limited to 'Ports/python3')
-rw-r--r-- | Ports/python3/patches/ReadMe.md | 4 | ||||
-rw-r--r-- | Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch | 39 |
2 files changed, 0 insertions, 43 deletions
diff --git a/Ports/python3/patches/ReadMe.md b/Ports/python3/patches/ReadMe.md index b799f05a34..78ebc91d1e 100644 --- a/Ports/python3/patches/ReadMe.md +++ b/Ports/python3/patches/ReadMe.md @@ -20,10 +20,6 @@ As usual, make the `configure` script recognize Serenity. Our stub implementation of `setlocale()` always returns `nullptr`, which the interpreter considers critical enough to exit right away. -## `tweak-unsupported-printf-format-specifiers.patch` - -Replace uses of `%.Ns` with `%s` as the former is not supported by our `printf` implementation yet and would result in empty strings. It uses `snprintf` already, so this is safe. - ## `webbrowser.patch` Register the SerenityOS Browser in the [`webbrowser`](https://docs.python.org/3/library/webbrowser.html) module. diff --git a/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch b/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch deleted file mode 100644 index 982ae9d2aa..0000000000 --- a/Ports/python3/patches/tweak-unsupported-printf-format-specifiers.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Python-3.9.5/Python/getversion.c 2021-02-21 20:22:44.092438528 +0100 -+++ Python-3.9.5/Python/getversion.c 2021-02-21 20:36:51.249477963 +0100 -@@ -9,7 +9,7 @@ - Py_GetVersion(void) - { - static char version[250]; -- PyOS_snprintf(version, sizeof(version), "%.80s (%.80s) %.80s", -+ PyOS_snprintf(version, sizeof(version), "%s (%s) %s", - PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler()); - return version; - } ---- Python-3.9.5/Modules/getbuildinfo.c 2021-02-21 20:22:43.945286288 +0100 -+++ Python-3.9.5/Modules/getbuildinfo.c 2021-02-21 20:38:09.187987432 +0100 -@@ -43,7 +43,7 @@ - if (!(*gitid)) - gitid = "default"; - PyOS_snprintf(buildinfo, sizeof(buildinfo), -- "%s%s%s, %.20s, %.9s", gitid, sep, revision, -+ "%s%s%s, %s, %s", gitid, sep, revision, - DATE, TIME); - return buildinfo; - } ---- Python-3.9.5/Python/dynload_shlib.c 2021-04-04 14:56:53.000000000 +0200 -+++ Python-3.9.5/Python/dynload_shlib.c 2021-04-24 15:57:27.419824682 +0200 -@@ -69,12 +69,12 @@ - - if (strchr(pathname, '/') == NULL) { - /* Prefix bare filename with "./" */ -- PyOS_snprintf(pathbuf, sizeof(pathbuf), "./%-.255s", pathname); -+ PyOS_snprintf(pathbuf, sizeof(pathbuf), "./%s", pathname); - pathname = pathbuf; - } - - PyOS_snprintf(funcname, sizeof(funcname), -- LEAD_UNDERSCORE "%.20s_%.200s", prefix, shortname); -+ LEAD_UNDERSCORE "%s_%s", prefix, shortname); - - if (fp != NULL) { - int i; |