From nobody Fri Dec 13 03:51: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 4Y8b4L1ZSMz5h8t9; Fri, 13 Dec 2024 03:51:46 +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 4Y8b4L0CvSz4xSK; Fri, 13 Dec 2024 03:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734061906; 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=V8+PwTTYtSneOOaAVvOJa6pJv8B8EZG7qjl7y+UUSVA=; b=OF/j2OTRCKj9tt0icyhD8nICZAC8yOR6xDfQ9hUyt088iF4WKtxSDVIAZfUfS/41EdEFQR EblZnYKudDod5hSMpkCmqtFlU35bAvxzI6L7BmPqhJz5Qi8QhMZykpU8zkHSNfxceGSVgg xbztT1oJoXtiBICU3b329QSHQwJmaalDM84zlvn1cMpy3CywqzL5avMUnG2h6o1/nUAQ1V T2kagDuXGZLxTebNkbJHShxvsK164FIe24LImDgHoqHRss+pAT3vF7RzYDN0FbnIuLXK1P e4hedRLpl6XKY1mNsGDATXFOOwMTEL7Zy4P/bkiaNZALQ+5Ip/QXXFGGOMFz0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734061906; 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=V8+PwTTYtSneOOaAVvOJa6pJv8B8EZG7qjl7y+UUSVA=; b=yG6Gh5ZHkyaornlPRMqgjZg3jbI7F0X7AUJIH88JJFYa4n6JXFQY2HviWozAhPlp9u6BGM s6DVR2Jre0hz1IVify0uR7Zy8nSW7ayynUKfHGT6H6eCJy49tFBVB/ji1sZ9DcdUKPE5Uh 5U/Vpl5j2uZ3bqvEI2mBraSqpaBmMV5CvBhrDWm0uDr7c5h/dXbvsyXfT6+IIP6KpuScIG o8GlN3P9QBwWbOHe9VzreJ4ax9rUGVgFNALOW1FR1TBDGlZs8D2etFvMeBGVjUtPcN3AqK weLSgfGfOAfqH7ADb4ZkES4M2H5UGUcSXROrjv1g5akyzfXHNKWbFPv/WE6t5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734061906; a=rsa-sha256; cv=none; b=m5DHlR1TqHhwl942Pgxe4lOMqDUDhWDvmUnn0Me2JobPWdXWKMT/VkrpF2oMrA2Fx1o68H XeFYAinPXNbt90g1vYlV8ARLk0qk43eXuAVbtHxffDCcPGm4c9j+FxdgIAC0Wa+Bg6NAXB uO0oJBBrpSGCiK1Ms4pIDFGpaQQQpsjMXnS1VowfFJzSEov54AvhwDXYXgiLqozGgB2Am5 0hafHiOLqDQ67mt/G8zvKmPQ2r1KoFr5ncdakaa7L/GcNGQ2/JNqrQ4E7ozgFpkWUmbVrr ETJIpe58xT3QiY914sOW7UfoG9kNdrE6QsWou8Q5DBDjbRy12kj7j4aMq/GtWA== 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 4Y8b4K6wsnzM9m; Fri, 13 Dec 2024 03:51: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 4BD3pjwc075872; Fri, 13 Dec 2024 03:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD3pjGr075869; Fri, 13 Dec 2024 03:51:45 GMT (envelope-from git) Date: Fri, 13 Dec 2024 03:51:45 GMT Message-Id: <202412130351.4BD3pjGr075869@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: a2394dacc23a - main - 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/main X-Git-Reftype: branch X-Git-Commit: a2394dacc23a5cfe330ca388c0a1609f4b718a14 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2394dacc23a5cfe330ca388c0a1609f4b718a14 commit a2394dacc23a5cfe330ca388c0a1609f4b718a14 Author: Jan Beich AuthorDate: 2024-12-13 02:41:37 +0000 Commit: Jan Beich CommitDate: 2024-12-13 03:50:59 +0000 x11-wm/cosmic-comp: unbreak text in title bar and context menu --- 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; +