Attachment 236662 Details for Bug 266458 – kitty-0.26.2.diff

[patch] kitty-0.26.2.diff

kitty.diff (text/plain), 3.41 KB, created by Jesús Daniel Colmenares Oviedo on 2022-09-18 13:03:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesús Daniel Colmenares Oviedo

Created: 2022-09-18 13:03:38 UTC

Size: 3.41 KB

patch

obsolete

>diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
>index 2d9229c9a5..f86a2a4291 100644
>--- a/x11/kitty/Makefile
>+++ b/x11/kitty/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	kitty
>-DISTVERSION=	0.25.2
>-PORTREVISION=	1
>+DISTVERSION=	0.26.2
> CATEGORIES=	x11 wayland
> MASTER_SITES=	https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/
> 
>@@ -30,7 +29,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
> 		libxkbcommon.so:x11/libxkbcommon
> 
> USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
>-		pkgconfig python:3.5+ shebangfix tar:xz terminfo xorg
>+		pkgconfig python:3.5+ shebangfix ssl tar:xz terminfo xorg
> CPE_VENDOR=	kitty_project
> USE_GL=		gl
> USE_XORG=	x11 xcb xcursor xi xinerama xrandr
>diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo
>index e2d938b113..4d4ce738b7 100644
>--- a/x11/kitty/distinfo
>+++ b/x11/kitty/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1660419246
>-SHA256 (kitty-0.25.2.tar.xz) = a20a470490fee05bd4bd0ce0964b5b87df1fabe51f05fa076364bbfe2ee4e03c
>-SIZE (kitty-0.25.2.tar.xz) = 4681940
>+TIMESTAMP = 1663399175
>+SHA256 (kitty-0.26.2.tar.xz) = 586ff599c5a3f31831b2a32dd9faafacb6c3581f2561f8ddcab0ba815bc7dab4
>+SIZE (kitty-0.26.2.tar.xz) = 4716932
>diff --git a/x11/kitty/files/patch-setup.py b/x11/kitty/files/patch-setup.py
>new file mode 100644
>index 0000000000..8da52aa6b0
>--- /dev/null
>+++ b/x11/kitty/files/patch-setup.py
>@@ -0,0 +1,36 @@
>+--- setup.py.orig	2022-09-18 11:39:45 UTC
>++++ setup.py
>+@@ -127,29 +127,12 @@ def pkg_version(package: str) -> Tuple[int, int]:
>+ 
>+ 
>+ def libcrypto_flags() -> Tuple[List[str], List[str]]:
>+-    # Apple use their special snowflake TLS libraries and additionally
>+-    # have an ancient broken system OpenSSL, so we need to check for one
>+-    # installed by all the various macOS package managers.
>+-    extra_pc_dir = ''
>++    _prefix = sys.prefix
>+ 
>+-    try:
>+-        cflags = pkg_config('libcrypto', '--cflags-only-I', fatal=False)
>+-    except subprocess.CalledProcessError:
>+-        if is_macos:
>+-            import ssl
>+-            v = ssl.OPENSSL_VERSION_INFO
>+-            pats = f'{v[0]}.{v[1]}', f'{v[0]}'
>+-            for pat in pats:
>+-                q = f'opt/openssl@{pat}/lib/pkgconfig'
>+-                openssl_dirs = glob.glob(f'/opt/homebrew/{q}') + glob.glob(f'/usr/local/{q}')
>+-                if openssl_dirs:
>+-                    break
>+-            if not openssl_dirs:
>+-                raise SystemExit(f'Failed to find OpenSSL version {v[0]}.{v[1]} on your system')
>+-            extra_pc_dir = os.pathsep.join(openssl_dirs)
>+-        cflags = pkg_config('libcrypto', '--cflags-only-I', extra_pc_dir=extra_pc_dir)
>+-    return cflags, pkg_config('libcrypto', '--libs', extra_pc_dir=extra_pc_dir)
>++    cflags = [f"-I{_prefix}/include"]
>++    libs = [f"-L{_prefix}/lib", "-lcrypto"]
>+ 
>++    return cflags, libs
>+ 
>+ def at_least_version(package: str, major: int, minor: int = 0) -> None:
>+     q = f'{major}.{minor}'
>diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist
>index 1d5a72f7db..870f81dbc8 100644
>--- a/x11/kitty/pkg-plist
>+++ b/x11/kitty/pkg-plist
>@@ -36,8 +36,7 @@ lib/kitty/kittens/mouse_demo/__init__.py
> lib/kitty/kittens/mouse_demo/main.py
> lib/kitty/kittens/panel/__init__.py
> lib/kitty/kittens/panel/main.py
>-lib/kitty/kittens/prewarm/__init__.py
>-lib/kitty/kittens/prewarm/main.py
>+lib/kitty/kitty/prewarm.py
> lib/kitty/kittens/query_terminal/__init__.py
> lib/kitty/kittens/query_terminal/main.py
> lib/kitty/kittens/remote_file/__init__.py

Actions: View | Diff

Attachments on bug 266458: 236625 | 236662 | 236663