View | Details | Raw Unified | Return to bug 266458 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 266458