pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/kitty kitty: Update to 0.15.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/40358dba0f1e
branches: trunk
changeset: 345582:40358dba0f1e
user: nia <nia%pkgsrc.org@localhost>
date: Sat Dec 14 22:08:10 2019 +0000
description:
kitty: Update to 0.15.0
Various pkgsrc changes aiming to reduce the complexity of this package
and make it less error-prone, in spite of the very weird homebrew build
system.
0.15.0 [2019-11-27]
Add a new action detach_window that can be used to move the current window into a different tab (#1310)
Add a new action launch that unifies launching of processes in new kitty windows/tabs.
Add a new style powerline for tab bar rendering, see tab_bar_style (#2021)
Allow changing colors by mapping a keyboard shortcut to read a kitty config file with color definitions. See the FAQ for details (#2083)
hints kitten: Allow completely customizing the matching and actions performed by the kitten using your own script (#2124)
Wayland: Fix key repeat not being stopped when focus leaves window. This is expected behavior on Wayland, apparently (#2014)
When drawing unicode symbols that are followed by spaces, use multiple cells to avoid resized or cut-off glyphs (#1452)
diff kitten: Allow diffing remote files easily via ssh (#727)
unicode input kitten: Add an option kitty +kitten unicode_input --emoji-variation to control the presentation variant of selected emojis (#2139)
Add specialised rendering for a few more box powerline and unicode symbols (#2074 and #2021)
Add a new socket only mode for allow_remote_control. This makes it possible for programs running on the local machine to control kitty but not programs running over ssh.
hints kitten: Allow using named groups in the regular expression. The named groups are passed to the invoked program for further processing.
Fix a regression in 0.14.5 that caused rendering of private use glyphs with and without spaces to be identical (#2117)
Wayland: Fix incorrect scale used when first creating an OS window (#2133)
macOS: Disable mouse hiding by default as getting it to work robustly on Cocoa is too much effort (#2158)
diffstat:
x11/kitty/Makefile | 53 +++++----------
x11/kitty/PLIST | 102 ++++++++---------------------
x11/kitty/distinfo | 13 +--
x11/kitty/patches/patch-kitty_threading.h | 26 +++---
x11/kitty/patches/patch-setup.py | 91 --------------------------
5 files changed, 66 insertions(+), 219 deletions(-)
diffs (truncated from 485 to 300 lines):
diff -r 4d7cd89c5f73 -r 40358dba0f1e x11/kitty/Makefile
--- a/x11/kitty/Makefile Sat Dec 14 19:17:02 2019 +0000
+++ b/x11/kitty/Makefile Sat Dec 14 22:08:10 2019 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2019/04/26 13:14:24 maya Exp $
+# $NetBSD: Makefile,v 1.10 2019/12/14 22:08:10 nia Exp $
-DISTNAME= kitty-0.13.3
-PKGREVISION= 1
+DISTNAME= kitty-0.15.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=kovidgoyal/}
GITHUB_PROJECT= kitty
-GITHUB_TAG= v${PKGVERSION_NOREV}
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://sw.kovidgoyal.net/kitty/index.html
@@ -15,38 +15,26 @@
USE_LANGUAGES= c99
EXTRACT_USING= bsdtar
USE_TOOLS+= gmake pkg-config
-BUILD_TARGET= app
-
-.include "../../mk/bsd.prefs.mk"
# kitty's homegrown packaging expects the functionality of tic(1) that
# comes with ncurses.
USE_NCURSES= yes
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+
SUBST_CLASSES+= python
SUBST_STAGE.python= pre-build
-SUBST_MESSAGE.python= Replace path of Python interpreter.
+SUBST_MESSAGE.python= Replacing path to Sphinx.
SUBST_FILES.python+= Makefile
SUBST_FILES.python+= docs/Makefile
-SUBST_SED.python+= -e "s,python3,python${PYVERSSUFFIX},g"
-SUBST_SED.python+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},g"
-
-# Sample auto-generated files are placed in randomly-named directories at
-# generation time, which makes for non-reproducible builds.
-SUBST_CLASSES+= html
-SUBST_STAGE.html= post-install
-SUBST_MESSAGE.html= Replace path of auto-generated config samples.
-SUBST_FILES.html+= ${DESTDIR}${PREFIX}/share/doc/kitty/html/conf.html
-SUBST_SED.html+= -e "s,_downloads/[0-9a-f]\{32\}/,_downloads/,g"
-
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-
-PYTHON_VERSIONS_INCOMPATIBLE= 27
+SUBST_SED.python+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},g"
REPLACE_PYTHON+= kitty/launcher/kitty
-INSTALLATION_DIRS+= ${PKGMANDIR}/man1
+INSTALLATION_DIRS+= man/man1
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
do-build:
cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package
@@ -55,18 +43,11 @@
do-install:
cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package \
--prefix ${DESTDIR}${PREFIX}
- ${INSTALL_DATA} ${WRKSRC}/man/man1/kitty.1 \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kitty.1
+ ${FIND} ${DESTDIR} -type d -name __pycache__ -print0 | ${XARGS} -0 ${RM} -rf
+ ${MV} ${DESTDIR}${PREFIX}/share/man/man1/kitty.1 \
+ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kitty.1 || ${FALSE}
-# The other half of dealing with the non-reproducible (or just unneeded)
-# build artifacts.
- ${FIND} ${DESTDIR}${PREFIX}/share/doc/kitty/html/_downloads \
- -type f -name *.conf | ${XARGS} -I rep ${MV} rep \
- ${DESTDIR}${PREFIX}/share/doc/kitty/html/_downloads
- ${FIND} ${DESTDIR}${PREFIX}/share/doc/kitty/html/_downloads/* \
- -type d | ${XARGS} ${RM} -rf
- cd ${DESTDIR}${PREFIX}/share/doc/kitty/html/ && \
- ${RM} -f .buildinfo .nojekyll objects.inv
+.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Darwin"
.include "../../graphics/freetype2/buildlink3.mk"
@@ -87,6 +68,8 @@
.include "../../x11/libxkbcommon/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
+.include "../../lang/python/tool.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
diff -r 4d7cd89c5f73 -r 40358dba0f1e x11/kitty/PLIST
--- a/x11/kitty/PLIST Sat Dec 14 19:17:02 2019 +0000
+++ b/x11/kitty/PLIST Sat Dec 14 22:08:10 2019 +0000
@@ -1,28 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2019/02/04 01:11:15 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/12/14 22:08:10 nia Exp $
bin/kitty
lib/kitty/__main__.py
-lib/kitty/__main__.pyo
lib/kitty/kittens/__init__.py
-lib/kitty/kittens/__init__.pyo
-lib/kitty/kittens/runner.pyo
lib/kitty/kittens/ask/__init__.py
-lib/kitty/kittens/ask/__init__.pyo
-lib/kitty/kittens/ask/main.pyo
lib/kitty/kittens/ask/main.py
+lib/kitty/kittens/choose/__init__.py
+lib/kitty/kittens/choose/main.py
+lib/kitty/kittens/choose/subseq_matcher.so
lib/kitty/kittens/clipboard/__init__.py
-lib/kitty/kittens/clipboard/__init__.pyo
-lib/kitty/kittens/clipboard/main.pyo
lib/kitty/kittens/clipboard/main.py
lib/kitty/kittens/diff/__init__.py
-lib/kitty/kittens/diff/__init__.pyo
-lib/kitty/kittens/diff/collect.pyo
-lib/kitty/kittens/diff/config.pyo
-lib/kitty/kittens/diff/config_data.pyo
-lib/kitty/kittens/diff/highlight.pyo
-lib/kitty/kittens/diff/main.pyo
-lib/kitty/kittens/diff/patch.pyo
-lib/kitty/kittens/diff/render.pyo
-lib/kitty/kittens/diff/search.pyo
lib/kitty/kittens/diff/collect.py
lib/kitty/kittens/diff/config.py
lib/kitty/kittens/diff/config_data.py
@@ -33,74 +20,31 @@
lib/kitty/kittens/diff/render.py
lib/kitty/kittens/diff/search.py
lib/kitty/kittens/hints/__init__.py
-lib/kitty/kittens/hints/__init__.pyo
-lib/kitty/kittens/hints/main.pyo
-lib/kitty/kittens/hints/url_regex.pyo
lib/kitty/kittens/hints/main.py
lib/kitty/kittens/hints/url_regex.py
lib/kitty/kittens/icat/__init__.py
-lib/kitty/kittens/icat/__init__.pyo
-lib/kitty/kittens/icat/main.pyo
lib/kitty/kittens/icat/main.py
+lib/kitty/kittens/key_demo/__init__.py
+lib/kitty/kittens/key_demo/main.py
lib/kitty/kittens/panel/__init__.py
-lib/kitty/kittens/panel/__init__.pyo
-lib/kitty/kittens/panel/main.pyo
lib/kitty/kittens/panel/main.py
lib/kitty/kittens/resize_window/__init__.py
-lib/kitty/kittens/resize_window/__init__.pyo
-lib/kitty/kittens/resize_window/main.pyo
lib/kitty/kittens/resize_window/main.py
lib/kitty/kittens/runner.py
lib/kitty/kittens/show_error/__init__.py
-lib/kitty/kittens/show_error/__init__.pyo
-lib/kitty/kittens/show_error/main.pyo
lib/kitty/kittens/show_error/main.py
lib/kitty/kittens/ssh/__init__.py
-lib/kitty/kittens/ssh/__init__.pyo
-lib/kitty/kittens/ssh/main.pyo
lib/kitty/kittens/ssh/main.py
lib/kitty/kittens/tui/__init__.py
-lib/kitty/kittens/tui/__init__.pyo
-lib/kitty/kittens/tui/handler.pyo
-lib/kitty/kittens/tui/images.pyo
-lib/kitty/kittens/tui/line_edit.pyo
-lib/kitty/kittens/tui/loop.pyo
-lib/kitty/kittens/tui/operations.pyo
lib/kitty/kittens/tui/handler.py
lib/kitty/kittens/tui/images.py
lib/kitty/kittens/tui/line_edit.py
lib/kitty/kittens/tui/loop.py
lib/kitty/kittens/tui/operations.py
lib/kitty/kittens/unicode_input/__init__.py
-lib/kitty/kittens/unicode_input/__init__.pyo
-lib/kitty/kittens/unicode_input/main.pyo
lib/kitty/kittens/unicode_input/main.py
lib/kitty/kittens/unicode_input/unicode_names.so
lib/kitty/kitty/__init__.py
-lib/kitty/kitty/__init__.pyo
-lib/kitty/kitty/borders.pyo
-lib/kitty/kitty/boss.pyo
-lib/kitty/kitty/child.pyo
-lib/kitty/kitty/cli.pyo
-lib/kitty/kitty/client.pyo
-lib/kitty/kitty/cmds.pyo
-lib/kitty/kitty/complete.pyo
-lib/kitty/kitty/config.pyo
-lib/kitty/kitty/config_data.pyo
-lib/kitty/kitty/constants.pyo
-lib/kitty/kitty/key_encoding.pyo
-lib/kitty/kitty/keys.pyo
-lib/kitty/kitty/layout.pyo
-lib/kitty/kitty/main.pyo
-lib/kitty/kitty/remote_control.pyo
-lib/kitty/kitty/rgb.pyo
-lib/kitty/kitty/session.pyo
-lib/kitty/kitty/shell.pyo
-lib/kitty/kitty/tab_bar.pyo
-lib/kitty/kitty/tabs.pyo
-lib/kitty/kitty/terminfo.pyo
-lib/kitty/kitty/utils.pyo
-lib/kitty/kitty/window.pyo
lib/kitty/kitty/blit_fragment.glsl
lib/kitty/kitty/blit_vertex.glsl
lib/kitty/kitty/border_fragment.glsl
@@ -115,9 +59,6 @@
lib/kitty/kitty/cmds.py
lib/kitty/kitty/complete.py
lib/kitty/kitty/conf/__init__.py
-lib/kitty/kitty/conf/__init__.pyo
-lib/kitty/kitty/conf/definition.pyo
-lib/kitty/kitty/conf/utils.pyo
lib/kitty/kitty/conf/definition.py
lib/kitty/kitty/conf/utils.py
lib/kitty/kitty/config.py
@@ -125,12 +66,6 @@
lib/kitty/kitty/constants.py
lib/kitty/kitty/fast_data_types.so
lib/kitty/kitty/fonts/__init__.py
-lib/kitty/kitty/fonts/__init__.pyo
-lib/kitty/kitty/fonts/box_drawing.pyo
-lib/kitty/kitty/fonts/core_text.pyo
-lib/kitty/kitty/fonts/fontconfig.pyo
-lib/kitty/kitty/fonts/list.pyo
-lib/kitty/kitty/fonts/render.pyo
lib/kitty/kitty/fonts/box_drawing.py
lib/kitty/kitty/fonts/core_text.py
lib/kitty/kitty/fonts/fontconfig.py
@@ -140,10 +75,13 @@
lib/kitty/kitty/graphics_fragment.glsl
lib/kitty/kitty/graphics_vertex.glsl
lib/kitty/kitty/key_encoding.py
+lib/kitty/kitty/key_names.py
lib/kitty/kitty/keys.py
+lib/kitty/kitty/launch.py
lib/kitty/kitty/launcher/kitty
lib/kitty/kitty/layout.py
lib/kitty/kitty/main.py
+lib/kitty/kitty/notify.py
lib/kitty/kitty/remote_control.py
lib/kitty/kitty/rgb.py
lib/kitty/kitty/session.py
@@ -151,16 +89,22 @@
lib/kitty/kitty/tab_bar.py
lib/kitty/kitty/tabs.py
lib/kitty/kitty/terminfo.py
+lib/kitty/kitty/update_check.py
lib/kitty/kitty/utils.py
lib/kitty/kitty/window.py
lib/kitty/logo/beam-cursor.png
lib/kitty/logo/beam-cursor%2x.png@localhost
+lib/kitty/logo/kitty.png
lib/kitty/logo/kitty.rgba
lib/kitty/terminfo/x/xterm-kitty
man/man1/kitty.1
share/applications/kitty.desktop
-share/doc/kitty/html/_downloads/diff.conf
-share/doc/kitty/html/_downloads/kitty.conf
+share/doc/kitty/html/.buildinfo
+share/doc/kitty/html/.nojekyll
+share/doc/kitty/html/_downloads/433dadebd0bf504f8b008985378086ce/kitty.conf
+share/doc/kitty/html/_downloads/9af617374336961a2d79624927eb6a8a/diff.conf
+share/doc/kitty/html/_downloads/a489ebbb52d84eeb19a12b2fda7debda/diff.conf
+share/doc/kitty/html/_downloads/fdd5fc58492b70fe2188716f86e7ff87/kitty.conf
share/doc/kitty/html/_images/diff.png
share/doc/kitty/html/_images/hints_mode.png
share/doc/kitty/html/_images/panel.png
@@ -171,6 +115,8 @@
share/doc/kitty/html/_sources/changelog.rst.txt
share/doc/kitty/html/_sources/conf.rst.txt
share/doc/kitty/html/_sources/faq.rst.txt
+share/doc/kitty/html/_sources/generated/launch.rst.txt
+share/doc/kitty/html/_sources/generated/rc.rst.txt
share/doc/kitty/html/_sources/graphics-protocol.rst.txt
share/doc/kitty/html/_sources/index.rst.txt
share/doc/kitty/html/_sources/invocation.rst.txt
@@ -182,9 +128,11 @@
share/doc/kitty/html/_sources/kittens/icat.rst.txt
share/doc/kitty/html/_sources/kittens/panel.rst.txt
share/doc/kitty/html/_sources/kittens/unicode-input.rst.txt
+share/doc/kitty/html/_sources/launch.rst.txt
share/doc/kitty/html/_sources/performance.rst.txt
share/doc/kitty/html/_sources/pipe.rst.txt
share/doc/kitty/html/_sources/protocol-extensions.rst.txt
+share/doc/kitty/html/_sources/rc_protocol.rst.txt
share/doc/kitty/html/_sources/remote-control.rst.txt
share/doc/kitty/html/_sources/support.rst.txt
share/doc/kitty/html/_static/ajax-loader.gif
@@ -200,8 +148,10 @@
share/doc/kitty/html/_static/down.png
share/doc/kitty/html/_static/file.png
share/doc/kitty/html/_static/jquery-3.2.1.js
+share/doc/kitty/html/_static/jquery-3.4.1.js
share/doc/kitty/html/_static/jquery.js
Home |
Main Index |
Thread Index |
Old Index