Wed Apr 13 21:56:10 2022 UTC ()
qt5-qtwebengine: add missing libXtst dependency

Fixes build with modular x.org


(wiz)
diff -r1.14 -r1.15 pkgsrc/x11/qt5-qtwebengine/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/x11/qt5-qtwebengine/Makefile (switch to unified diff)

--- pkgsrc/x11/qt5-qtwebengine/Makefile 2022/03/28 10:59:50 1.14
+++ pkgsrc/x11/qt5-qtwebengine/Makefile 2022/04/13 21:56:10 1.15
@@ -1,113 +1,114 @@ @@ -1,113 +1,114 @@
1# $NetBSD: Makefile,v 1.14 2022/03/28 10:59:50 tnn Exp $ 1# $NetBSD: Makefile,v 1.15 2022/04/13 21:56:10 wiz Exp $
2 2
3DISTNAME= qtwebengine-everywhere-src-${QTVERSION} 3DISTNAME= qtwebengine-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtwebengine-${QTVERSION} 4PKGNAME= qt5-qtwebengine-${QTVERSION}
5PKGREVISION= 9 5PKGREVISION= 9
6COMMENT= Chromium-based web engine for Qt5 6COMMENT= Chromium-based web engine for Qt5
7 7
8MAKE_ENV+= QTDIR=${QTDIR} 8MAKE_ENV+= QTDIR=${QTDIR}
9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 9INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
10INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
11 11
12.include "../../x11/qt5-qtbase/Makefile.common" 12.include "../../x11/qt5-qtbase/Makefile.common"
13 13
14BUILD_TARGET= first 14BUILD_TARGET= first
15QMAKE_ARGS+= -- -webengine-icu 15QMAKE_ARGS+= -- -webengine-icu
16 16
17USE_TOOLS+= bison bash 17USE_TOOLS+= bison bash
18TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 18TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
19TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf 19TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
20#TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 20#TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
21#TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 21#TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
22TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 22TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
23TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm 23TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
24BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs 24BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
25 25
26#JPEG_ACCEPTED= libjpeg-turbo 26#JPEG_ACCEPTED= libjpeg-turbo
27 27
28BUILDLINK_TRANSFORM.NetBSD+= rm:-fgnu-inline-asm 28BUILDLINK_TRANSFORM.NetBSD+= rm:-fgnu-inline-asm
29 29
30MAKE_ENV+= NINJAJOBS="-j ${MAKE_JOBS:U1}" 30MAKE_ENV+= NINJAJOBS="-j ${MAKE_JOBS:U1}"
31 31
32#UNLIMIT_RESOURCES+= cputime 32#UNLIMIT_RESOURCES+= cputime
33 33
34CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/sqlite/src/configure 34CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/sqlite/src/configure
35CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/protobuf/post_process_dist.sh 35CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/protobuf/post_process_dist.sh
36CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/ffmpeg/configure 36CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/ffmpeg/configure
37CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal 37CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal
38CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal.in 38CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/third_party/xdg-utils/scripts/xdg-terminal.in
39CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/v8/tools/run-llprof.sh 39CHECK_PORTABILITY_SKIP+= src/3rdparty/chromium/v8/tools/run-llprof.sh
40 40
41# These libraries are used from the system and the build infrastructure 41# These libraries are used from the system and the build infrastructure
42# removes them from the bundled third_party directory and replaces them 42# removes them from the bundled third_party directory and replaces them
43# with hooks to use them from the system. 43# with hooks to use them from the system.
44GN_SYSTEM_LIBS= libevent libxslt yasm 44GN_SYSTEM_LIBS= libevent libxslt yasm
45CHROMESRC= ${WRKSRC}/src/3rdparty/chromium 45CHROMESRC= ${WRKSRC}/src/3rdparty/chromium
46 46
47pre-configure: 47pre-configure:
48 cp ${FILESDIR}/netbsd.pri ${WRKSRC}/src/core/config/ 48 cp ${FILESDIR}/netbsd.pri ${WRKSRC}/src/core/config/
49 cp ${FILESDIR}/openbsd.pri ${WRKSRC}/src/core/config/ 49 cp ${FILESDIR}/openbsd.pri ${WRKSRC}/src/core/config/
50 cp ${FILESDIR}/netbsd.pri ${WRKSRC}/src/buildtools/config/ 50 cp ${FILESDIR}/netbsd.pri ${WRKSRC}/src/buildtools/config/
51 cp ${FILESDIR}/openbsd.pri ${WRKSRC}/src/buildtools/config/ 51 cp ${FILESDIR}/openbsd.pri ${WRKSRC}/src/buildtools/config/
52 mkdir -p ${CHROMESRC}/media/audio/sndio ${CHROMESRC}/media/audio/openbsd 52 mkdir -p ${CHROMESRC}/media/audio/sndio ${CHROMESRC}/media/audio/openbsd
53 cp ${FILESDIR}/sndio_* ${CHROMESRC}/media/audio/sndio 53 cp ${FILESDIR}/sndio_* ${CHROMESRC}/media/audio/sndio
54 cp ${FILESDIR}/hid_* ${CHROMESRC}/services/device/hid 54 cp ${FILESDIR}/hid_* ${CHROMESRC}/services/device/hid
55 cp ${FILESDIR}/audio_manager_openbsd.* ${CHROMESRC}/media/audio/openbsd 55 cp ${FILESDIR}/audio_manager_openbsd.* ${CHROMESRC}/media/audio/openbsd
56 cd ${WRKSRC} && env -i ${MAKE_ENV} ${CHROMESRC}/build/linux/unbundle/replace_gn_files.py \ 56 cd ${WRKSRC} && env -i ${MAKE_ENV} ${CHROMESRC}/build/linux/unbundle/replace_gn_files.py \
57 --system-libraries ${GN_SYSTEM_LIBS} 57 --system-libraries ${GN_SYSTEM_LIBS}
58 58
59post-install: 59post-install:
60.for i in Qt5Pdf.pc Qt5PdfWidgets.pc Qt5WebEngine.pc Qt5WebEngineCore.pc Qt5WebEngineWidgets.pc 60.for i in Qt5Pdf.pc Qt5PdfWidgets.pc Qt5WebEngine.pc Qt5WebEngineCore.pc Qt5WebEngineWidgets.pc
61 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 61 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
62 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 62 ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
63.endfor 63.endfor
64.if ${OPSYS} == "NetBSD" 64.if ${OPSYS} == "NetBSD"
65 /usr/sbin/paxctl +m ${DESTDIR}${PREFIX}/qt5/libexec/QtWebEngineProcess 65 /usr/sbin/paxctl +m ${DESTDIR}${PREFIX}/qt5/libexec/QtWebEngineProcess
66.endif 66.endif
67 67
68.include "options.mk" 68.include "options.mk"
69 69
70.include "../../mk/bsd.prefs.mk" 70.include "../../mk/bsd.prefs.mk"
71 71
72.include "../../audio/alsa-lib/buildlink3.mk" 72.include "../../audio/alsa-lib/buildlink3.mk"
73.include "../../audio/libopus/buildlink3.mk" 73.include "../../audio/libopus/buildlink3.mk"
74.include "../../devel/glib2/buildlink3.mk" 74.include "../../devel/glib2/buildlink3.mk"
75.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 75.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
76.include "../../devel/libexecinfo/buildlink3.mk" 76.include "../../devel/libexecinfo/buildlink3.mk"
77.endif 77.endif
78.include "../../devel/libevent/buildlink3.mk" 78.include "../../devel/libevent/buildlink3.mk"
79.include "../../devel/nss/buildlink3.mk" 79.include "../../devel/nss/buildlink3.mk"
80# chromium insists on using its own protobuf 80# chromium insists on using its own protobuf
81# so don't include here as versions must match 81# so don't include here as versions must match
82#.include "../../devel/protobuf/buildlink3.mk" 82#.include "../../devel/protobuf/buildlink3.mk"
83.include "../../devel/re2/buildlink3.mk" 83.include "../../devel/re2/buildlink3.mk"
84.include "../../devel/snappy/buildlink3.mk" 84.include "../../devel/snappy/buildlink3.mk"
85#.include "../../mk/jpeg.buildlink3.mk" 85#.include "../../mk/jpeg.buildlink3.mk"
86.include "../../graphics/lcms2/buildlink3.mk" 86.include "../../graphics/lcms2/buildlink3.mk"
87.include "../../graphics/libwebp/buildlink3.mk" 87.include "../../graphics/libwebp/buildlink3.mk"
88.include "../../multimedia/ffmpeg4/buildlink3.mk" 88.include "../../multimedia/ffmpeg4/buildlink3.mk"
89.include "../../multimedia/libvpx/buildlink3.mk" 89.include "../../multimedia/libvpx/buildlink3.mk"
90PYTHON_VERSIONS_ACCEPTED= 27 90PYTHON_VERSIONS_ACCEPTED= 27
91PYTHON_FOR_BUILD_ONLY= tool 91PYTHON_FOR_BUILD_ONLY= tool
92.include "../../lang/python/tool.mk" 92.include "../../lang/python/tool.mk"
93.include "../../print/libcups/buildlink3.mk" 93.include "../../print/libcups/buildlink3.mk"
94.include "../../print/poppler-cpp/buildlink3.mk" 94.include "../../print/poppler-cpp/buildlink3.mk"
95.include "../../sysutils/pciutils/buildlink3.mk" 95.include "../../sysutils/pciutils/buildlink3.mk"
96.include "../../sysutils/pciutils/libname.mk" 96.include "../../sysutils/pciutils/libname.mk"
97# Use -lpciutils instead of -lpci for pkgsrc. 97# Use -lpciutils instead of -lpci for pkgsrc.
98BUILDLINK_TRANSFORM+= l:pci:${PCIUTILS_LIBNAME} 98BUILDLINK_TRANSFORM+= l:pci:${PCIUTILS_LIBNAME}
99.include "../../textproc/icu/buildlink3.mk" 99.include "../../textproc/icu/buildlink3.mk"
100.include "../../textproc/jsoncpp/buildlink3.mk" 100.include "../../textproc/jsoncpp/buildlink3.mk"
101# needs libxml2 built with icu option, which is not default in pkgsrc 101# needs libxml2 built with icu option, which is not default in pkgsrc
102#.include "../../textproc/libxml2/buildlink3.mk" 102#.include "../../textproc/libxml2/buildlink3.mk"
103.include "../../textproc/libxslt/buildlink3.mk" 103.include "../../textproc/libxslt/buildlink3.mk"
104.if ${OPSYS} != "Darwin" 104.if ${OPSYS} != "Darwin"
105.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 105.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
106.include "../../x11/libXcomposite/buildlink3.mk" 106.include "../../x11/libXcomposite/buildlink3.mk"
 107.include "../../x11/libXtst/buildlink3.mk"
107.endif 108.endif
108.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 109.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
109.include "../../x11/qt5-qtlocation/buildlink3.mk" 110.include "../../x11/qt5-qtlocation/buildlink3.mk"
110.include "../../x11/qt5-qttools/buildlink3.mk" 111.include "../../x11/qt5-qttools/buildlink3.mk"
111.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 112.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
112.include "../../mk/atomic64.mk" 113.include "../../mk/atomic64.mk"
113.include "../../mk/bsd.pkg.mk" 114.include "../../mk/bsd.pkg.mk"