Attachment #237467 for bug #267209

View | Details | Raw Unified | Return to bug 267209
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/x11/kitty/Makefile (-2 / +1 lines)
1	PORTNAME= kitty	1	PORTNAME= kitty
2	DISTVERSION= 0.26.2	2	DISTVERSION= 0.26.4
3	CATEGORIES= x11 wayland	3	CATEGORIES= x11 wayland
4	MASTER_SITES= https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/	4	MASTER_SITES= https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/
5		5
Lines 14-20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \ Link Here
14	${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \	14	${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
15	${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \	15	${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
16	${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
17	openssl>0:security/openssl \
18	sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \	17	sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
19	wayland-protocols>=0:graphics/wayland-protocols	18	wayland-protocols>=0:graphics/wayland-protocols
20	LIB_DEPENDS= libdbus-1.so:devel/dbus \	19	LIB_DEPENDS= libdbus-1.so:devel/dbus \

Lines 1-3 Link Here

(-)b/x11/kitty/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1663399175	1	TIMESTAMP = 1666199757
2	SHA256 (kitty-0.26.2.tar.xz) = 586ff599c5a3f31831b2a32dd9faafacb6c3581f2561f8ddcab0ba815bc7dab4	2	SHA256 (kitty-0.26.4.tar.xz) = c09591ac7c908e6a0549f75cc061c6318f46261f9f5d3f3775120063c3a43bb7
3	SIZE (kitty-0.26.2.tar.xz) = 4716932	3	SIZE (kitty-0.26.4.tar.xz) = 4749148




--- setup.py.orig	2022-10-19 17:45:56 UTC
+++ setup.py
@@ -130,25 +130,9 @@ 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 = ''
-
-    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{sys.prefix}/include"]
+    libs = [f"-L{sys.prefix}/lib", "-lcrypto"]
+    return cflags, libs
 
 
 def at_least_version(package: str, major: int, minor: int = 0) -> None:




lib/kitty/kittens/mouse_demo/main.py
lib/kitty/kittens/panel/__init__.py
lib/kitty/kittens/panel/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

lib/kitty/kitty/cli.py
lib/kitty/kitty/cli_stub.py
lib/kitty/kitty/client.py
lib/kitty/kitty/clipboard.py
lib/kitty/kitty/complete.py
lib/kitty/kitty/conf/__init__.py
lib/kitty/kitty/conf/generate.py

lib/kitty/kitty/options/types.py
lib/kitty/kitty/options/utils.py
lib/kitty/kitty/os_window_size.py
lib/kitty/kitty/prewarm.py
lib/kitty/kitty/rc/__init__.py
lib/kitty/kitty/rc/base.py
lib/kitty/kitty/rc/close_tab.py

Return to bug 267209

Added Link Here

(-)b/x11/kitty/files/patch-setup.py (+31 lines)
1	--- setup.py.orig 2022-10-19 17:45:56 UTC
2	+++ setup.py
3	@@ -130,25 +130,9 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
4	# Apple use their special snowflake TLS libraries and additionally
5	# have an ancient broken system OpenSSL, so we need to check for one
6	# installed by all the various macOS package managers.
7	- extra_pc_dir = ''
8	-
9	- try:
10	- cflags = pkg_config('libcrypto', '--cflags-only-I', fatal=False)
11	- except subprocess.CalledProcessError:
12	- if is_macos:
13	- import ssl
14	- v = ssl.OPENSSL_VERSION_INFO
15	- pats = f'{v[0]}.{v[1]}', f'{v[0]}'
16	- for pat in pats:
17	- q = f'opt/openssl@{pat}/lib/pkgconfig'
18	- openssl_dirs = glob.glob(f'/opt/homebrew/{q}') + glob.glob(f'/usr/local/{q}')
19	- if openssl_dirs:
20	- break
21	- if not openssl_dirs:
22	- raise SystemExit(f'Failed to find OpenSSL version {v[0]}.{v[1]} on your system')
23	- extra_pc_dir = os.pathsep.join(openssl_dirs)
24	- cflags = pkg_config('libcrypto', '--cflags-only-I', extra_pc_dir=extra_pc_dir)
25	- return cflags, pkg_config('libcrypto', '--libs', extra_pc_dir=extra_pc_dir)
26	+ cflags = [f"-I{sys.prefix}/include"]
27	+ libs = [f"-L{sys.prefix}/lib", "-lcrypto"]
28	+ return cflags, libs
29
30
31	def at_least_version(package: str, major: int, minor: int = 0) -> None:

Lines 36-42 lib/kitty/kittens/mouse_demo/__init__.py Link Here

(-)b/x11/kitty/pkg-plist (-1 / +2 lines)
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/kitty/prewarm.py
40	lib/kitty/kittens/query_terminal/__init__.py	39	lib/kitty/kittens/query_terminal/__init__.py
41	lib/kitty/kittens/query_terminal/main.py	40	lib/kitty/kittens/query_terminal/main.py
42	lib/kitty/kittens/remote_file/__init__.py	41	lib/kitty/kittens/remote_file/__init__.py
Lines 102-107 lib/kitty/kitty/choose_entry.py Link Here
102	lib/kitty/kitty/cli.py	101	lib/kitty/kitty/cli.py
103	lib/kitty/kitty/cli_stub.py	102	lib/kitty/kitty/cli_stub.py
104	lib/kitty/kitty/client.py	103	lib/kitty/kitty/client.py
		104	lib/kitty/kitty/clipboard.py
105	lib/kitty/kitty/complete.py	105	lib/kitty/kitty/complete.py
106	lib/kitty/kitty/conf/__init__.py	106	lib/kitty/kitty/conf/__init__.py
107	lib/kitty/kitty/conf/generate.py	107	lib/kitty/kitty/conf/generate.py
Lines 148-153 lib/kitty/kitty/options/parse.py Link Here
148	lib/kitty/kitty/options/types.py	148	lib/kitty/kitty/options/types.py
149	lib/kitty/kitty/options/utils.py	149	lib/kitty/kitty/options/utils.py
150	lib/kitty/kitty/os_window_size.py	150	lib/kitty/kitty/os_window_size.py
		151	lib/kitty/kitty/prewarm.py
151	lib/kitty/kitty/rc/__init__.py	152	lib/kitty/kitty/rc/__init__.py
152	lib/kitty/kitty/rc/base.py	153	lib/kitty/kitty/rc/base.py
153	lib/kitty/kitty/rc/close_tab.py	154	lib/kitty/kitty/rc/close_tab.py