git: 4bac5b4aab40 - 2025Q3 - sysutils/plasma6-kinfocenter: use USB ids from misc/hwdata
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 19 Jul 2025 20:07:49 UTC
The branch 2025Q3 has been updated by makc:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4bac5b4aab40d9a80e2a24b7e71327ab26096a14
commit 4bac5b4aab40d9a80e2a24b7e71327ab26096a14
Author: Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2025-07-19 20:07:24 +0000
Commit: Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2025-07-19 20:07:24 +0000
sysutils/plasma6-kinfocenter: use USB ids from misc/hwdata
PR: 285230
Prompted by: arrowd@
(cherry picked from commit ca4295d2fc3a0ed19ab1234bc5ea33e60a107cec)
---
sysutils/plasma6-kinfocenter/Makefile | 6 +++++-
.../plasma6-kinfocenter/files/patch-kcms_usbview_usbdb.cpp | 11 -----------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/sysutils/plasma6-kinfocenter/Makefile b/sysutils/plasma6-kinfocenter/Makefile
index 7e092b56de17..05220ff570f4 100644
--- a/sysutils/plasma6-kinfocenter/Makefile
+++ b/sysutils/plasma6-kinfocenter/Makefile
@@ -1,6 +1,6 @@
PORTNAME= kinfocenter
DISTVERSION= ${KDE_PLASMA_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils kde kde-plasma
MAINTAINER= kde@FreeBSD.org
@@ -9,6 +9,7 @@ COMMENT= View information about your computer's hardware
BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
RUN_DEPENDS= clinfo:devel/clinfo \
glxinfo:graphics/mesa-demos \
+ hwdata>0:misc/hwdata \
lsblk:sysutils/lsblk \
lscpu:sysutils/lscpu \
pipewire:multimedia/pipewire \
@@ -31,6 +32,9 @@ USE_QT= base declarative
RUN_DEPENDS+= dmidecode:sysutils/dmidecode
.endif
+post-patch:
+ ${REINPLACE_CMD} '/usb.ids/s,/usr,${LOCALBASE},' ${WRKSRC}/kcms/usbview/usbdb.cpp
+
# install freebsd-logo and distrorc
post-install:
${MKDIR} ${STAGEDIR}/${DATADIR}/images
diff --git a/sysutils/plasma6-kinfocenter/files/patch-kcms_usbview_usbdb.cpp b/sysutils/plasma6-kinfocenter/files/patch-kcms_usbview_usbdb.cpp
deleted file mode 100644
index 52e4a362892d..000000000000
--- a/sysutils/plasma6-kinfocenter/files/patch-kcms_usbview_usbdb.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcms/usbview/usbdb.cpp.orig 2025-07-15 09:51:22 UTC
-+++ kcms/usbview/usbdb.cpp
-@@ -16,7 +16,7 @@ USBDB::USBDB()
- {
- QString db = QStringLiteral("/usr/share/hwdata/usb.ids"); /* on Fedora and Arch*/
- if (!QFile::exists(db)) {
-- db = QStringLiteral("/usr/share/misc/usb.ids"); /* on Gentoo */
-+ db = QStringLiteral("/usr/share/misc/usb_vendors"); /* on FreeBSD */
- }
- if (db.isEmpty())
- return;