From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- x11-terms/kitty/Manifest | 4 +- x11-terms/kitty/files/kitty-9999-flags.patch | 49 ++++++++++++++++++++++ .../kitty/files/kitty-9999-remove-terminfo.patch | 16 +++++++ x11-terms/kitty/kitty-9999.ebuild | 7 ++-- 4 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 x11-terms/kitty/files/kitty-9999-flags.patch create mode 100644 x11-terms/kitty/files/kitty-9999-remove-terminfo.patch (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index ba3e6c7ba173..506fdc9a8439 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -2,11 +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 DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3 DIST kitty-0.19.2.tar.xz 3259928 BLAKE2B c6060a098df53e53cfd56f680f0972ee2a116c0d9ae8eabd2f087540f5f181a5980e2d963d27f24df5c57f6e81327591531397341e33b3d9bb4a2420138aa473 SHA512 86b6a08c7f5282587967ff7e3509d6ac4ef556b3bbeae1a9529a584f804f204d54f5031a90dcd08af735eb16a283938fa9e49c8d767dca12e945b7493f0e76da DIST kitty-0.19.3.tar.xz 3269628 BLAKE2B b3b673f8ad06baf770b03bcee87b2f405e1ff09d0fa5c6a232fd8df651351a428c8fbd9e2d0dc90ed44a0d6632192bea83650388ee73ebc3b523f51e51168006 SHA512 d1eea7f909c9492542650a83a149fd279c44380cf10387759f10caad57cd4dbabeac1ce84e8142bfa47266ec2562dfa3766ce08e2aee4d8e0ebacea165f101e4 EBUILD kitty-0.19.1.ebuild 2246 BLAKE2B 6f228b2425d71b4024a7997b8b464b5427c779b4a4806b004cc34f2ec0eaf7610336dbe427ceedd45d96f6df3e7a8f1d668e4dce2dac2b1117cebbcbbab30791 SHA512 e000ff8fa7e5990cf7788527c9b5f2a68931af195be86b7350a2698aff6134b3a7ffecf857f53b6d86adc400b8bdfa1b2e8824a1e4cd9d1ddae1deab12057c07 EBUILD kitty-0.19.2.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4 EBUILD kitty-0.19.3.ebuild 2263 BLAKE2B e7fa23f06184f5542b6356c302b6b6620a911c44f485d1b7cf5069e1917bd93ebdbacc0a7038ca5ea2780f8a9775b8abbf827b5dc99e7978126702d40b1b6472 SHA512 52ba77ad622151de1db9b2a532d20b6f56b3e837d5e27d81fa6c973f8c853eabf82e190b077e9f9558c62a4c69e95e83682c5df1becd3b296deffd8ea9e430b4 -EBUILD kitty-9999.ebuild 2174 BLAKE2B b31720b068ae1c7ec0e98bfb898ce0c16c7933f1a014b732a7bb68123d09f8d209987b70e5ef6a389294567da9cb399d691db0f897618dc20e7623e634bc8bf1 SHA512 ebe9c51891a30808a6276b746037c153f753b991e6d8333d5249ff2d5563414326bd6785e6ac850c0a45d7f9b9cc71b30ca6c17cdd337e13bf574baaed58efca +EBUILD kitty-9999.ebuild 2175 BLAKE2B 0254a67fe27cea41a49cba4f60578b2ab75719362ebdd278900e6baaa67a356eb46554bfaaa08150604265ff51dd67a9a7ff25902e07ab0d9b3f620f34ec290a SHA512 216891bae1976c8c7a163a776efeb42906e8a5fda599f75505c24292e4f06561e48cbd6b7e39d7cf5aa6fcd7b0936e917b28c8fe06214a9394ad79930510174e MISC metadata.xml 464 BLAKE2B 5b6a988d0c9a9eb68e9e269b3f423915d4471b535dfb466fec8b9856ecbfb8d1d51decf34576f8522852bf59f1264e4a1d3b777363de221d0d114edcb9628cfa SHA512 90d9e9db675bd68fab9865526234692c3fb34086822b2b2c47eaec4d9a4f8ef10be41d8c9bf3801e579f8bcf541528dd09ea042f54f6f27319ea82bc4288745d diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch new file mode 100644 index 000000000000..3bc0431b569a --- /dev/null +++ b/x11-terms/kitty/files/kitty-9999-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 = '-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-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch new file mode 100644 index 000000000000..aeb40e601185 --- /dev/null +++ b/x11-terms/kitty/files/kitty-9999-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/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 9b101e5a8027..d6240798626f 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,6 +30,7 @@ RDEPEND=" >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= + media-libs/lcms sys-apps/dbus sys-libs/zlib x11-libs/libxcb[xkb] @@ -56,8 +57,8 @@ BDEPEND="virtual/pkgconfig" $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')" PATCHES=( - "${FILESDIR}"/kitty-0.17.2-flags.patch - "${FILESDIR}"/kitty-0.16.0-remove-terminfo.patch + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-remove-terminfo.patch "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch ) -- cgit v1.2.3