From nobody Sun Nov 20 18:12:02 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NFdrz19zHz4hpcw; Sun, 20 Nov 2022 18:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NFdrz0hFQz4QcV; Sun, 20 Nov 2022 18:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668967923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftceWGuPDDKZr8TX+9Od1NUG4tsgXO3Y0adE8yqQpDk=; b=sZi4ONeJfY5MNnC2t7buHh8vVWFaB4WIfXmcbHfq40kadkxEy/yr/EAANZBniQOGKcUesr F03tWRTgFgN0o75V3unBHbzgUeuLt6KDn8POcAiQBGUjcB7ldhtfGLaZOoSf8OSokESK7o 6ULrh7U3WI70PToEjy+hzXOmrUyyacwt5bUDNOloNZ3wXRm8yf0a658sf0dKU+Z9DM+s57 V7Ek4BnMApkc30PP/bNdKsGgTOtR9ynOO5Qquvy9EAgh8AVP8zlz066rdhGCxleG2loeOk s+KbvpCbHVo8aRUXw6kK8jAHTJZUX2XcTE/XBL+MnlonQnjCN5tMeF6In2eQAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668967923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftceWGuPDDKZr8TX+9Od1NUG4tsgXO3Y0adE8yqQpDk=; b=KGdVlx4Hdab3Rb9FRM33SoLQ8TA2woxYGR9tZxKhCJ68sxBrFLy0m7y+Bq52xJ0/KK5x2J oxsJQXEeYcDW8QdOWeMy4PXPpkhDY6a3JajjMFGlH4VkZrvUIKO3zUm+RjDUtnkZQlEKe5 M0CAt65vpEhhsX1s7h5ZZHagAa4Oe/2MX9ERbr1ZIHXe0B3cpywHWYfmBumoTzR3KNF7iK E6CVAyBbaMG2jR6UO9M9HH2+xRlz9mGRjIH79r1WgA9cjDr9xkF+kTqzWqLLp1LCsgQfxG haYGI1fD5VVWzIjAVHaNxrAT/lywFXpYnqRdD3b4xCOgTWOJugXOGGUfpz2MMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668967923; a=rsa-sha256; cv=none; b=jOKJfQqii0nlz9RpZ0fl2Vnp3K5A7M0KbleicJF7EM/G8JoEkaeooOtEFH8T9vslK46/3c 6a6KyUEss2JcvSvXEebvLXhTMC0DPI20AHgYDgxKDaIbIPyAzV7TD6tpcUsphfmzyqYYcz /cc/wBF+MRzgJNYgSSDD6g9kvxkU9ukm7dqiUlkAI5HBW8mqXpZjitxpJMbMkQc9Pgdxps uBLSHapQrSalSP2UOP2KlEKkdWbmHEOEU90hwlnD7Pw3mEW4/pofBXrgM5XvXnPQSdPLp+ 22eRwHqKRJCXcWqCZkObooZ0X0QPbefd1r19TLuktp04JUws+CKaQWCWNHlO7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NFdry6vVTzYfv; Sun, 20 Nov 2022 18:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AKIC2Au009200; Sun, 20 Nov 2022 18:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKIC2wU009199; Sun, 20 Nov 2022 18:12:02 GMT (envelope-from git) Date: Sun, 20 Nov 2022 18:12:02 GMT Message-Id: <202211201812.2AKIC2wU009199@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 724a313a86d9 - 2022Q4 - x11/kitty: Update to 0.26.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 724a313a86d9470213f52789f4d2b5609b51648e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=724a313a86d9470213f52789f4d2b5609b51648e commit 724a313a86d9470213f52789f4d2b5609b51648e Author: Alexis Praga AuthorDate: 2022-10-20 05:47:29 +0000 Commit: Nuno Teixeira CommitDate: 2022-11-20 17:38:42 +0000 x11/kitty: Update to 0.26.4 ChangeLog: https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes * Allow centering the background_image * X11: Fix a regression in the previous release that caused pasting from GTK based applications to have extra newlines * Tab bar: Improve empty space management when some tabs have short titles, allocate the saved space to the active tab * Fix background_tint not applying to window margins and padding * Wayland: Fix background image scaling using tiled mode on high DPI screens * Wayland: Fix an abort when changing background colors with wayland_titlebar_color set to background * Update to Unicode 15.0 * GNOME Wayland: Fix a memory leak in gnome-shell when using client side decorations * Wayland: Mark windows in which a bell occurs as urgent on compositors that support the xdg-activation protocol * Allow passing null bytes through the system clipboard * ssh kitten: Fix KITTY_PUBLIC_KEY not being encoded properly when transmitting * Sessions: Allow controlling which OS Window is active via the focus_os_window directive * Wayland: Fix for bug in NVIDIA drivers that prevents transparency working * Wayland: Fix for a bug that could cause kitty to become non-responsive when using multiple OS windows in a single instance on some compositors * Wayland: Fix for a bug preventing kitty from starting on Hyprland when using a non-unit scale * Wayland: Generate a XDG_ACTIVATION_TOKEN when opening URLs or running programs in the background via the launch action * Fix a regression that caused kitty not to restore SIGPIPE after python nukes it when launching children. Affects bash which does not sanitize its signal mask. * Fix a use-after-free when handling fake mouse clicks and the action causes windows to be removed/re-allocated PR: 267209 Reported by: alexis.praga@proton.me (maintainer) MFH: 2022Q4 (bugfixes) (cherry picked from commit 0720e8460e93b225d3b95d268ecb097e850f981c) --- x11/kitty/Makefile | 3 +-- x11/kitty/distinfo | 6 +++--- x11/kitty/files/patch-setup.py | 31 +++++++++++++++++++++++++++++++ x11/kitty/pkg-plist | 3 ++- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 4a5e7bd243fa..e4d1d2ed5519 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,5 +1,5 @@ PORTNAME= kitty -DISTVERSION= 0.26.2 +DISTVERSION= 0.26.4 CATEGORIES= x11 wayland MASTER_SITES= https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -14,7 +14,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \ - openssl>0:security/openssl \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ wayland-protocols>=0:graphics/wayland-protocols LIB_DEPENDS= libdbus-1.so:devel/dbus \ diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo index 4d4ce738b7a3..81525ec1e08c 100644 --- a/x11/kitty/distinfo +++ b/x11/kitty/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663399175 -SHA256 (kitty-0.26.2.tar.xz) = 586ff599c5a3f31831b2a32dd9faafacb6c3581f2561f8ddcab0ba815bc7dab4 -SIZE (kitty-0.26.2.tar.xz) = 4716932 +TIMESTAMP = 1666199757 +SHA256 (kitty-0.26.4.tar.xz) = c09591ac7c908e6a0549f75cc061c6318f46261f9f5d3f3775120063c3a43bb7 +SIZE (kitty-0.26.4.tar.xz) = 4749148 diff --git a/x11/kitty/files/patch-setup.py b/x11/kitty/files/patch-setup.py new file mode 100644 index 000000000000..a0d54d1c5a3b --- /dev/null +++ b/x11/kitty/files/patch-setup.py @@ -0,0 +1,31 @@ +--- 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: diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist index 870f81dbc8d0..a911dc0d1b30 100644 --- a/x11/kitty/pkg-plist +++ b/x11/kitty/pkg-plist @@ -36,7 +36,6 @@ 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/kitty/prewarm.py lib/kitty/kittens/query_terminal/__init__.py lib/kitty/kittens/query_terminal/main.py lib/kitty/kittens/remote_file/__init__.py @@ -102,6 +101,7 @@ lib/kitty/kitty/choose_entry.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 @@ -148,6 +148,7 @@ lib/kitty/kitty/options/parse.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