kinfocenter: adapt for pciutils 3.8.0

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri May 13 18:22:18 2022 +0200
Changeset:	31a67ec2cd44a730a4d8c98c5d3f5f6ef588c1ca

Modified Files:
	kinfocenter/Makefile
	kinfocenter/distinfo
	kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake
Removed Files:
	kinfocenter/patches/patch-Modules_pci_kpci.cpp

Log Message:
kinfocenter: adapt for pciutils 3.8.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31a67ec2cd44a730a4d8c98c5d3f5f6ef588c1ca

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kinfocenter/Makefile                               |  1 +
 kinfocenter/distinfo                               |  3 +--
 kinfocenter/patches/patch-Modules_pci_kpci.cpp     | 15 ---------------
 kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake |  3 +--
 4 files changed, 3 insertions(+), 19 deletions(-)

diffs:
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index cbd99a6a88..d2b9d031bb 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -23,6 +23,7 @@ CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/menus/kinfocenter.menu \
 		${PKG_SYSCONFDIR}/xdg/menus/kinfocenter.menu
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+BUILDLINK_API_DEPENDS.pciutils+=	pciutils>=3.8
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../devel/kcmutils/buildlink3.mk"
 .include "../../devel/kio/buildlink3.mk"
diff --git a/kinfocenter/distinfo b/kinfocenter/distinfo
index 2ae7f5624b..aa78524272 100644
--- a/kinfocenter/distinfo
+++ b/kinfocenter/distinfo
@@ -7,5 +7,4 @@ SHA1 (patch-Modules_about-distro_src_Module.cpp) = 6fce0f9ce9681deb7bf4f1017104d
 SHA1 (patch-Modules_base_info__netbsd.cpp) = a762f3043ec6a7a1bab1afdb68581d474ef7f9aa
 SHA1 (patch-Modules_memory_base.h) = 6db972a12e7ba9d0cc59a483e2565042907be340
 SHA1 (patch-Modules_nics_nic.cpp) = d759de60f074d8e35d759cef3426c2f84ad9768e
-SHA1 (patch-Modules_pci_kpci.cpp) = 1ce051e907d0809e3ac680049dc63305d681ec6a
-SHA1 (patch-cmake_FindPCIUTILS.cmake) = c5f648d5eb25e9c4e6ca9fa259476ed70bad0203
+SHA1 (patch-cmake_FindPCIUTILS.cmake) = adf08e8d69e9f34e3f5367485d03625a17b00c29
diff --git a/kinfocenter/patches/patch-Modules_pci_kpci.cpp b/kinfocenter/patches/patch-Modules_pci_kpci.cpp
deleted file mode 100644
index df71a2922d..0000000000
--- a/kinfocenter/patches/patch-Modules_pci_kpci.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-pkgsrc calls it pciutils
-
---- Modules/pci/kpci.cpp.orig	2020-05-05 14:39:33.000000000 +0000
-+++ Modules/pci/kpci.cpp
-@@ -13,7 +13,7 @@
- 
- //extern "C" is needed to proper linking with libpci
- extern "C" {
--#include <pci/pci.h>
-+#include <pciutils/pci.h>
- }
- #include <unistd.h>
- #include <sys/types.h> //getuid
diff --git a/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake b/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake
index 37ad089cfb..1a148bc3f3 100644
--- a/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake
+++ b/kinfocenter/patches/patch-cmake_FindPCIUTILS.cmake
@@ -8,8 +8,7 @@ pkgsrc calls this pciutils
     set(PCIUTILS_FIND_QUIETLY TRUE)
  endif(PCIUTILS_INCLUDE_DIR AND PCIUTILS_LIBRARIES)
  
--FIND_PATH(PCIUTILS_INCLUDE_DIR pci/pci.h)
-+FIND_PATH(PCIUTILS_INCLUDE_DIR pciutils/pci.h)
+ FIND_PATH(PCIUTILS_INCLUDE_DIR pci/pci.h)
  
 -FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pci)
 +FIND_LIBRARY(PCIUTILS_LIBRARY NAMES pciutils)