From nobody Fri Jul 18 12:07:58 2025 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 4bk7pl3wpJz62FFZ; Fri, 18 Jul 2025 12:07:59 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bk7pk6z5Hz3QQ6; Fri, 18 Jul 2025 12:07:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752840479; 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=q2apWC+JhGyVqhcloB79PpcrXFiRug0LkaxejQAqZ2Q=; b=Lh27TG0kd3fwaqzLNGTF89iaQq0fHMlAh6R6dp9Q9HE8mAPDMac9eWpkK274CCsty95zfo YiVFyAzxilVCavCgr9x90B9587gTggvvIVgsAAzPom8p+aFKorF4lkrJUUldVFMgNiYXxS yRd82ZPse+VSIpnDZhirym8wiPg5RSD/iEXHaKs54V/xPgaEjA2kq2pLB4D9Fl1T/pMX8X oMK8CqO54z0uYqW88BjjZX/Hfbfmeef8KjwQXQC2smdb2kTeLfAwXJwUFoO+WYFbx1is68 NoJHB5upA/80gQVwoPjitzYEH2NNyy7pSglvp6HqOvLcbrHzuwgP+jxDM7kCsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752840479; 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=q2apWC+JhGyVqhcloB79PpcrXFiRug0LkaxejQAqZ2Q=; b=RMaUrgEasOg15c68ivSgY0QHnWRZIeJo4qGcVWSl7AV0sEKGu17z7kY8OdRZlonOqBn72z cghgvVSwa9BjyrCO0T4gLmm0emExCSqCfPnefXvaOWb268pMcE8QiCeyk0F7pKjD1k4ao4 rGzsDCJdSO/o7K3/AGq/NzMOaMXnw31qo0Rwyj6htKx0uaNgu3Bz2Bqp5F+rOZwcYKwPld FE4Qk6/Hq2qS1jmI1sBk+xqkev8Qbeggri2B30SGvVX3LOb2HYpbU4xSRpLCz/pJP0H7ZC LYUUsH/KpZ8sEvQ+cEAwtB7TlTVKEV5fvcKkPi4rbBT4CNQbMywHfuUaQGBL3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752840479; a=rsa-sha256; cv=none; b=vjxxYrefeLZq7WcINomjosoJGhgKumU9TQKVPbqG6qkT5XOkZxYPqwZKH3aojIW71FC6Bt ASUvIIuuUsxEWx5NI28GPRnJhAWOaam5gKhZrMRuJQEt2qCTu7Rdmtb2x7Bonm2RcsdSFC GJigciV6i5NFbs52igg1Yv5zENAT+4FtSdUpkLk0ytVQsLfB+GzEIjRN79A4MZANU2Bwjl QA1/eVCh/ePzdN4Qbs+9vVZdjTUrTCRAzNGAxiAyIJsI1jRPYd9Yrxaq7rxGMTMufU85oz udgX/df7qGSOdg6eeGjxz9yYPw4hhXgfSEKKgMbio18SymqeUFUVQ/v/KScxJA== 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 4bk7pk6JTGzgbG; Fri, 18 Jul 2025 12:07:58 +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 56IC7wQL092723; Fri, 18 Jul 2025 12:07:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56IC7wbx092720; Fri, 18 Jul 2025 12:07:58 GMT (envelope-from git) Date: Fri, 18 Jul 2025 12:07:58 GMT Message-Id: <202507181207.56IC7wbx092720@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: ca4295d2fc3a - main - sysutils/plasma6-kinfocenter: use USB ids from 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca4295d2fc3a0ed19ab1234bc5ea33e60a107cec Auto-Submitted: auto-generated The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca4295d2fc3a0ed19ab1234bc5ea33e60a107cec commit ca4295d2fc3a0ed19ab1234bc5ea33e60a107cec Author: Max Brazhnikov AuthorDate: 2025-07-18 11:55:17 +0000 Commit: Max Brazhnikov CommitDate: 2025-07-18 12:07:17 +0000 sysutils/plasma6-kinfocenter: use USB ids from misc/hwdata PR: 285230 Prompted by: arrowd@ --- 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;