From nobody Sat Jan 28 04:36:26 2023 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 4P3hV30F3wz3cFbQ; Sat, 28 Jan 2023 04:36:27 +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 4P3hV26nQdz4Cf4; Sat, 28 Jan 2023 04:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674880587; 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=DcIFVNSKyiaclNvsIaGnzdwrMnP2sk0PV1Fv5u+DP9I=; b=nakTkZjveGWryL7LziObc4UFXFMu+2IEs/D+fKkEvZom4UdAjhZ1CJU/C5u2XZtsLt/TTZ cw4VXs70itkHw8eMhAu2RCh9GrRw/4bdCs61QJtXHYOfhet7lF9RZYwtC3TAXLP+KvBkBo qjW7ajXr8SEmiE/OqxXCeuLHaqBIGYyBvJuyFgdN+WrxR36twxnVvL1GoiO72ptGRlREI/ 1+ITTu1aXerpE88OpsGL3WEdIfTLfwkf8+hkXrkxI6junt9lj5UcpR/qyPeAU5Od6Wmgjf nkQGBr/fIeA3gUdIKQrCc7MV76FDOpD6FAf2QZEVh5/HfxuJs2Q+pkBGyGCyHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674880587; 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=DcIFVNSKyiaclNvsIaGnzdwrMnP2sk0PV1Fv5u+DP9I=; b=XmXfiHUvQ2wPj0QmduM6ky2nE0DprC0Nb10hvSZCu0E+RR/z6osytMVILckkuMRa3nAeHN GmXafUgg62VMWkTL0YtJ/Xm0ojGCrUEpoYRllyhR45HF0gEQCj26kx/IjfJ09IwS0roRlM pfsmIObVwW0IPizyl/OT8whSwdIjzoHe5fVO9GDcbnRhpy9zwSWhlM4qqPxmS0hJJyNpz6 pBcdqEatTGGV5xnfKZeylbgJVujnpsW8t8JpjQhTlJo59ZIM5Xmu0vafkN1/4crn9y+jjT JYEfUcZgJrhepw6NF0pPLfl2q/eHfPA18T3LyMS9MySvSvFnxT4n092hQw5dYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674880587; a=rsa-sha256; cv=none; b=bR4c8QNh1h2iVAGcNGqWLXMbCNafdhQh5N11ap+xdnvDBKhJuwGMVtMqX7RqR/IaP/xzFA Vn8oTjihySpQbOg3InJ7Q6KKkqqan3TnI6rDQzOf68BautXex27wUGK+8bzdit5k/kj1QM wdk+u4JeswNxjic3mdEmZO5JZWkZw61r3qwRoDJnCR9qsR70VbR506LwnkNDvsQj1OoSF2 i0h1VbOgR25MB1xUsgu6TxEud6weBRwqqoCz+xVsDNlWMOhBLfWVX2Hio4RBQr1mChJkfY bpLg04wBUFhiFrETxQ8ANb3OPkDhKS1GpSGRIW2yCwfeYFNuJCh69kHgZM4/LQ== 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 4P3hV25sJjzbx1; Sat, 28 Jan 2023 04:36:26 +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 30S4aQOZ012402; Sat, 28 Jan 2023 04:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30S4aQve012401; Sat, 28 Jan 2023 04:36:26 GMT (envelope-from git) Date: Sat, 28 Jan 2023 04:36:26 GMT Message-Id: <202301280436.30S4aQve012401@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 08a80171eb5c - main - x11-wm/subtle: unbreak the port's build against new Ruby versions 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08a80171eb5c57b3c767028ca9989650702e2f6e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=08a80171eb5c57b3c767028ca9989650702e2f6e commit 08a80171eb5c57b3c767028ca9989650702e2f6e Author: Alexey Dokuchaev AuthorDate: 2023-01-28 04:31:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-01-28 04:31:32 +0000 x11-wm/subtle: unbreak the port's build against new Ruby versions File.exists? method has been deprecated and removed in Ruby 3.2.0, adjust the code accordingly. PR: 269177 --- x11-wm/subtle/Makefile | 2 ++ x11-wm/subtle/files/patch-Rakefile | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/x11-wm/subtle/Makefile b/x11-wm/subtle/Makefile index 726512f04195..8b3515300900 100644 --- a/x11-wm/subtle/Makefile +++ b/x11-wm/subtle/Makefile @@ -21,6 +21,8 @@ ALL_TARGET= build post-patch: @${REINPLACE_CMD} -e 1d ${WRKSRC}/data/subtler/runner.rb + @${REINPLACE_CMD} -e 's,File\.exists\?,File.exist?,' \ + ${WRKSRC}/data/sur/server.rb @${REINPLACE_CMD} -e 's,/etc/xdg,${LOCALBASE}&,' \ ${WRKSRC}/src/subtle/ruby.c diff --git a/x11-wm/subtle/files/patch-Rakefile b/x11-wm/subtle/files/patch-Rakefile index ce3585b55d07..a004dede2c5a 100644 --- a/x11-wm/subtle/files/patch-Rakefile +++ b/x11-wm/subtle/files/patch-Rakefile @@ -42,6 +42,15 @@ end checksums +@@ -282,7 +282,7 @@ task(:config) do + end + + # Get revision +- if File.exists?(".hg") and (hg = find_executable0("hg")) ++ if File.exist?(".hg") and (hg = find_executable0("hg")) + match = `#{hg} tip`.match(/^[^:]+:\s*(\d+).*/) + + if !match.nil? and 2 == match.size @@ -396,7 +396,10 @@ task(:config) do checking_for("X11/Xft/Xft.h") do ret = false