From nobody Wed Jan 22 13:03:17 2025 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 4YdPQG04P6z5lS2t; Wed, 22 Jan 2025 13:03:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdPQF6XTGz3Q9V; Wed, 22 Jan 2025 13:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737550997; 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=PNMQkqqJ0qMPVILVubcxOirB8aobthmAhQHIj7p1yFA=; b=VORHLqj4mSHHSJ+QwaVlLQutnAR6WTfXZ/RWfC58j1Xxvu9Q9zp6k2gdmtv3Ur28Sms/j5 mzZYVuyViir8TVubLnvPHxRixFu4dZ/wlohn2pXtriKbP+cF39kDycSd99jKYMMyiP6lD1 PyX4d7RITCv/sIwaCdEgokChbO6Q+vuh1mf8mkvW0B4xE4AIGYa+lpxfQ3KmXqbE8VzYeb +kMJcSkaNxC4a4s9mBj7f8j5B+VaJByhS6LNvzQi2t2Q6H/CHzj7hgDTgU+2rTqwpwwIrZ w9oXsa0Rq9kE3kvuek2jqEXaWpXwiCjevmvN2xB1oVjhEtSrC/FrL4Qwmt5GQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737550997; 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=PNMQkqqJ0qMPVILVubcxOirB8aobthmAhQHIj7p1yFA=; b=I6LPXVxAH3LJ0dBaUxZvEzR2mLMifDnjP2nzLaKvB50TbBU4GBSlObl252OBS/gWfSwTcl X0poEANisS7IhKx4W3cS1jr6S7h1ju3C4zMHXAB9CSrvsVb79R8qb774P2ycCa6AoEMleT RPpxE3177fYgEELZibadfz7w7oN5S9lErMBchP/Y+Xb8r0S7eRu06HDeZMXBseTKzX+jfG 2zHZzoFT7wX8bO2sTPpLo4dgrwRo7T64NvC8SwJuIBi8HtHjlDHbMwjkqkX3I2sd8bbKCE soUNeo9ekD+1alrWkNl6mdqQOUUy4TuGgTEhjkmlr8CT/NGKO6ichYz70Rva4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737550997; a=rsa-sha256; cv=none; b=klk0N9z0eeaOwSbfgJJqXSiIpFkPENwt4/wZJ7WmqqPPva8X7fy3DY/l8u8PwI1ESZdj9p nHSamZbARLeUOw8XJ+pMfNppL1qmAVkOzM6a99Ephyb87DHUwoBjzd/F/8IiH1r96b3HIA vOZqqEXXt0SlL4NrfoXZMhAKMwUvAqE1WJQZZJSSjDkrsRNFFi3WxQllRkqiNIsxoN5NQg zu8Sb6jpyYV/YtQdJ1TO5SbCimV1CwKu6CnoU9CIsWgPgpJKdJ8zoc2QV4oHw1+rZHIIit +cFhs0hBWh/yBvuZCY7VtuyKjt+L+AH0F56fB5pez//J93RvDoXUJGLEcc8stQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdPQF5x4TztSs; Wed, 22 Jan 2025 13:03:17 +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 50MD3HZ6033431; Wed, 22 Jan 2025 13:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50MD3Hvr033428; Wed, 22 Jan 2025 13:03:17 GMT (envelope-from git) Date: Wed, 22 Jan 2025 13:03:17 GMT Message-Id: <202501221303.50MD3Hvr033428@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 4e8dacd288c6 - 2025Q1 - graphics/epsonscan2: Fix build on FreeBSD 15 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 4e8dacd288c62ff082f3bef87069fbab3ac8e745 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e8dacd288c62ff082f3bef87069fbab3ac8e745 commit 4e8dacd288c62ff082f3bef87069fbab3ac8e745 Author: J.R. Oldroyd AuthorDate: 2025-01-22 12:59:16 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-22 13:02:43 +0000 graphics/epsonscan2: Fix build on FreeBSD 15 PR: 284127 (cherry picked from commit abf9862fa9c98bd68956aa9573d97399ae5e0f7d) --- graphics/epsonscan2/Makefile | 2 +- .../files/patch-src_ES2Command_Src_Utils_ESAccessor.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/graphics/epsonscan2/Makefile b/graphics/epsonscan2/Makefile index 140afc91b8df..24c96cbfcf9f 100644 --- a/graphics/epsonscan2/Makefile +++ b/graphics/epsonscan2/Makefile @@ -1,6 +1,6 @@ PORTNAME= epsonscan2 DISTVERSION= 6.6.40.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= https://support.epson.net/linux/src/scanner/epsonscan2/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.src diff --git a/graphics/epsonscan2/files/patch-src_ES2Command_Src_Utils_ESAccessor.h b/graphics/epsonscan2/files/patch-src_ES2Command_Src_Utils_ESAccessor.h new file mode 100644 index 000000000000..cac14405aa0a --- /dev/null +++ b/graphics/epsonscan2/files/patch-src_ES2Command_Src_Utils_ESAccessor.h @@ -0,0 +1,11 @@ +--- src/ES2Command/Src/Utils/ESAccessor.h.orig 2021-11-25 00:56:55 UTC ++++ src/ES2Command/Src/Utils/ESAccessor.h +@@ -177,7 +177,7 @@ class CESAccessor{ (protected) + { + } + CSetterFunc(const CSetterFunc& rhs) +- : m_func(rhs.func) ++ : m_func(rhs.m_func) + { + } + virtual ISetterFunc* Clone()