From nobody Tue Feb 21 19:55:36 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 4PLqlX6cgYz3t8kZ; Tue, 21 Feb 2023 19:55:36 +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 4PLqlX3FjRz44Nx; Tue, 21 Feb 2023 19:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677009336; 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=phHsXMxLD9xxm/u6BONgliqg2rTijkgj/kOYWMKkXFM=; b=XxPDqP+qKyK7cyFRWf1Wgx/RvqSUOy7Cy93pLMAvlTaM+6akK2CG1WJ0COErkyYWGthoBq YXYRaBSwWoXcCLgkVcYoZIJhFRP9wccibNjNyJNA4JRp50LcVubtShLRC6YbWDarrVofrs bmad1g7jsKQ0DWZFrBQwgKzlOfj4gd3ZRXepcHiy/JL0+Q5cGn9D2RawwjtN7A3380WxeJ +4LhdLpgjM/zAEcSDK3ipiTRKx4Ytm1Q3Lw1ICwfmaOipaaFBb+hkvKf75UIGvOK0Tz2xs uKZ90SASpe/0nb8+hXj6QNejBD+07e113pxEXafQcbyfYYnv/qMk1PNfXpbq6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677009336; 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=phHsXMxLD9xxm/u6BONgliqg2rTijkgj/kOYWMKkXFM=; b=tkQCwMreEywNxfETAkIQ4oTD5bXEIoLVj2cJQk97/xh6gsoM8SSgddC8MMKfNENLNG/Pbv rhQchPR6l+klgllTK4GbnXYbY6OPOCgjpzcA/YrL2hwu2g9+foOvw9G/WjbK7F55wEM//z Swjn4zfu8zEVm/CU17lwoak7cClYMrcGlzB1jpbBNGZyIX5qw9XKIHkUKScpwiD/eNKylL FHjpEKOkEaD3EbWOXUU1Sj+EDxVxZCn9WYsNpY+urvl0PPm2KsodbY23MAXuXhvpefMCy/ JGPBw3tCVhDJRQ+DBZM1MfADbuh8RB0rUMRpiMOZwgfkGLCcmwIQlIaqSGmtwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677009336; a=rsa-sha256; cv=none; b=kLKVIZkCR/JC1iTZEo+CFIWoF/PwUPu3phwq4UOs8hngCN+QdTHoUJmvtcEEaIPNG1q0Za RR34nYS0Lb1xmS6QWGeOqtqXq6OQacM0qo0lQEYppKAOXN/uveT4J5lzj4/MMA30aYlpk8 oDmb5zxZT8Lm1CSy35njC3R50usV7hbHBjCz71Lsau5sLjqXpqKqpMAaDUO9g4KuCiNgCa bXjYegvD/mIEVe98Uf1bMdNfstoqVDMkpIBMR5XS7qkanCzyvZ4ghuj43VqNt2gqMRV24Y eiqAMKrYYuVpH3DoqVd959BGNLWEP6l/pXpRTqKsENCUDrvr2jxWosZzJ20eyw== 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 4PLqlX1whmzYGs; Tue, 21 Feb 2023 19:55:36 +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 31LJtab2024545; Tue, 21 Feb 2023 19:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LJtaYX024544; Tue, 21 Feb 2023 19:55:36 GMT (envelope-from git) Date: Tue, 21 Feb 2023 19:55:36 GMT Message-Id: <202302211955.31LJtaYX024544@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 79378074b008 - main - x11-wm/plasma5-kwin: add dependency on misc/hwdata 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79378074b008c14f5b962ca39bbd8bc7cecac655 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=79378074b008c14f5b962ca39bbd8bc7cecac655 commit 79378074b008c14f5b962ca39bbd8bc7cecac655 Author: Tobias C. Berner AuthorDate: 2023-02-21 19:45:16 +0000 Commit: Tobias C. Berner CommitDate: 2023-02-21 19:55:04 +0000 x11-wm/plasma5-kwin: add dependency on misc/hwdata * Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names For this, fix the patch to Findhwdata.cmake to actually find it. --- x11-wm/plasma5-kwin/Makefile | 7 +++++-- x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake | 8 ++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index 33e6ba85af55..4489cd099df9 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -26,8 +27,10 @@ LIB_DEPENDS= libXcursor.so:x11/libXcursor \ libxcvt.so:x11/libxcvt BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ xwayland-devel>0:x11-servers/xwayland-devel \ - wayland-protocols>0:graphics/wayland-protocols -RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel + wayland-protocols>0:graphics/wayland-protocols \ + hwdata>0:misc/hwdata +RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel \ + hwdata>0:misc/hwdata CONFLICTS_INSTALL= kwinft # bin/kwin_wayland diff --git a/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake b/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake index 264e396e122d..1e09fac7a31c 100644 --- a/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake +++ b/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake @@ -1,13 +1,13 @@ ---- cmake/modules/Findhwdata.cmake.orig 2021-02-14 10:31:01 UTC +--- cmake/modules/Findhwdata.cmake.orig 2023-02-21 19:51:03 UTC +++ cmake/modules/Findhwdata.cmake -@@ -10,8 +10,8 @@ +@@ -10,8 +10,8 @@ if (UNIX AND NOT APPLE) # SPDX-License-Identifier: BSD-3-Clause if (UNIX AND NOT APPLE) - find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS /usr/share ENV XDG_DATA_DIRS) - find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS /usr/share) -+ find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share /usr/share ENV XDG_DATA_DIRS) -+ find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share /usr/share) ++ find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share/hwdata /usr/share ENV XDG_DATA_DIRS) ++ find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share/hwdata /usr/share) if (NOT hwdata_DIR OR NOT hwdata_PNPIDS_FILE) set(hwdata_FOUND FALSE) else()