aboutsummaryrefslogtreecommitdiff
path: root/x11/kitty/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kitty/files')
-rw-r--r--x11/kitty/files/patch-docs_Makefile6
-rw-r--r--x11/kitty/files/patch-docs_changelog.rst6
-rw-r--r--x11/kitty/files/patch-docs_conf.py10
-rw-r--r--x11/kitty/files/patch-setup.py31
-rw-r--r--x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish27
5 files changed, 47 insertions, 33 deletions
diff --git a/x11/kitty/files/patch-docs_Makefile b/x11/kitty/files/patch-docs_Makefile
index 80e46e007c2f..f09ab34fd60c 100644
--- a/x11/kitty/files/patch-docs_Makefile
+++ b/x11/kitty/files/patch-docs_Makefile
@@ -1,11 +1,11 @@
---- docs/Makefile.orig 2023-04-09 05:08:22 UTC
+--- docs/Makefile.orig 1979-11-29 23:00:00 UTC
+++ docs/Makefile
-@@ -6,7 +6,7 @@ override FAIL_WARN=-W
+@@ -6,7 +6,7 @@ endif
endif
# You can set these variables from the command line.
-SPHINXOPTS = -n -q -j auto -T $(FAIL_WARN) $(OPTS)
+SPHINXOPTS = -n -j auto -T $(FAIL_WARN) $(OPTS)
SPHINXBUILD = sphinx-build
+ SPHINXAUTOBUILD = sphinx-autobuild
SPHINXPROJ = kitty
- SOURCEDIR = .
diff --git a/x11/kitty/files/patch-docs_changelog.rst b/x11/kitty/files/patch-docs_changelog.rst
index da82a8ac5fda..537aa9a64055 100644
--- a/x11/kitty/files/patch-docs_changelog.rst
+++ b/x11/kitty/files/patch-docs_changelog.rst
@@ -1,6 +1,6 @@
--- docs/changelog.rst.orig 1979-11-29 23:00:00 UTC
+++ docs/changelog.rst
-@@ -2937,7 +2937,7 @@ Detailed list of changes
+@@ -3187,7 +3187,7 @@ - A :doc:`new kitten <kittens/panel>` to create dock p
- A :doc:`new kitten <kittens/panel>` to create dock panels on X11 desktops
showing the output from arbitrary terminal programs.
@@ -9,7 +9,7 @@
- Implement changing the font size for individual top level (OS) windows
(:iss:`408`)
-@@ -3052,7 +3052,7 @@ Detailed list of changes
+@@ -3302,7 +3302,7 @@ - Implement support for the SGR *faint* escape code to
- Implement support for the SGR *faint* escape code to make text blend
into the background (:iss:`446`).
@@ -18,7 +18,7 @@
so that URLs that stretch over multiple lines are detected. Also improve
detection of surrounding brackets/quotes.
-@@ -3064,7 +3064,7 @@ Detailed list of changes
+@@ -3314,7 +3314,7 @@ - Expand environment variables in config file include
- Expand environment variables in config file include directives
diff --git a/x11/kitty/files/patch-docs_conf.py b/x11/kitty/files/patch-docs_conf.py
index 8b651d34b08f..74b0105c6ca2 100644
--- a/x11/kitty/files/patch-docs_conf.py
+++ b/x11/kitty/files/patch-docs_conf.py
@@ -1,22 +1,22 @@
---- docs/conf.py.orig 2023-09-18 07:09:42 UTC
+--- docs/conf.py.orig 1979-11-29 23:00:00 UTC
+++ docs/conf.py
-@@ -207,18 +207,10 @@ def commit_role(
+@@ -209,18 +209,10 @@ def commit_role(
name: str, rawtext: str, text: str, lineno: int, inliner: Any, options: Any = {}, content: Any = []
) -> Tuple[List[nodes.reference], List[nodes.problematic]]:
' Link to a github commit '
- try:
- commit_id = subprocess.check_output(
-- f'git rev-list --max-count=1 --skip=# {text}'.split()).decode('utf-8').strip()
+- f'git rev-list --max-count=1 {text}'.split()).decode('utf-8').strip()
- except Exception:
- msg = inliner.reporter.error(
-- f'GitHub commit id "{text}" not recognized.', line=lineno)
+- f'git commit id "{text}" not recognized.', line=lineno)
- prb = inliner.problematic(rawtext, rawtext, msg)
- return [prb], [msg]
+ commit_id = text
url = f'https://github.com/kovidgoyal/kitty/commit/{commit_id}'
set_classes(options)
- short_id = subprocess.check_output(
-- f'git rev-list --max-count=1 --abbrev-commit --skip=# {commit_id}'.split()).decode('utf-8').strip()
+- f'git rev-list --max-count=1 --abbrev-commit {commit_id}'.split()).decode('utf-8').strip()
+ short_id = text[:9]
node = nodes.reference(rawtext, f'commit: {short_id}', refuri=url, **options)
return [node], []
diff --git a/x11/kitty/files/patch-setup.py b/x11/kitty/files/patch-setup.py
index 9a63378dbe51..21df40b73c3a 100644
--- a/x11/kitty/files/patch-setup.py
+++ b/x11/kitty/files/patch-setup.py
@@ -1,13 +1,12 @@
---- setup.py.orig 2023-07-13 16:10:52 UTC
+--- setup.py.orig 1979-11-29 23:00:00 UTC
+++ setup.py
-@@ -130,27 +130,11 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
+@@ -218,25 +218,10 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
# Apple use their special snowflake TLS libraries and additionally
# have an ancient broken system OpenSSL, so we need to check for one
# installed by all the various macOS package managers.
- extra_pc_dir = ''
+ cflags = [f"-I{sys.prefix}/include"]
+ libs = [f"-L{sys.prefix}/lib", "-lcrypto"]
-+ return cflags, libs
- try:
- cflags = pkg_config('libcrypto', '--cflags-only-I', fatal=False)
@@ -26,18 +25,18 @@
- extra_pc_dir = os.pathsep.join(openssl_dirs)
- cflags = pkg_config('libcrypto', '--cflags-only-I', extra_pc_dir=extra_pc_dir)
- return cflags, pkg_config('libcrypto', '--libs', extra_pc_dir=extra_pc_dir)
++ return cflags, libs
+
--
def at_least_version(package: str, major: int, minor: int = 0) -> None:
- q = f'{major}.{minor}'
- if subprocess.run([PKGCONFIG, package, f'--atleast-version={q}']
-@@ -1163,7 +1147,8 @@ def create_linux_bundle_gunk(ddir: str, libdir_name: s
- make = 'gmake' if is_freebsd else 'make'
- run_tool([make, 'docs'])
- copy_man_pages(ddir)
-- copy_html_docs(ddir)
-+ if os.getenv('BUILD_DOCS') == 'yes':
-+ copy_html_docs(ddir)
- for (icdir, ext) in {'256x256': 'png', 'scalable': 'svg'}.items():
- icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', icdir, 'apps')
- safe_makedirs(icdir)
+@@ -1170,8 +1155,8 @@ def create_linux_bundle_gunk(ddir: str, args: Options)
+ base = Path(ddir)
+ in_src_launcher = base / (f'{libdir_name}/kitty/kitty/launcher/kitty')
+ launcher = base / 'bin/kitty'
+- skip_docs = False
+- if not os.path.exists('docs/_build/html'):
++ skip_docs = os.getenv('BUILD_DOCS') != 'yes'
++ if not os.path.exists('docs/_build/html') and not skip_docs:
+ kitten_exe = os.path.join(os.path.dirname(str(launcher)), 'kitten')
+ if os.path.exists(kitten_exe):
+ os.environ['KITTEN_EXE_FOR_DOCS'] = kitten_exe
diff --git a/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish b/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish
index 3a6ccbc8db7a..6c3f554d8a5f 100644
--- a/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish
+++ b/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish
@@ -1,13 +1,28 @@
---- shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish.orig 2023-12-01 13:31:58 UTC
+--- shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish.orig 1979-11-29 23:00:00 UTC
+++ shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
-@@ -111,8 +111,8 @@ function __ksi_schedule --on-event fish_prompt -d "Set
- # Note that neither alias nor function is recursive in fish so if the user defines an alias/function
+@@ -112,12 +112,12 @@ function __ksi_schedule --on-event fish_prompt -d "Set
# for sudo it will be clobbered by us, so only install this if sudo is not already function
if not contains "no-sudo" $_ksi
-- and test -n "$TERMINFO" -a "file" = (type -t sudo)
+ and test -n "$TERMINFO" -a "file" = (type -t sudo 2> /dev/null || echo "x")
- and not test -r "/usr/share/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/78/xterm-kitty"
-+ and test -n "$TERMINFO" -a "file" = "(type -t sudo)"
-+ and not test -r "%%DATADIR%%/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/78/xterm-kitty"
++ and not test -r "%%DATADIR%%/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/78/xterm-kitty"
# Ensure terminfo is available in sudo
function sudo
set --local is_sudoedit "n"
+ for arg in $argv
+- if string match -q -- "-e" "$arg" or string match -q -- "--edit" "$arg"
++ if string match -q -- "-e" "$arg" or string match -q -- "--edit" "$arg"
+ set is_sudoedit "y"
+ break
+ end
+@@ -145,8 +145,8 @@ function __ksi_schedule --on-event fish_prompt -d "Set
+ and return 0
+ return 1
+ end
+- if _ksi_s_is_ok "venv"
+- and test -n "$VIRTUAL_ENV" -a -r "$venv"
++ if _ksi_s_is_ok "venv"
++ and test -n "$VIRTUAL_ENV" -a -r "$venv"
+ set _ksi_sourced "y"
+ set --erase VIRTUAL_ENV _OLD_FISH_PROMPT_OVERRIDE # activate.fish stupidly exports _OLD_FISH_PROMPT_OVERRIDE
+ source "$venv"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 08:56:12 +0000