Date: Tue, 21 Feb 2023 19:55:36 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 79378074b008 - main - x11-wm/plasma5-kwin: add dependency on misc/hwdata Message-ID: <202302211955.31LJtaYX024544@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=79378074b008c14f5b962ca39bbd8bc7cecac655 commit 79378074b008c14f5b962ca39bbd8bc7cecac655 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2023-02-21 19:45:16 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> 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()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302211955.31LJtaYX024544>