Date: Thursday, October 20, 2022 @ 10:02:29
Author: polyzen
Revision: 1332965
Remove overlooked patches
Deleted:
neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch
python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch
-------------------------------------------------------------------------------------+
neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
| 64 ----
pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch
| 44 ---
python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch
| 130 ----------
3 files changed, 238 deletions(-)
Deleted:
neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
===================================================================
---
neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
2022-10-20 07:37:03 UTC (rev 1332964)
+++
neovim/trunk/0001-patch_terminfo_bugs-Extend-smglr-ignores-to-smglp-an.patch
2022-10-20 10:02:29 UTC (rev 1332965)
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-Date: Thu, 4 Nov 2021 22:04:17 +0000
-Subject: [PATCH] patch_terminfo_bugs: Extend smglr ignores to smglp and smgrp
-
-The latter were added for xterm by ncurses 6.3 and are similarly
-affected.
-
-Fixes https://github.com/neovim/neovim/issues/16238
----
- src/nvim/tui/tui.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
-index f9c5521bdb63..bb752863692d 100644
---- a/src/nvim/tui/tui.c
-+++ b/src/nvim/tui/tui.c
-@@ -1663,30 +1663,46 @@ static void patch_terminfo_bugs(TUIData *data, const
char *term, const char *col
- ILOG("Disabling smglr with TERM=xterm for non-xterm.");
- unibi_set_str(ut, unibi_set_lr_margin, NULL);
- }
-+ if (unibi_get_str(ut, unibi_set_left_margin_parm)) {
-+ ILOG("Disabling smglp with TERM=xterm for non-xterm.");
-+ unibi_set_str(ut, unibi_set_left_margin_parm, NULL);
-+ }
-+ if (unibi_get_str(ut, unibi_set_right_margin_parm)) {
-+ ILOG("Disabling smgrp with TERM=xterm for non-xterm.");
-+ unibi_set_str(ut, unibi_set_right_margin_parm, NULL);
-+ }
- }
-
- #ifdef WIN32
- // XXX: workaround libuv implicit LF => CRLF conversion. #10558
- unibi_set_str(ut, unibi_cursor_down, "\x1b[B");
- #endif
- } else if (rxvt) {
- // 2017-04 terminfo.src lacks these. Unicode rxvt has them.
- unibi_set_if_empty(ut, unibi_enter_italics_mode, "\x1b[3m");
- unibi_set_if_empty(ut, unibi_exit_italics_mode, "\x1b[23m");
- unibi_set_if_empty(ut, unibi_to_status_line, "\x1b]2");
- unibi_set_if_empty(ut, unibi_from_status_line, "\x07");
- // 2017-04 terminfo.src has older control sequences.
- unibi_set_str(ut, unibi_enter_ca_mode, "\x1b[?1049h");
- unibi_set_str(ut, unibi_exit_ca_mode, "\x1b[?1049l");
- } else if (screen) {
- // per the screen manual; 2017-04 terminfo.src lacks these.
- unibi_set_if_empty(ut, unibi_to_status_line, "\x1b_");
- unibi_set_if_empty(ut, unibi_from_status_line, "\x1b\\");
- // Fix an issue where smglr is inherited by TERM=screen.xterm.
- if (unibi_get_str(ut, unibi_set_lr_margin)) {
- ILOG("Disabling smglr with TERM=screen.xterm for screen.");
- unibi_set_str(ut, unibi_set_lr_margin, NULL);
- }
-+ if (unibi_get_str(ut, unibi_set_left_margin_parm)) {
-+ ILOG("Disabling smglp with TERM=screen.xterm for screen.");
-+ unibi_set_str(ut, unibi_set_left_margin_parm, NULL);
-+ }
-+ if (unibi_get_str(ut, unibi_set_right_margin_parm)) {
-+ ILOG("Disabling smgrp with TERM=screen.xterm for screen.");
-+ unibi_set_str(ut, unibi_set_right_margin_parm, NULL);
-+ }
- } else if (tmux) {
- unibi_set_if_empty(ut, unibi_to_status_line, "\x1b_");
- unibi_set_if_empty(ut, unibi_from_status_line, "\x1b\\");
Deleted: pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch
===================================================================
--- pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch
2022-10-20 07:37:03 UTC (rev 1332964)
+++ pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch
2022-10-20 10:02:29 UTC (rev 1332965)
@@ -1,44 +0,0 @@
-From fd21ee241c85856be941e41942d6c179ca713c41 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz via pacman-contrib <[email protected]>
-Date: Fri, 21 May 2021 00:30:07 -0400
-Subject: [PATCH] pactree: fix compilation with pacman 6
-
-In "add front-end provided context to callbacks", libalpm gained a new
-argument to callbacks which we don't use and is only needed by some
-frontends wishing to do stuff with the callback state. NULL it and move
-on with life, just like pacman itself did.
-
-Signed-off-by: Eli Schwartz <[email protected]>
-Signed-off-by: Daniel M. Capella <[email protected]>
----
- src/pactree.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/pactree.c b/src/pactree.c
-index e8f5086..9e6ac1b 100644
---- a/src/pactree.c
-+++ b/src/pactree.c
-@@ -135,8 +135,10 @@ static const char *dbpath = DBPATH;
- static const char *configfile = CONFFILE;
- static const char *gpgdir = GPGDIR;
-
--void cb_log(alpm_loglevel_t level, const char *fmt, va_list args)
-+void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args)
- {
-+ (void)ctx;
-+
- switch(level) {
- case ALPM_LOG_ERROR:
- fprintf(stderr, "%s%s%s", color->error, "error: ",
-@@ -621,7 +623,7 @@ int main(int argc, char *argv[])
- }
-
- if(debug) {
-- alpm_option_set_logcb(handle, cb_log);
-+ alpm_option_set_logcb(handle, cb_log, NULL);
- }
-
- /* no need to fail on error here */
---
-2.31.1
-
Deleted:
python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch
===================================================================
---
python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch
2022-10-20 07:37:03 UTC (rev 1332964)
+++
python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch
2022-10-20 10:02:29 UTC (rev 1332965)
@@ -1,130 +0,0 @@
-From 413d1008d96a44cba5bf82030f7e95450ae82554 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <[email protected]>
-Date: Sat, 15 May 2021 12:25:10 +0200
-Subject: [PATCH] Revert "Close #7996: manpage: Make a section directory on
- build manpage by default"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit a843fd3db8b588be93b576049a8a291bc4b3ec9d.
-
-Signed-off-by: Johannes Löthberg <[email protected]>
----
- CHANGES | 2 --
- doc/usage/configuration.rst | 4 +---
- sphinx/builders/manpage.py | 2 +-
- tests/test_build_manpage.py | 12 ++++++------
- tests/test_smartquotes.py | 4 ++--
- 5 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index b7e4c7f0e..7ca08a6ac 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -50,8 +50,6 @@ Incompatible changes
- * #7784: i18n: The msgid for alt text of image is changed
- * #5560: napoleon: :confval:`napoleon_use_param` also affect "other
parameters"
- section
--* #7996: manpage: Make a section directory on build manpage by default (see
-- :confval:`man_make_section_directory`)
- * #7849: html: Change the default setting of
- :confval:`html_codeblock_linenos_style` to ``'inline'``
- * #8380: html search: search results are wrapped with ``<p>`` instead of
-diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst
-index 7b7a0a1d4..3bc402c9a 100644
---- a/doc/usage/configuration.rst
-+++ b/doc/usage/configuration.rst
-@@ -2332,12 +2332,10 @@ These options influence manual page output.
-
- .. confval:: man_make_section_directory
-
-- If true, make a section directory on build man page. Default is True.
-+ If true, make a section directory on build man page. Default is False.
-
- .. versionadded:: 3.3
-- .. versionchanged:: 4.0
-
-- The default is changed to ``False`` from ``True``.
-
- .. _texinfo-options:
-
-diff --git a/sphinx/builders/manpage.py b/sphinx/builders/manpage.py
-index b993a2df4..532d2b8fe 100644
---- a/sphinx/builders/manpage.py
-+++ b/sphinx/builders/manpage.py
-@@ -118,7 +118,7 @@ def setup(app: Sphinx) -> Dict[str, Any]:
-
- app.add_config_value('man_pages', default_man_pages, None)
- app.add_config_value('man_show_urls', False, None)
-- app.add_config_value('man_make_section_directory', True, None)
-+ app.add_config_value('man_make_section_directory', False, None)
-
- return {
- 'version': 'builtin',
-diff --git a/tests/test_build_manpage.py b/tests/test_build_manpage.py
-index 2affb8ba3..a017abc69 100644
---- a/tests/test_build_manpage.py
-+++ b/tests/test_build_manpage.py
-@@ -17,9 +17,9 @@ from sphinx.config import Config
- @pytest.mark.sphinx('man')
- def test_all(app, status, warning):
- app.builder.build_all()
-- assert (app.outdir / '1' / 'sphinxtests.1').exists()
-+ assert (app.outdir / 'sphinxtests.1').exists()
-
-- content = (app.outdir / '1' / 'sphinxtests.1').read_text()
-+ content = (app.outdir / 'sphinxtests.1').read_text()
- assert r'\fBprint \fP\fIi\fP\fB\en\fP' in content
- assert r'\fBmanpage\en\fP' in content
-
-@@ -31,16 +31,16 @@ def test_all(app, status, warning):
-
-
- @pytest.mark.sphinx('man', testroot='basic',
-- confoverrides={'man_make_section_directory': False})
-+ confoverrides={'man_make_section_directory': True})
- def test_man_make_section_directory(app, status, warning):
- app.build()
-- assert (app.outdir / 'python.1').exists()
-+ assert (app.outdir / '1' / 'python.1').exists()
-
-
- @pytest.mark.sphinx('man', testroot='directive-code')
- def test_captioned_code_block(app, status, warning):
- app.builder.build_all()
-- content = (app.outdir / '1' / 'python.1').read_text()
-+ content = (app.outdir / 'python.1').read_text()
-
- assert ('.sp\n'
- 'caption \\fItest\\fP rb\n'
-@@ -71,5 +71,5 @@ def test_default_man_pages():
- @pytest.mark.sphinx('man', testroot='markup-rubric')
- def test_rubric(app, status, warning):
- app.build()
-- content = (app.outdir / '1' / 'python.1').read_text()
-+ content = (app.outdir / 'python.1').read_text()
- assert 'This is a rubric\n' in content
-diff --git a/tests/test_smartquotes.py b/tests/test_smartquotes.py
-index a8d4b1ed6..4879dedc6 100644
---- a/tests/test_smartquotes.py
-+++ b/tests/test_smartquotes.py
-@@ -31,7 +31,7 @@ def test_text_builder(app, status, warning):
- def test_man_builder(app, status, warning):
- app.build()
-
-- content = (app.outdir / '1' / 'python.1').read_text()
-+ content = (app.outdir / 'python.1').read_text()
- assert '\\-\\- "Sphinx" is a tool that makes it easy ...' in content
-
-
-@@ -84,5 +84,5 @@ def test_smartquotes_excludes_language(app, status, warning):
- def test_smartquotes_excludes_builders(app, status, warning):
- app.build()
-
-- content = (app.outdir / '1' / 'python.1').read_text()
-+ content = (app.outdir / 'python.1').read_text()
- assert '– “Sphinx” is a tool that makes it easy …' in content
---
-2.31.1
-
