Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kitty for openSUSE:Factory checked in at 2023-07-08 22:47:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kitty (Old) and /work/SRC/openSUSE:Factory/.kitty.new.23466 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kitty" Sat Jul 8 22:47:45 2023 rev:17 rq:1097621 version:0.28.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kitty/kitty.changes 2023-05-02 16:24:11.295646997 +0200 +++ /work/SRC/openSUSE:Factory/.kitty.new.23466/kitty.changes 2023-07-08 22:47:54.943401956 +0200 @@ -1,0 +2,44 @@ +Fri Jul 7 15:43:07 UTC 2023 - Scott Bradnick <[email protected]> + +- patch file fix-librsync-leap.patch is being deleted as part of a rename +- patch file fix-librsync-leap.diff is being added as part of a rename +- patch optional-disable-docs.patch is being deleted as part of a rename +- patch optional-disable-docs.diff is being added as part of a rename +- patch go-buildmode-pie.diff is being added so that 'go build' includes '-buildmode=pie' + +------------------------------------------------------------------- +Thu Jul 6 16:47:05 UTC 2023 - Scott Bradnick <[email protected]> + +- Adding wayland-protocols-1.32.diff patch to account for 'compiler crashes' + from wayland-protocols-devel update (#6422) + * This is patched upstream via 95d1564 and 7d2dc25 +- Removing -Wno-error=switch flag as this was a workaround to deal with + scenario from above + +------------------------------------------------------------------- +Tue Jul 4 20:51:36 UTC 2023 - Scott Bradnick <[email protected]> + +- Renaming the following files: + * fix-librsync-leap{.patch -> .diff} + * optional-disable-docs{.patch -> diff} + +------------------------------------------------------------------- +Tue Jul 4 19:58:53 UTC 2023 - Simon Vogl <[email protected]> + +- Set -Wno-error=switch flag to prevent compiler crashes for RISCV + and ARM + +------------------------------------------------------------------- +Thu Jun 29 20:22:40 UTC 2023 - Scott Bradnick <[email protected]> + +- Cleaning up "wayland-devel obsoletes libwayland-egl-devel" +- Adding 'Recommends: python3-importlib_resources' + +------------------------------------------------------------------- +Tue May 9 09:23:45 UTC 2023 - Max Lin <[email protected]> + +- Use python3.11 on Leap 15.5 + * python3.11 is the only python3 > 3.6 version would be shipped + in Leap 15.5 + +------------------------------------------------------------------- Old: ---- fix-librsync-leap.patch optional-disable-docs.patch New: ---- fix-librsync-leap.diff go-buildmode-pie.diff optional-disable-docs.diff wayland-protocols-1.32.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kitty.spec ++++++ --- /var/tmp/diff_new_pack.KRQJOx/_old 2023-07-08 22:47:55.687406427 +0200 +++ /var/tmp/diff_new_pack.KRQJOx/_new 2023-07-08 22:47:55.691406452 +0200 @@ -27,10 +27,12 @@ URL: https://github.com/kovidgoyal/kitty Source: https://github.com/kovidgoyal/kitty/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: vendor.tar.gz -# PATCH-FIX-OPENSUSE optional-disable-docs.patch -- Optionally disable building documentation files -Patch0: optional-disable-docs.patch -# PATCH-FIX-OPENSUSE fix-librsync-leap.patch -- Fix for Leap, as librsync header is missing the stdio.h header for FILE* -Patch1: fix-librsync-leap.patch +# PATCH-FIX-OPENSUSE optional-disable-docs.diff -- Optionally disable building documentation files +Patch0: optional-disable-docs.diff +# PATCH-FIX-OPENSUSE fix-librsync-leap.diff -- Fix for Leap, as librsync header is missing the stdio.h header for FILE* +Patch1: fix-librsync-leap.diff +Patch2: go-buildmode-pie.diff +Patch3: wayland-protocols-1.32.diff BuildRequires: ImageMagick-devel BuildRequires: Mesa-libGL-devel BuildRequires: fdupes @@ -46,7 +48,7 @@ BuildRequires: liblcms2-devel BuildRequires: libpng16-compat-devel BuildRequires: librsync-devel -BuildRequires: libwayland-egl-devel +#BuildRequires: libwayland-egl-devel BuildRequires: libxkbcommon-devel BuildRequires: libxkbcommon-x11-devel BuildRequires: openssl-devel @@ -64,8 +66,16 @@ BuildRequires: python3-sphinxext-opengraph %else # Leap still provides python3.6 kitty requires at least 3.7 +%if 0%{?sle_version} > 150400 +BuildRequires: python311-devel +%else +%if 0%{?sle_version} > 150300 +BuildRequires: python310-devel +%else BuildRequires: python39-devel %endif +%endif +%endif # Optional documentation requirements %if %{with docs} BuildRequires: python3-Sphinx >= 1.7 @@ -74,6 +84,9 @@ BuildRequires: python3-sphinx-inline-tabs BuildRequires: python3-sphinxcontrib-copybutton %endif +Recommends: %{name}-shell-integration +Recommends: %{name}-terminfo +Recommends: python3-importlib_resources %description A terminal emulator that uses OpenGL for rendering. @@ -81,26 +94,70 @@ true-color, OpenType ligatures, mouse protocol, focus tracking, bracketed paste and so on, and which can be controlled by scripts. +%package terminfo +Summary: The terminfo file for the Kitty terminal +BuildArch: noarch + +%description terminfo +Provides 'xterm-kitty' terminfo file(s) for the Kitty terminal; this package can be installed on its own to provide file(s) instead of the full kitty package on remote systems. + +%package shell-integration +Summary: The shell-integation file(s) for the Kitty terminal + +%description shell-integration +shell-integration [bash,fish,zsh] file(s) for the Kitty terminal; this package can be installed on its own to provide file(s) instead of the full kitty package on remote systems. + %prep -%autosetup -p1 -a 1 +#%%autosetup -p1 -a 1 +%setup -a 1 +%patch0 -p1 +%patch1 -p1 +%patch2 +%patch3 %if 0%{?suse_version} > 1500 find . -type f -exec sed -i 's@#!/usr/bin/env python3$@#!%{_bindir}/python3@' {} + find . -type f -exec sed -i 's@#!/usr/bin/env python$@#!%{_bindir}/python@' {} + %else +%if 0%{?sle_version} > 150400 +find . -type f -exec sed -i 's@#!/usr/bin/env python3$@#!%{_bindir}/python3.11@' {} + +find . -type f -exec sed -i 's@#!/usr/bin/env python$@#!%{_bindir}/python3.11@' {} + +%else +%if 0%{?sle_version} > 150300 +find . -type f -exec sed -i 's@#!/usr/bin/env python3$@#!%{_bindir}/python3.10@' {} + +find . -type f -exec sed -i 's@#!/usr/bin/env python$@#!%{_bindir}/python3.10@' {} + +%else find . -type f -exec sed -i 's@#!/usr/bin/env python3$@#!%{_bindir}/python3.9@' {} + find . -type f -exec sed -i 's@#!/usr/bin/env python$@#!%{_bindir}/python3.9@' {} + %endif +%endif +%endif + +%build %install # yes they have a makefile, no they dont use it properly # no they dont have a make install # we used to have this in the build section but since rpm 4.16 buildroot is cleaned +# +# See: https://build.opensuse.org/request/show/1096854 +# Set -Wno-error=switch flag to prevent compiler crashes +#export CFLAGS="${CFLAGS:-%%optflags} -Wno-error=switch" +#export CXXFLAGS="${CXXFLAGS:-%%optflags} -Wno-error=switch" +# %if 0%{?suse_version} > 1500 python3 \ %else +%if 0%{?sle_version} > 150400 +python3.11 -B \ +%else +%if 0%{?sle_version} > 150300 +python3.10 -B \ +%else python3.9 -B \ %endif +%endif +%endif setup.py --verbose \ %if !%{with docs} --no-docs \ @@ -117,13 +174,23 @@ %{_bindir}/%{name} %{_bindir}/kitten %{_libdir}/%{name} +%exclude %{_libdir}/%{name}/shell-integration %{_datadir}/applications/%{name}{,-open}.desktop %{_datadir}/icons/hicolor/ -%{_datadir}/terminfo/x/xterm-%{name} %if %{with docs} %{_mandir}/man1/%{name}.1%{?ext_man} %{_datadir}/doc/%{name} %{_mandir}/man5/kitty.conf.5%{?ext_man} %endif +%files terminfo +%license LICENSE +%doc CHANGELOG.rst README.asciidoc +%{_datadir}/terminfo/x/xterm-%{name} + +%files shell-integration +%license LICENSE +%doc CHANGELOG.rst README.asciidoc +%{_libdir}/%{name}/shell-integration + %changelog ++++++ fix-librsync-leap.diff ++++++ diff -Nur kitty-0.25.0/kittens/transfer/rsync.c new/kittens/transfer/rsync.c --- kitty-0.25.0/kittens/transfer/rsync.c 2022-04-11 16:01:45.000000000 +0200 +++ new/kittens/transfer/rsync.c 2022-04-18 14:43:47.391998800 +0200 @@ -6,6 +6,7 @@ */ #include "data-types.h" +#include <stdio.h> #include <librsync.h> #define SIGNATURE_CAPSULE "rs_signature_t" diff -Nur kitty-0.25.0/setup.py new/setup.py --- kitty-0.25.0/setup.py 2022-04-18 14:44:34.223998795 +0200 +++ new/setup.py 2022-04-18 14:44:19.307998797 +0200 @@ -263,10 +263,11 @@ def detect_librsync(cc: List[str], cflags: List[str], ldflags: List[str]) -> str: if not test_compile( cc, *cflags, libraries=('rsync',), ldflags=ldflags, show_stderr=True, - src='#include <librsync.h>\nint main(void) { rs_strerror(0); return 0; }'): + src='#include <stdio.h>\n#include <librsync.h>\nint main(void) { rs_strerror(0); return 0; }'): raise SystemExit('The librsync library is required') # check for rs_sig_args() which was added to librsync in Apr 2020 version 2.3.0 if test_compile(cc, *cflags, libraries=('rsync',), ldflags=ldflags, src=''' +#include <stdio.h> #include <librsync.h> int main(void) { rs_magic_number magic_number = 0; ++++++ go-buildmode-pie.diff ++++++ --- setup.py 2023-04-21 03:40:01.000000000 -0400 +++ setup.py.smb 2023-06-29 16:46:28.129796837 -0400 @@ -914,7 +914,7 @@ raise SystemExit(f'The version of go on this system ({current_go_version}) is too old. go >= {required_go_version} is needed') if not for_platform: update_go_generated_files(args, os.path.join(launcher_dir, appname)) - cmd = [go, 'build', '-v'] + cmd = [go, 'build', '-buildmode=pie', '-v'] vcs_rev = args.vcs_rev or get_vcs_rev() ld_flags = [f"-X 'kitty.VCSRevision={vcs_rev}'"] if for_freeze: ++++++ optional-disable-docs.diff ++++++ Index: kitty-0.27.1/setup.py =================================================================== --- kitty-0.27.1.orig/setup.py +++ kitty-0.27.1/setup.py @@ -61,6 +61,7 @@ verbose: int = 0 sanitize: bool = False prefix: str = './linux-package' + no_docs: bool = False dir_for_static_binaries: str = 'build/static' incremental: bool = True profile: bool = False @@ -1085,12 +1086,13 @@ c(base_path, ddir='', rx=exclude, force=True, optimize=optimize, quiet=1, workers=num_workers) -def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: - if not os.path.exists('docs/_build/html'): - make = 'gmake' if is_freebsd else 'make' - run_tool([make, 'docs']) - copy_man_pages(ddir) - copy_html_docs(ddir) +def create_linux_bundle_gunk(ddir: str, libdir_name: str, no_docs=False) -> None: + if not no_docs: + if not os.path.exists('docs/_build/html'): + make = 'gmake' if is_freebsd else 'make' + run_tool([make, 'docs']) + copy_man_pages(ddir) + 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) @@ -1468,7 +1470,7 @@ if not for_freeze and not bundle_type.startswith('macos-'): build_static_kittens(args, launcher_dir=launcher_dir) if not is_macos: - create_linux_bundle_gunk(ddir, args.libdir_name) + create_linux_bundle_gunk(ddir, args.libdir_name, args.no_docs) if bundle_type.startswith('macos-'): create_macos_bundle_gunk(ddir, for_freeze, args) @@ -1564,6 +1566,12 @@ help='Where to create the linux package' ) p.add_argument( + '--no-docs', + default=Options.no_docs, + action='store_true', + help='Disable building documentation when creating the linux package' + ) + p.add_argument( '--dir-for-static-binaries', default=Options.dir_for_static_binaries, help='Where to create the static kitten binary' ++++++ wayland-protocols-1.32.diff ++++++ --- glfw/wl_platform.h.smb 2023-07-06 12:27:14.522040038 -0400 +++ glfw/wl_platform.h 2023-07-06 12:28:00.202071997 -0400 @@ -125,6 +125,7 @@ TOPLEVEL_STATE_TILED_RIGHT = 32, TOPLEVEL_STATE_TILED_TOP = 64, TOPLEVEL_STATE_TILED_BOTTOM = 128, + TOPLEVEL_STATE_SUSPENDED = 256, } WaylandWindowState; typedef struct glfw_wl_xdg_activation_request { --- glfw/wl_window.c.smb 2023-07-06 12:29:16.262125204 -0400 +++ glfw/wl_window.c 2023-07-06 12:30:46.422188255 -0400 @@ -529,6 +529,9 @@ C(TOPLEVEL_STATE_TILED_RIGHT); C(TOPLEVEL_STATE_TILED_TOP); C(TOPLEVEL_STATE_TILED_BOTTOM); +#ifdef XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION + C(TOPLEVEL_STATE_SUSPENDED); +#endif #undef C } }
