From nobody Thu Feb 16 00:43:07 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 4PHGQ33Z8mz3rZ7W; Thu, 16 Feb 2023 00:43:07 +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 4PHGQ32y4Wz44r1; Thu, 16 Feb 2023 00:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676508187; 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=RMwiflBulJnLixOQklkvcqccperH4auGsC5tqmC9PkA=; b=uiZ6Y4NtZPmYZIeL8AhMmcAXw87rFFbR8b4yj7IerWZ8BYeL68kvjfpds90InL8bgUxEFT wFeJacbAJO7jh9jMa9zD71DxsGqnDtQwmjEpFMCOMwGyxiQQcICAA2SMQkPtNCaS59vbp3 O4EBKGIhSDf6/tJa7Pd/Fs9I4/qBjYc+aGCDMz7DphX3t9630EZkbbG4A9igqp9XwLh6RG 3y8E7egDaGf7kXnEg8T1otOUaFI5lS62X8Zp9b9Vj2HsDHcq/mosK6c6uMqGnA4nVO5fw+ ydPDDqPmPb7+nWNY8SPtuKOnb63+0/Be7R1EsXSziiD1vtFUslK+eyrCG/mj5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676508187; 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=RMwiflBulJnLixOQklkvcqccperH4auGsC5tqmC9PkA=; b=VoaaltCHlrXjnCCLUQLQFeIt7/prKrG1/KV0uQpJeEVdMK+wlP1og/0aNJz6UlF43t2NcT rzyL4aY2/zD2XMlbwaVTN0KYQ58jKNx2RDrfBp+PIbX8VKSXwZmMvX3ktIlRFdavn8rm43 edOW8a5btAHps0oLTA9qfg6qcM/VgM/LRaz1o+n2Ghp4W03psIPTdI8vP5tRHRkgabSqaf G4blI+PG2cIWyhN6zqm1kWwfxQB1fncefEh1AzyGzhr7/PvX/gq8+WwZt0ByyqRkrd7n6e q3J5CniGfKGh1BHhLt4ezQtiYrBpa2uOY4ujIct4NwR+e/LfZn4XidqGMxTdnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676508187; a=rsa-sha256; cv=none; b=XWWn2kMqKHrg43zgbgD6fOixGJVwX58HgM05/yupQnFdBWZv4GI5HjU9N/uBUTngfaXFKk WYeTCTBBqTh5t3QLsRs7bzCNLbmDYp6jl/jAEZCr+1pIrbGfgRLaZKZ3qTvpq6aIjiJV+V vdSirOwTuQmQqyUH8uu+JbqCpKnQR8jOOisjtuF/hdhrDxjgzMnXC+7bvTZKlKThetVrns S0TeuB5cFxzcnxDINW9g53vV7fuQ9OY4LGH3Wte7QlLW3po76ciI38MnBPO8hMfShOw0M8 mGwPijjOmu5Hn0mK8U3hg7FSRocYSwFY0KJRWfFblnkKXEPn3eafGqjUoLwWHw== 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 4PHGQ320kjzlGP; Thu, 16 Feb 2023 00:43:07 +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 31G0h7RK099718; Thu, 16 Feb 2023 00:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31G0h7Ps099717; Thu, 16 Feb 2023 00:43:07 GMT (envelope-from git) Date: Thu, 16 Feb 2023 00:43:07 GMT Message-Id: <202302160043.31G0h7Ps099717@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: 46c2184d862f - main - x11-wm/plasma5-kwin: unbreak on FreeBSD < 13 after d06d26f8c45e 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46c2184d862f3344afdea9d9a203929b80243535 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=46c2184d862f3344afdea9d9a203929b80243535 commit 46c2184d862f3344afdea9d9a203929b80243535 Author: Jan Beich AuthorDate: 2023-02-08 11:22:24 +0000 Commit: Jan Beich CommitDate: 2023-02-16 00:36:18 +0000 x11-wm/plasma5-kwin: unbreak on FreeBSD < 13 after d06d26f8c45e PR: 269406 Approved by: tcberner --- ...patch-src_backends_drm_drm__qpainter__layer.cpp | 20 +++++++ ...1_windowed_x11__windowed__qpainter__backend.cpp | 17 ++++++ .../plasma5-kwin/files/patch-src_utils_ramfile.cpp | 68 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/x11-wm/plasma5-kwin/files/patch-src_backends_drm_drm__qpainter__layer.cpp b/x11-wm/plasma5-kwin/files/patch-src_backends_drm_drm__qpainter__layer.cpp new file mode 100644 index 000000000000..18ff88315524 --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-src_backends_drm_drm__qpainter__layer.cpp @@ -0,0 +1,20 @@ +src/backends/drm/drm_qpainter_layer.cpp:54:79: error: use of undeclared identifier 'errno' + qCWarning(KWIN_DRM, "Failed to create dumb framebuffer: %s", strerror(errno)); + ^ +src/backends/drm/drm_qpainter_layer.cpp:66:87: error: use of undeclared identifier 'errno' + qCWarning(KWIN_DRM, "Failed to create dumb framebuffer: %s", strerror(errno)); + ^ +src/backends/drm/drm_qpainter_layer.cpp:121:94: error: use of undeclared identifier 'errno' + qCWarning(KWIN_DRM, "Failed to create dumb framebuffer for the cursor: %s", strerror(errno)); + ^ + +--- src/backends/drm/drm_qpainter_layer.cpp.orig 2023-01-03 18:08:37 UTC ++++ src/backends/drm/drm_qpainter_layer.cpp +@@ -19,6 +19,7 @@ + #include "drm_qpainter_backend.h" + #include "drm_virtual_output.h" + ++#include + #include + + namespace KWin diff --git a/x11-wm/plasma5-kwin/files/patch-src_backends_x11_windowed_x11__windowed__qpainter__backend.cpp b/x11-wm/plasma5-kwin/files/patch-src_backends_x11_windowed_x11__windowed__qpainter__backend.cpp new file mode 100644 index 000000000000..938bf51a26ff --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-src_backends_x11_windowed_x11__windowed__qpainter__backend.cpp @@ -0,0 +1,17 @@ +src/backends/x11/windowed/x11_windowed_qpainter_backend.cpp:47:71: error: use of undeclared identifier 'errno' + qCWarning(KWIN_X11WINDOWED) << "shmget() failed:" << strerror(errno); + ^ +src/backends/x11/windowed/x11_windowed_qpainter_backend.cpp:54:70: error: use of undeclared identifier 'errno' + qCWarning(KWIN_X11WINDOWED) << "shmat() failed:" << strerror(errno); + ^ + +--- src/backends/x11/windowed/x11_windowed_qpainter_backend.cpp~ 2023-02-09 12:15:33.000000000 +0000 ++++ src/backends/x11/windowed/x11_windowed_qpainter_backend.cpp 2023-02-16 00:34:26.599527784 +0000 +@@ -11,6 +11,7 @@ + #include "x11_windowed_logging.h" + #include "x11_windowed_output.h" + ++#include + #include + #include + #include diff --git a/x11-wm/plasma5-kwin/files/patch-src_utils_ramfile.cpp b/x11-wm/plasma5-kwin/files/patch-src_utils_ramfile.cpp new file mode 100644 index 000000000000..4de0b5f5fa4a --- /dev/null +++ b/x11-wm/plasma5-kwin/files/patch-src_utils_ramfile.cpp @@ -0,0 +1,68 @@ +FreeBSD < 13 lacks https://cgit.freebsd.org/src/commit/?id=af755d3e4859 + +src/utils/ramfile.cpp:57:117: error: use of undeclared identifier 'errno' + qCWarning(KWIN_CORE).nospace() << name << ": Failed to remove temporary file from filesystem: " << strerror(errno); + ^ +src/utils/ramfile.cpp:80:17: error: use of undeclared identifier 'F_SEAL_SHRINK' + int seals = F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_SEAL; + ^ +src/utils/ramfile.cpp:80:33: error: use of undeclared identifier 'F_SEAL_GROW' + int seals = F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_SEAL; + ^ +src/utils/ramfile.cpp:80:47: error: use of undeclared identifier 'F_SEAL_SEAL' + int seals = F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_SEAL; + ^ +src/utils/ramfile.cpp:82:18: error: use of undeclared identifier 'F_SEAL_WRITE' + seals |= F_SEAL_WRITE; + ^ +src/utils/ramfile.cpp:85:21: error: use of undeclared identifier 'F_ADD_SEALS' + if (fcntl(fd(), F_ADD_SEALS, seals) != 0) { + ^ +src/utils/ramfile.cpp:139:35: error: use of undeclared identifier 'F_GET_SEALS' + const int seals = fcntl(fd(), F_GET_SEALS); + ^ +src/utils/ramfile.cpp:141:21: error: use of undeclared identifier 'F_SEAL_WRITE' + if (seals & F_SEAL_WRITE) { + ^ + +--- src/utils/ramfile.cpp.orig 2023-01-03 18:08:37 UTC ++++ src/utils/ramfile.cpp +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + #include + + namespace KWin +@@ -77,6 +78,7 @@ RamFile::RamFile(const char *name, const void *inData, + m_tmp->unmap(data); + #endif + ++#ifdef F_SEAL_SEAL + int seals = F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_SEAL; + if (flags.testFlag(RamFile::Flag::SealWrite)) { + seals |= F_SEAL_WRITE; +@@ -85,6 +87,7 @@ RamFile::RamFile(const char *name, const void *inData, + if (fcntl(fd(), F_ADD_SEALS, seals) != 0) { + qCDebug(KWIN_CORE).nospace() << name << ": Failed to seal RamFile: " << strerror(errno); + } ++#endif + + guard.dismiss(); + } +@@ -136,12 +139,14 @@ RamFile::Flags RamFile::effectiveFlags() const + { + Flags flags = {}; + ++#ifdef F_SEAL_SEAL + const int seals = fcntl(fd(), F_GET_SEALS); + if (seals > 0) { + if (seals & F_SEAL_WRITE) { + flags.setFlag(Flag::SealWrite); + } + } ++#endif + + return flags; + }