[pkgsrc/trunk]: pkgsrc/x11/qt5-qtwebengine qt5-qtwebengine: adapt for pciutil...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9926fc96cc59
branches:  trunk
changeset: 379265:9926fc96cc59
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri May 13 18:08:07 2022 +0000

description:
qt5-qtwebengine: adapt for pciutils 3.8

diffstat:

 x11/qt5-qtwebengine/Makefile                                                                                          |   5 ++-
 x11/qt5-qtwebengine/distinfo                                                                                          |   3 +-
 x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp |  15 ----------
 3 files changed, 4 insertions(+), 19 deletions(-)

diffs (58 lines):

diff -r be9cde8478af -r 9926fc96cc59 x11/qt5-qtwebengine/Makefile
--- a/x11/qt5-qtwebengine/Makefile      Fri May 13 17:51:10 2022 +0000
+++ b/x11/qt5-qtwebengine/Makefile      Fri May 13 18:08:07 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2022/05/04 21:05:45 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/13 18:08:07 wiz Exp $
 
 DISTNAME=      qtwebengine-everywhere-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtwebengine-${QTVERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       Chromium-based web engine for Qt5
 
 MAKE_ENV+=             QTDIR=${QTDIR}
@@ -99,6 +99,7 @@
 .include "../../lang/python/tool.mk"
 .include "../../print/libcups/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
+BUILDLINK_API_DEPENDS.pciutils+=       pciutils>=3.8
 .include "../../sysutils/pciutils/buildlink3.mk"
 .include "../../sysutils/pciutils/libname.mk"
 # Use -lpciutils instead of -lpci for pkgsrc.
diff -r be9cde8478af -r 9926fc96cc59 x11/qt5-qtwebengine/distinfo
--- a/x11/qt5-qtwebengine/distinfo      Fri May 13 17:51:10 2022 +0000
+++ b/x11/qt5-qtwebengine/distinfo      Fri May 13 18:08:07 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2022/04/18 11:18:18 adam Exp $
+$NetBSD: distinfo,v 1.6 2022/05/13 18:08:07 wiz Exp $
 
 BLAKE2s (qtwebengine-everywhere-opensource-src-5.15.3.tar.xz) = 3eea494991a48b3029627944eb1518860e69566d60440f8270bc9696231ce037
 SHA512 (qtwebengine-everywhere-opensource-src-5.15.3.tar.xz) = d4d10f2f95437042dfc67cc9826e8e27d390f986a1202f1bd5a765ea1b985e93158bde3068410f0a84b268de50c3e6fc9f67c4419224caa6b87b940d70d0869c
@@ -508,7 +508,6 @@
 SHA1 (patch-src_3rdparty_chromium_third__party_angle_gni_angle.gni) = 1c6627e7651d814d6e4c6859c30f8fcc40a61d4f
 SHA1 (patch-src_3rdparty_chromium_third__party_angle_src_compiler_translator_InfoSink.h) = 5455d2c6f4f063603735edda3c8b432d074235b4
 SHA1 (patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__internal.h) = f873dc1df4a386b742036db862f943f6a17ef2c6
-SHA1 (patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp) = 44cc4436bd0f981dccec3b530239962d9eb1dc13
 SHA1 (patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__linux.cpp) = dcd8c06bd337887ceffd3ab156188083ccc5ed83
 SHA1 (patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__x11.cpp) = 4e7c974e89e21e9376a5c8c852e5e356f59015f6
 SHA1 (patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp) = 6a6a3aeee60c980eb0f68754badcd564572bf598
diff -r be9cde8478af -r 9926fc96cc59 x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp
--- a/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp     Fri May 13 17:51:10 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_3rdparty_chromium_third__party_angle_src_gpu__info__util_SystemInfo__libpci.cpp,v 1.1 2021/08/03 21:04:35 markd Exp $
-
-* Use pci.h from pkgsrc pciutils.
-
---- src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp.orig       2020-07-15 19:01:32.000000000 +0000
-+++ src/3rdparty/chromium/third_party/angle/src/gpu_info_util/SystemInfo_libpci.cpp
-@@ -9,7 +9,7 @@
- #include "gpu_info_util/SystemInfo_internal.h"
- 
- #include <dlfcn.h>
--#include <pci/pci.h>
-+#include <pciutils/pci.h>
- #include <unistd.h>
- 
- #include "common/angleutils.h"