From nobody Sat Dec 14 00:15:45 2024 X-Original-To: dev-commits-ports-all@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 4Y96Dd5hJ6z5gMHL; Sat, 14 Dec 2024 00:15:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y96Dd4xvlz4140; Sat, 14 Dec 2024 00:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135345; 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=RRSruSZhHKBtmk/k22T74BVaKoMACwoHZVIp5Yuzb7s=; b=Pd85g5v9uRxNjau2xLGBtOSm7dzSn5Ur3HrPLDKaXsSJX1IefaGJzukhTsCePNy2U/etuL dPJ4TFjAN3EfdOXzzs/TlWQdMeqLT5Na/AbR2EqqS86ySriwlvtiMPZzBeO0BdZivM+u6u KpC3m9HfgzmnQ1FdH+HanmOs+YKVHzIMvnw6O9ZAD8TOP52tlgHp/RNCDWeToW8qpj5FfT QaKKt6XrWfDAT4w7P1ljV5olj7Nw0NuNsymNg6pu+ZKihQIcsIb2Zi39Ug3LB3/PV5rK7r ytp5K/OtONuhK7PAcjfzYVI3uxjHUiEq5qJeonZVeLLwxxDaJk3Se2d78dl67Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135345; 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=RRSruSZhHKBtmk/k22T74BVaKoMACwoHZVIp5Yuzb7s=; b=E/FsBC2AvRyKi+8+v7NOxaRSypv6w+wLRdGLuQKP/hdwTRbdvYPw2srKGLWVNcmpVXH18C 1CeLXlTzUZGlXxMId+TWKrcPaBNby5262dXiRpc4TRyocWuQgrbZx6oVYPT8TA+EP3Jeqf hkhJmMKRsiGx1QrOeq7pvHisZu9GlQqK8eTbhKqbqkBFV9Jpy8Js2sQIQUYUDU4/KJT9ud 6TGjriF0SwXTFh1kXUnbRsRYjWI/nmS5LvPwCUPCOdIm/EJi3O2bOukpx8SNXwBkPadEUT Hv3qlJbyHMX0U8+yiykI41UdF8w52VEpdDoTzES3KpUXghN+/qnWYFo2jEPp+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135345; a=rsa-sha256; cv=none; b=KHQHDp4J0WBFVSfEHV9kpoxz/gQ4nbvheHCJx9LbBH5aszOVmolcDI0EypI6jx8KgOv3Bq tJ8PyyCm1V1ymBRaThIcMu5jTg2vZo9cbOkIKhkSMGFS9ZAfxiU+rkGZefEK6sFU5tfjD2 Q2GnYs6h7F7KBn72sG6RUOHTzfh4vTvOXgEliB3rjieSNi/8xuDq3m4rmttlN0xQncHJS4 Dwd+vGS0E5e8wCv8lK57wAnP8PilW6DF997pjwzdTd443/1fJm+0XwJmsX+lb/jGhQkP2K ILA8TrNp7n0Rz6Q/vC+qCNRbkq9P1NAKstQiN0LSudEfBeMidjokOMyQuTf75w== 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 4Y96Dd4YD1z10JB; Sat, 14 Dec 2024 00:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BE0FjF0061352; Sat, 14 Dec 2024 00:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0FjM0061349; Sat, 14 Dec 2024 00:15:45 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:15:45 GMT Message-Id: <202412140015.4BE0FjM0061349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: ad618a0e3305 - 2024Q4 - x11-wm/cosmic-comp: unbreak text in title bar and context menu List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: ad618a0e3305f570597d6acb3e3ebb5c0c3edc1e Auto-Submitted: auto-generated The branch 2024Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad618a0e3305f570597d6acb3e3ebb5c0c3edc1e commit ad618a0e3305f570597d6acb3e3ebb5c0c3edc1e Author: Jan Beich AuthorDate: 2024-12-13 02:41:37 +0000 Commit: Jan Beich CommitDate: 2024-12-14 00:15:09 +0000 x11-wm/cosmic-comp: unbreak text in title bar and context menu (cherry picked from commit a2394dacc23a5cfe330ca388c0a1609f4b718a14) --- x11-wm/cosmic-comp/Makefile | 6 +++++- x11-wm/cosmic-comp/files/patch-cosmic-text | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile index 67a600c425d9..8532951833e7 100644 --- a/x11-wm/cosmic-comp/Makefile +++ b/x11-wm/cosmic-comp/Makefile @@ -1,7 +1,7 @@ PORTNAME= cosmic-comp DISTVERSIONPREFIX= epoch- DISTVERSION= 1.0.0-alpha.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -47,6 +47,10 @@ post-patch: # /sys by default is a symlink to /usr/src/sys @${REINPLACE_CMD} -e 's,/sys,${LINUXBASE}&,' \ ${WRKSRC}/src/debug.rs +# https://github.com/RazrFalcon/fontdb/issues/61 + @${REINPLACE_CMD} -e 's,/usr/share,${DATADIR:H},' \ + -e 's,/etc,${LOCALBASE}&,' \ + ${WRKSRC_crate_fontdb}/src/lib.rs post-install: # Install extras similar to ${WRKSRC}/Makefile diff --git a/x11-wm/cosmic-comp/files/patch-cosmic-text b/x11-wm/cosmic-comp/files/patch-cosmic-text new file mode 100644 index 000000000000..f24b06127f14 --- /dev/null +++ b/x11-wm/cosmic-comp/files/patch-cosmic-text @@ -0,0 +1,22 @@ +https://github.com/pop-os/cosmic-text/pull/336 + +--- ../cosmic-text-4fe90bb6126c22f589b46768d7754d65ae300c5e/src/font/fallback/mod.rs.orig 2024-09-23 13:53:29 UTC ++++ ../cosmic-text-4fe90bb6126c22f589b46768d7754d65ae300c5e/src/font/fallback/mod.rs +@@ -9,7 +9,7 @@ use self::platform::*; + + use self::platform::*; + +-#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows",)))] ++#[cfg(not(any(unix, target_os = "windows")))] + #[path = "other.rs"] + mod platform; + +@@ -17,7 +17,7 @@ mod platform; + #[path = "macos.rs"] + mod platform; + +-#[cfg(target_os = "linux")] ++#[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))] + #[path = "unix.rs"] + mod platform; +