From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 May 2021 19:55:43 +0100 Subject: gentoo resync : 11.05.2021 --- x11-terms/kitty/Manifest | 10 +- x11-terms/kitty/files/kitty-0.20.1-flags.patch | 49 +++++++++ .../kitty/files/kitty-0.20.1-remove-terminfo.patch | 16 +++ x11-terms/kitty/files/kitty-0.20.1-tests.patch | 11 +++ x11-terms/kitty/files/kitty-9999-flags.patch | 30 +++--- .../kitty/files/kitty-9999-remove-terminfo.patch | 16 --- x11-terms/kitty/kitty-0.20.1.ebuild | 110 +++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 2 +- 8 files changed, 211 insertions(+), 33 deletions(-) create mode 100644 x11-terms/kitty/files/kitty-0.20.1-flags.patch create mode 100644 x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch create mode 100644 x11-terms/kitty/files/kitty-0.20.1-tests.patch delete mode 100644 x11-terms/kitty/files/kitty-9999-remove-terminfo.patch create mode 100644 x11-terms/kitty/kitty-0.20.1.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index fac525968611..3c7b64b3aaa8 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -2,9 +2,13 @@ AUX kitty-0.14.4-svg-icon.patch 616 BLAKE2B 2e362e1ea134f98839b8e21e337faa530de7 AUX kitty-0.16.0-remove-terminfo.patch 614 BLAKE2B 701aef294f7e52a2bf8a8cbe0fb192b226d1b430c1bed9f9d58e1f3c8e10362ac3b0cf04bc8de9c4e3a23acfce18bcbe3442191afcd77d76013539c8a7afe16e SHA512 667508e851c48bb66b85e3439cad92d98e12cef18dd0f45a6d8c4226b86b108d64e4d92fc5b650b7b80763665dba59f066930e4a654690d833e42e6aff13418f AUX kitty-0.17.2-flags.patch 1719 BLAKE2B 1d68d001f4750268375971bd533a0e153ecead672ce04410ede1a0a392098fc534ea989fcd5c2f7bd2d2581581c2ec64160c2364a1d5ef86eb67b07ec9440ea7 SHA512 49a1cb02beac7e56e6b75d1caf1fdf3111146eb5b40b29f0acf646052a95be84bb943c8a1b15eda8f2c10bc86437387dd465a8d9b044cbf7305cefee1c9fc97f AUX kitty-0.19.1-tests.patch 485 BLAKE2B 7058b51a6c2845d81839d8cd1c379ffc3bdd9e1dfc13a32d32570ee7926244c996d59a8ada237c81199547e2f3209299860585fc98609cefaac3ba98e4e32ba2 SHA512 6e14aa951d1553bbd68ebcbae55dfbab785361abd7301d480d729720c1a1945bc3658eec4148bd55a9d46772cbf35ec643fdfedb9d0e0d5ec92e956ba58f0893 -AUX kitty-9999-flags.patch 1962 BLAKE2B a7a446af13b5234c95885a49d7f2f4638fc4839d3ebee0e5249143ec40d8cf5694a1a3826b9e399071a1fb976698fc3698e2e44f8f3827b15df2aaca7039a827 SHA512 b9062d052daa8aa5f403ae42d46b7528f69761b376d73431d9e835413e7ff99d82174208e503619f7c4cdeb47e1b4471dbd4926f3728ac9613387207fb20d23a -AUX kitty-9999-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b +AUX kitty-0.20.1-flags.patch 1995 BLAKE2B e563ab5c09d43e8701e6ec5df519c47ae952054da72fedf106809f1c3775f00e172de7146734e10186f75ab10b8b0d42faa2ac6402cac5d57fdd8d5e611d90b0 SHA512 cbc8660909c3e07e16f720528265384bef2152fc33e41fbbef057fcd436216071ebfc0b4956284bd0e8e745ba28ba41221da8fff8d7f9a704fba6b79ea021f6f +AUX kitty-0.20.1-remove-terminfo.patch 754 BLAKE2B 12fae3be4b6a9ae6a2c49671e95c24fb9c73e5d18261e4817e5abbbe4419804dc9ba3b387d77fd4fb296108f294c3a8a7f7285814edfa8d5d9e62b7b5cca36b1 SHA512 17101f03975210e183ee1a4370d65a5bd40812dbf253f66038c8f534085974369ee909302109a8315f1c982d00299aef5a7a52a98dadd7ff46f9431ead6f748b +AUX kitty-0.20.1-tests.patch 514 BLAKE2B 69c4277b4ffc257cc8320dbfc5be95d72bcb35b70a377f8ef24ecd9a20036313ce52f245efd5f620b47ddea6f688cb0d3b4154d8787a3908d5c255ca26143f80 SHA512 bb5dd23b0e83118fd33296e1ee8c6485e51f29518406e1e875b2f5ec8e7de4103c9ec2b4c99516a3d4fe6134ccf5bf0d54e4a37bee89e64f294da4b0350d337c +AUX kitty-9999-flags.patch 2235 BLAKE2B f434ca8798f2051bcfa487af0eabe2a8142791eb83b9dff4cb815efc93a42a03eeb71b2ed4e4300ab658c79fd6eb742d682025951bfe3f76a105829916708027 SHA512 b46981b5dd75a1554ab722a490c7b6fd281d7698b24998ce875c3a2ba88e048304f0baafc86d0905ac9db2b583799576132eedf47c707681654b23cf64e3d3d9 DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4 +DIST kitty-0.20.1.tar.xz 3449932 BLAKE2B aed9a250fbc7005cd67fd22bfc33de845bea7e39a5561e6957b744f03a5438945f9739ca7066a93889144a5d0289185f337ef4d487c754cba37f242030f1c46a SHA512 19dfa66eb2a2115877b25fbff0ba7a81071bff00c732236f20342aeb619cca88ae4a4e8ce4e73908ac7d7d12fca5232a76e0167754f2e658af02e442cf5ba0cd EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4 -EBUILD kitty-9999.ebuild 2175 BLAKE2B 0254a67fe27cea41a49cba4f60578b2ab75719362ebdd278900e6baaa67a356eb46554bfaaa08150604265ff51dd67a9a7ff25902e07ab0d9b3f620f34ec290a SHA512 216891bae1976c8c7a163a776efeb42906e8a5fda599f75505c24292e4f06561e48cbd6b7e39d7cf5aa6fcd7b0936e917b28c8fe06214a9394ad79930510174e +EBUILD kitty-0.20.1.ebuild 2441 BLAKE2B a2ec955b3c8c6933357bd064df5b61444c31320e99955ff549e2f9c4c932daa7e83bca770008e4c326ce47d75ddd9a3187f7328593cce94c8356c71222f3db77 SHA512 5f42829e8227f4bfb6c30f1d8a028802ff5ee5e4bf240010b70fc04c50d239234dc276eab090f9807aba3f8468baa3399413a160d308977ec82c6dda2f15ee74 +EBUILD kitty-9999.ebuild 2183 BLAKE2B 4b78f145c0250b3bfb50f5e0f777a3a820290e0860986cb9650fc500b8ccd7163d7bbd81d58ecaadac70a5ebaa901de21f944d934f21ac1815c2d43b3bf17954 SHA512 020310f8278e2c4feef73abe270e59ad167e9fbb286521acdf32e729b9c1e9e69d07411a2cb5a5e5d5fb2c4684f14a50419699270ec24d54bf9a429954448c4e MISC metadata.xml 494 BLAKE2B 5a3443128f98dff20576a86dca13468cf0b84504151d40907c08de3763f567b7e3d000ba4eaa22a577c7a30c98507ba0ea33b116f8e123fa8e1109b15ec0af77 SHA512 6c4ab061bc5f9ec3101eb7ce9f51f5bcd4c0b894a432fce00eb4f1623814c186171d67640d8040a3260fcce3dcdbac7ec3a0830d9dd520ae6710ea29f828fa67 diff --git a/x11-terms/kitty/files/kitty-0.20.1-flags.patch b/x11-terms/kitty/files/kitty-0.20.1-flags.patch new file mode 100644 index 000000000000..27a44f56794c --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.20.1-flags.patch @@ -0,0 +1,49 @@ +diff --git a/setup.py b/setup.py +index ce5309ee..9cb59461 100755 +--- a/setup.py ++++ b/setup.py +@@ -278,7 +278,7 @@ def init_env( + df += ' -Og' + float_conversion = '-Wfloat-conversion' + fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' +- optimize = df if debug or sanitize else '-O3' ++ optimize = '' + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() + cppflags_ = os.environ.get( + 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), +@@ -289,7 +289,7 @@ def init_env( + cflags_ = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' ++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' + ).format( + float_conversion, + '' if is_openbsd else '-std=c11', +@@ -306,7 +306,7 @@ def init_env( + ) + ldflags_ = os.environ.get( + 'OVERRIDE_LDFLAGS', +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') ++ '-Wall ' + ' '.join(sanitize_args) + ) + ldflags = shlex.split(ldflags_) + ldflags.append('-shared') +@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: + + + def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: +- cflags = '-Wall -Werror -fpie'.split() ++ cflags = '-Wall -fpie'.split() + cppflags = [] + libs: List[str] = [] + if args.profile or args.sanitize: +@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's + cflags.append('-g') + if args.profile: + libs.append('-lprofiler') +- else: +- cflags.append('-O3') + if bundle_type.endswith('-freeze'): + cppflags.append('-DFOR_BUNDLE') + cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch new file mode 100644 index 000000000000..aeb40e601185 --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index ce5309ee..02f38c61 100755 +--- a/setup.py ++++ b/setup.py +@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None: + safe_makedirs(launcher_dir) + build_launcher(args, launcher_dir, bundle_type) + os.makedirs(os.path.join(libdir, 'logo')) +- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') # type: ignore +- for x in (libdir, os.path.join(ddir, 'share')): +- odir = os.path.join(x, 'terminfo') +- safe_makedirs(odir) +- build_terminfo['compile_terminfo'](odir) + shutil.copy2('__main__.py', libdir) + shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo')) + shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo')) diff --git a/x11-terms/kitty/files/kitty-0.20.1-tests.patch b/x11-terms/kitty/files/kitty-0.20.1-tests.patch new file mode 100644 index 000000000000..210898b888d9 --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.20.1-tests.patch @@ -0,0 +1,11 @@ +--- a/kitty/constants.py ++++ b/kitty/constants.py +@@ -64,7 +64,7 @@ + def kitty_exe() -> str: + rpath = sys._xoptions.get('bundle_exe_dir') + if not rpath: +- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, 'kitty', 'launcher')] ++ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, '../linux-package/bin')] + seen: Set[str] = set() + for candidate in filter(None, items): + if candidate not in seen: diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch index 3bc0431b569a..39042dbd458a 100644 --- a/x11-terms/kitty/files/kitty-9999-flags.patch +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -1,26 +1,28 @@ diff --git a/setup.py b/setup.py -index ce5309ee..9cb59461 100755 +index f751107f..69bf39d4 100755 --- a/setup.py +++ b/setup.py -@@ -278,7 +278,7 @@ def init_env( +@@ -293,7 +293,7 @@ def init_env( df += ' -Og' float_conversion = '-Wfloat-conversion' - fortify_source = '-D_FORTIFY_SOURCE=2' + fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' - optimize = df if debug or sanitize else '-O3' + optimize = '' sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() cppflags_ = os.environ.get( 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), -@@ -289,7 +289,7 @@ def init_env( +@@ -308,8 +308,8 @@ def init_env( cflags_ = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' -+ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' - ).format( - float_conversion, - '' if is_openbsd else '-std=c11', -@@ -306,7 +306,7 @@ def init_env( + f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}' +- f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' +- f' -pipe {march} -fvisibility=hidden {fortify_source}' ++ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' ++ f' {march} -fvisibility=hidden {fortify_source}' + ) + ) + cflags = shlex.split(cflags_) + shlex.split( +@@ -317,7 +317,7 @@ def init_env( ) ldflags_ = os.environ.get( 'OVERRIDE_LDFLAGS', @@ -29,16 +31,18 @@ index ce5309ee..9cb59461 100755 ) ldflags = shlex.split(ldflags_) ldflags.append('-shared') -@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: +@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None: def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: - cflags = '-Wall -Werror -fpie'.split() +- if args.build_universal_binary: +- cflags += '-arch x86_64 -arch arm64'.split() + cflags = '-Wall -fpie'.split() cppflags = [] libs: List[str] = [] if args.profile or args.sanitize: -@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's +@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's cflags.append('-g') if args.profile: libs.append('-lprofiler') diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch deleted file mode 100644 index aeb40e601185..000000000000 --- a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/setup.py b/setup.py -index ce5309ee..02f38c61 100755 ---- a/setup.py -+++ b/setup.py -@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None: - safe_makedirs(launcher_dir) - build_launcher(args, launcher_dir, bundle_type) - os.makedirs(os.path.join(libdir, 'logo')) -- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') # type: ignore -- for x in (libdir, os.path.join(ddir, 'share')): -- odir = os.path.join(x, 'terminfo') -- safe_makedirs(odir) -- build_terminfo['compile_terminfo'](odir) - shutil.copy2('__main__.py', libdir) - shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo')) - shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo')) diff --git a/x11-terms/kitty/kitty-0.20.1.ebuild b/x11-terms/kitty/kitty-0.20.1.ebuild new file mode 100644 index 000000000000..242d24ee0709 --- /dev/null +++ b/x11-terms/kitty/kitty-0.20.1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit optfeature python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" + inherit git-r3 +else + SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="A modern, hackable, featureful, OpenGL-based terminal emulator" +HOMEPAGE="https://github.com/kovidgoyal/kitty" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug wayland" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-1.5.0:= + media-libs/lcms + media-libs/libcanberra + media-libs/libpng:0= + sys-apps/dbus + sys-libs/zlib + x11-libs/libxcb[xkb] + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libxkbcommon[X] + x11-libs/libXrandr + x11-terms/kitty-terminfo + wayland? ( + dev-libs/wayland + >=dev-libs/wayland-protocols-1.17 + ) + $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6) +" + +DEPEND="${RDEPEND} + media-libs/mesa[X] + sys-libs/ncurses +" + +BDEPEND="virtual/pkgconfig" + +[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7" + +PATCHES=( + "${FILESDIR}"/${PN}-0.20.1-flags.patch + "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch + "${FILESDIR}"/${PN}-0.20.1-remove-terminfo.patch + "${FILESDIR}"/${PN}-0.20.1-tests.patch +) + +src_prepare() { + default + + # disable wayland as required + if ! use wayland; then + sed -i "/'x11 wayland'/s/ wayland//" setup.py || die + # also disable wayland tests + sed -i "/if not self.is_ci/d" kitty_tests/check_build.py || die + sed -i "/linux_backends.append('wayland')/d" kitty_tests/check_build.py || die + fi + + # respect doc dir + sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die + + tc-export CC +} + +src_compile() { + "${EPYTHON}" setup.py \ + --verbose $(usex debug --debug "") \ + --libdir-name $(get_libdir) \ + --update-check-interval=0 \ + linux-package || die "Failed to compile kitty." +} + +src_test() { + export KITTY_CONFIG_DIRECTORY=${T} + "${EPYTHON}" test.py || die +} + +src_install() { + insinto /usr + doins -r linux-package/* + dobin linux-package/bin/kitty + python_fix_shebang "${ED}" +} + +pkg_postinst() { + xdg_icon_cache_update + optfeature "Displaying images in the terminal" virtual/imagemagick-tools +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index d6240798626f..fb9de537a83c 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -58,7 +58,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-remove-terminfo.patch + "${FILESDIR}"/kitty-0.20.1-remove-terminfo.patch "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch ) -- cgit v1.2.3