diff options
author | nia <nia@pkgsrc.org> | 2019-12-14 22:08:10 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-12-14 22:08:10 +0000 |
commit | 70df9fc7daebf511dae53c728ba89f2855d2189c (patch) | |
tree | 5212a9447685c92d82147ca8838b68a5c9c1624e /x11/kitty | |
parent | e15e2e6ed1fb0c37521b9083d4aa820a7713d5f1 (diff) | |
download | pkgsrc-70df9fc7daebf511dae53c728ba89f2855d2189c.tar.gz |
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 (limited to 'x11/kitty')
-rw-r--r-- | x11/kitty/Makefile | 51 | ||||
-rw-r--r-- | x11/kitty/PLIST | 102 | ||||
-rw-r--r-- | x11/kitty/distinfo | 13 | ||||
-rw-r--r-- | x11/kitty/patches/patch-kitty_threading.h | 26 | ||||
-rw-r--r-- | x11/kitty/patches/patch-setup.py | 91 |
5 files changed, 65 insertions, 218 deletions
diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 727df991df9..31d3fe2e1bc 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -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 HOMEPAGE= https://sw.kovidgoyal.net/kitty/index.html @@ -15,38 +15,26 @@ LICENSE= gnu-gpl-v3 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" +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" +REPLACE_PYTHON+= kitty/launcher/kitty -BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools -BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx +INSTALLATION_DIRS+= man/man1 PYTHON_VERSIONS_INCOMPATIBLE= 27 - -REPLACE_PYTHON+= kitty/launcher/kitty - -INSTALLATION_DIRS+= ${PKGMANDIR}/man1 +PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool do-build: cd ${WRKSRC} && ${MAKE_ENV} ${PYTHONBIN} setup.py linux-package @@ -55,18 +43,11 @@ do-build: 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 @@ do-install: .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 --git a/x11/kitty/PLIST b/x11/kitty/PLIST index e1ee1b582d9..c7dd8f7cfca 100644 --- a/x11/kitty/PLIST +++ b/x11/kitty/PLIST @@ -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/patch.py 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/client.py 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/config_data.py 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/glfw-x11.so 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/shell.py 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 +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/build.rst.txt 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/hints.rst.txt 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-pressed.png 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 share/doc/kitty/html/_static/kitty.png +share/doc/kitty/html/_static/language_data.js share/doc/kitty/html/_static/minus.png share/doc/kitty/html/_static/plus.png share/doc/kitty/html/_static/pygments.css @@ -216,6 +166,8 @@ share/doc/kitty/html/build.html share/doc/kitty/html/changelog.html share/doc/kitty/html/conf.html share/doc/kitty/html/faq.html +share/doc/kitty/html/generated/launch.html +share/doc/kitty/html/generated/rc.html share/doc/kitty/html/genindex.html share/doc/kitty/html/graphics-protocol.html share/doc/kitty/html/index.html @@ -228,12 +180,16 @@ share/doc/kitty/html/kittens/hints.html share/doc/kitty/html/kittens/icat.html share/doc/kitty/html/kittens/panel.html share/doc/kitty/html/kittens/unicode-input.html +share/doc/kitty/html/launch.html +share/doc/kitty/html/objects.inv share/doc/kitty/html/performance.html share/doc/kitty/html/pipe.html share/doc/kitty/html/protocol-extensions.html +share/doc/kitty/html/rc_protocol.html share/doc/kitty/html/remote-control.html share/doc/kitty/html/search.html share/doc/kitty/html/searchindex.js share/doc/kitty/html/support.html share/icons/hicolor/256x256/apps/kitty.png share/terminfo/x/xterm-kitty +@pkgdir share/man/man1 diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo index bba99bf1ed3..1d73eff64f0 100644 --- a/x11/kitty/distinfo +++ b/x11/kitty/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2019/02/04 01:11:15 gutteridge Exp $ +$NetBSD: distinfo,v 1.3 2019/12/14 22:08:10 nia Exp $ -SHA1 (kitty-0.13.3.tar.gz) = ee8222e270c18a0318cf23563e946af5fae1ff5e -RMD160 (kitty-0.13.3.tar.gz) = 4eafc1541cc99ae1e22ffd4da0d6cb8684070666 -SHA512 (kitty-0.13.3.tar.gz) = 71273c0cd71ee2c49af5addeb9512c077f29d3f6e1843243c2cc174292e9ace18cbabd041ba8ef9ad8f41630cdaad01e0869c919634bb084e9724d612cd3a502 -Size (kitty-0.13.3.tar.gz) = 3510975 bytes -SHA1 (patch-kitty_threading.h) = d6bf2285a2100479c44de2f9aa842b910ca8ba6d -SHA1 (patch-setup.py) = dabdaa69ca56e799c93aa299635e0d2bd1d27f49 +SHA1 (kitty-0.15.0.tar.xz) = 8b4f57a4f291de2de047a6905a9c383f9e218589 +RMD160 (kitty-0.15.0.tar.xz) = a116d11f9bb331ce72c0db3781b454b640b76969 +SHA512 (kitty-0.15.0.tar.xz) = 4e546fb9ad0cf34df8aa5ef3787224e8dd820fadb474faddc5f47b987bbc46fb62350a64bcacbdccd7e7cd287df22045ed742b89f613e402f033dc8bb73d8688 +Size (kitty-0.15.0.tar.xz) = 2978152 bytes +SHA1 (patch-kitty_threading.h) = 04886ab09ac2ab6f4925cd20e739e6b634299d55 diff --git a/x11/kitty/patches/patch-kitty_threading.h b/x11/kitty/patches/patch-kitty_threading.h index 53f89ca075f..986ac391699 100644 --- a/x11/kitty/patches/patch-kitty_threading.h +++ b/x11/kitty/patches/patch-kitty_threading.h @@ -1,24 +1,24 @@ -$NetBSD: patch-kitty_threading.h,v 1.1 2018/11/28 18:48:58 nia Exp $ +$NetBSD: patch-kitty_threading.h,v 1.2 2019/12/14 22:08:10 nia Exp $ Support NetBSD. ---- kitty/threading.h.orig 2018-09-29 03:45:40.000000000 +0000 +--- kitty/threading.h.orig 2019-11-27 04:25:00.000000000 +0000 +++ kitty/threading.h -@@ -14,6 +14,8 @@ - #if defined(__APPLE__) - // I cant figure out how to get pthread.h to include this definition on macOS. MACOSX_DEPLOYMENT_TARGET does not work. - extern int pthread_setname_np(const char *name); -+#elif defined(__NetBSD__) -+extern int pthread_getname_np(pthread_t, char *, size_t); +@@ -17,6 +17,8 @@ extern int pthread_setname_np(const char #elif defined(FREEBSD_SET_NAME) // Function has a different name on FreeBSD void pthread_set_name_np(pthread_t tid, const char *name); -@@ -27,6 +29,8 @@ set_thread_name(const char *name) { - int ret; - #if defined(__APPLE__) - ret = pthread_setname_np(name); +#elif defined(__NetBSD__) -+ ret = pthread_setname_np(pthread_self(), name, NULL); ++int pthread_setname_np(pthread_t thread, const char *name, void *arg); + #else + // Need _GNU_SOURCE for pthread_setname_np on linux and that causes other issues on systems with old glibc + extern int pthread_setname_np(pthread_t, const char *name); +@@ -30,6 +32,8 @@ set_thread_name(const char *name) { #elif defined(FREEBSD_SET_NAME) pthread_set_name_np(pthread_self(), name); ret = 0; ++#elif defined(__NetBSD__) ++ ret = pthread_setname_np(pthread_self(), "%s", (char *)name); + #else + ret = pthread_setname_np(pthread_self(), name); + #endif diff --git a/x11/kitty/patches/patch-setup.py b/x11/kitty/patches/patch-setup.py deleted file mode 100644 index fa23fceb11a..00000000000 --- a/x11/kitty/patches/patch-setup.py +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-setup.py,v 1.2 2019/02/04 01:11:15 gutteridge Exp $ - -Use PKGMANDIR and sort out (C|CPP|LD)FLAGS. - ---- setup.py.orig 2019-01-19 08:36:53.000000000 +0000 -+++ setup.py -@@ -180,41 +180,14 @@ def init_env( - df += ' -Og' - optimize = df if debug or sanitize else '-O3' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() -- cppflags = os.environ.get( -- 'OVERRIDE_CPPFLAGS', ( -- '-D{}DEBUG' -- ).format( -- ('' if debug else 'N'), -- ) -- ) -- cppflags = shlex.split(cppflags) -- cflags = os.environ.get( -- 'OVERRIDE_CFLAGS', ( -- '-Wextra -Wno-missing-field-initializers -Wall -std=c11' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' -- ).format( -- optimize, -- ' '.join(sanitize_args), -- stack_protector, -- missing_braces, -- '-march=native' if native_optimizations else '', -- ) -- ) -- cflags = shlex.split(cflags) + shlex.split( -- sysconfig.get_config_var('CCSHARED') -- ) -- ldflags = os.environ.get( -- 'OVERRIDE_LDFLAGS', -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') -- ) -- ldflags = shlex.split(ldflags) -+ cppflags = shlex.split(os.environ.get('CPPFLAGS', '')) -+ cflags = shlex.split(os.environ.get('CFLAGS', '')) -+ cflags.append('-std=c99') -+ cflags.append('-fwrapv') -+ cflags.append('-fvisibility=hidden') -+ cflags.append('-fPIC') -+ ldflags = shlex.split(os.environ.get('LDFLAGS', '')) - ldflags.append('-shared') -- cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) -- cflags += shlex.split(os.environ.get('CFLAGS', '')) -- ldflags += shlex.split(os.environ.get('LDFLAGS', '')) -- if not debug and not sanitize: -- # See https://github.com/google/sanitizers/issues/647 -- cflags.append('-flto'), ldflags.append('-flto') - - if profile: - cppflags.append('-DWITH_PROFILER') -@@ -518,14 +491,12 @@ def build_asan_launcher(args): - - - def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=False, for_freeze=False): -- cflags = '-Wall -Werror -fpie'.split() -- cppflags = [] -- libs = [] -+ cflags = shlex.split(os.environ.get('CFLAGS', '')) -+ cppflags = shlex.split(os.environ.get('CPPFLAGS', '')) -+ libs = shlex.split(os.environ.get('LIBS', '')) - if args.profile: - cppflags.append('-DWITH_PROFILER'), cflags.append('-g') - libs.append('-lprofiler') -- else: -- cflags.append('-O3') - if for_bundle or for_freeze: - cppflags.append('-DFOR_BUNDLE') - cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) -@@ -534,8 +505,6 @@ def build_linux_launcher(args, launcher_ - cppflags.append('-DLIB_DIR_NAME="{}"'.format(args.libdir_name.strip('/'))) - pylib = get_python_flags(cflags) - exe = 'kitty-profile' if args.profile else 'kitty' -- cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) -- cflags += shlex.split(os.environ.get('CFLAGS', '')) - ldflags = shlex.split(os.environ.get('LDFLAGS', '')) - if for_freeze: - ldflags += ['-Wl,-rpath,$ORIGIN/../lib'] -@@ -550,7 +519,7 @@ def build_linux_launcher(args, launcher_ - - - def copy_man_pages(ddir): -- mandir = os.path.join(ddir, 'share', 'man') -+ mandir = os.environ['PKGMANDIR'] - safe_makedirs(mandir) - try: - shutil.rmtree(os.path.join(mandir, 'man1')) |