Sun Sep 5 20:32:03 2021 UTC ()
qt5-qtwebengine: fix build on NetBSD in pbulk environment

/usr/sbin is not in default path, so paxctl was not found.


(wiz)
diff -r1.3 -r1.4 pkgsrc/x11/qt5-qtwebengine/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtwebengine/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_BUILD.gn
cvs diff -r1.3 -r1.4 pkgsrc/x11/qt5-qtwebengine/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebengine/Makefile 2021/08/31 13:16:39 1.3
+++ pkgsrc/x11/qt5-qtwebengine/Makefile 2021/09/05 20:32:03 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2021/08/31 13:16:39 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2021/09/05 20:32:03 wiz Exp $
2 2
3DISTNAME= qtwebengine-everywhere-src-${QTVERSION} 3DISTNAME= qtwebengine-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtwebengine-${QTVERSION} 4PKGNAME= qt5-qtwebengine-${QTVERSION}
5PKGREVISION= 2 5PKGREVISION= 2
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
@@ -52,27 +52,27 @@ pre-configure: @@ -52,27 +52,27 @@ pre-configure:
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 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 "../../mk/bsd.prefs.mk" 68.include "../../mk/bsd.prefs.mk"
69 69
70.include "../../audio/alsa-lib/buildlink3.mk" 70.include "../../audio/alsa-lib/buildlink3.mk"
71.include "../../audio/pulseaudio/buildlink3.mk" 71.include "../../audio/pulseaudio/buildlink3.mk"
72.include "../../audio/libopus/buildlink3.mk" 72.include "../../audio/libopus/buildlink3.mk"
73.include "../../devel/glib2/buildlink3.mk" 73.include "../../devel/glib2/buildlink3.mk"
74.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 74.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
75.include "../../devel/libexecinfo/buildlink3.mk" 75.include "../../devel/libexecinfo/buildlink3.mk"
76.endif 76.endif
77.include "../../devel/libevent/buildlink3.mk" 77.include "../../devel/libevent/buildlink3.mk"
78.include "../../devel/nss/buildlink3.mk" 78.include "../../devel/nss/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtwebengine/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebengine/distinfo 2021/08/03 21:04:34 1.1
+++ pkgsrc/x11/qt5-qtwebengine/distinfo 2021/09/05 20:32:03 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.1 2021/08/03 21:04:34 markd Exp $ 1$NetBSD: distinfo,v 1.2 2021/09/05 20:32:03 wiz Exp $
2 2
3SHA1 (qtwebengine-everywhere-src-5.15.2.tar.xz) = fc633cf15998a89229446b778085f59191e27b0f 3SHA1 (qtwebengine-everywhere-src-5.15.2.tar.xz) = fc633cf15998a89229446b778085f59191e27b0f
4RMD160 (qtwebengine-everywhere-src-5.15.2.tar.xz) = 69b1c3d700e825a645757180e07df0ab8b8c301d 4RMD160 (qtwebengine-everywhere-src-5.15.2.tar.xz) = 69b1c3d700e825a645757180e07df0ab8b8c301d
5SHA512 (qtwebengine-everywhere-src-5.15.2.tar.xz) = de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756 5SHA512 (qtwebengine-everywhere-src-5.15.2.tar.xz) = de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
6Size (qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544 bytes 6Size (qtwebengine-everywhere-src-5.15.2.tar.xz) = 280142544 bytes
7SHA1 (patch-mkspecs_features_functions.prf) = e9c7a9c348cc7b9d09232f4b03f0a8282e9bfeb5 7SHA1 (patch-mkspecs_features_functions.prf) = e9c7a9c348cc7b9d09232f4b03f0a8282e9bfeb5
8SHA1 (patch-src_3rdparty_chromium_BUILD.gn) = ce0ed6d3db0f0cb41988e62ede81cc893ef2a93d 8SHA1 (patch-src_3rdparty_chromium_BUILD.gn) = ce0ed6d3db0f0cb41988e62ede81cc893ef2a93d
9SHA1 (patch-src_3rdparty_chromium_base_BUILD.gn) = bb199d0016a2e3ebb3a3df254f1c5e4a06eda8fc 9SHA1 (patch-src_3rdparty_chromium_base_BUILD.gn) = bb199d0016a2e3ebb3a3df254f1c5e4a06eda8fc
10SHA1 (patch-src_3rdparty_chromium_base_allocator_BUILD.gn) = 16b0a8581ee9aa8ae427bb1ac0fe2f6e946ed5ec 10SHA1 (patch-src_3rdparty_chromium_base_allocator_BUILD.gn) = 16b0a8581ee9aa8ae427bb1ac0fe2f6e946ed5ec
11SHA1 (patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc) = be5903733f20b659a62c70fc0acf7292966e1ae5 11SHA1 (patch-src_3rdparty_chromium_base_allocator_allocator__shim__unittest.cc) = be5903733f20b659a62c70fc0acf7292966e1ae5
12SHA1 (patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h) = cfc7ddfb3b893709f5e0305e8d955f75858716d4 12SHA1 (patch-src_3rdparty_chromium_base_allocator_partition__allocator_page__allocator__internals__posix.h) = cfc7ddfb3b893709f5e0305e8d955f75858716d4
13SHA1 (patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__unittest.cc) = 1e9ba188c765644bc18c29f88d4af612931193f8 13SHA1 (patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc__unittest.cc) = 1e9ba188c765644bc18c29f88d4af612931193f8
14SHA1 (patch-src_3rdparty_chromium_base_base__paths__posix.cc) = 1a27b2331a48506e5197366ac14943ca77a363b3 14SHA1 (patch-src_3rdparty_chromium_base_base__paths__posix.cc) = 1a27b2331a48506e5197366ac14943ca77a363b3
@@ -799,27 +799,27 @@ SHA1 (patch-src_3rdparty_chromium_ui_vie @@ -799,27 +799,27 @@ SHA1 (patch-src_3rdparty_chromium_ui_vie
799SHA1 (patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc) = aa9ea4ce127506616e894fd7590ab139394c6707 799SHA1 (patch-src_3rdparty_chromium_ui_views_examples_widget__example.cc) = aa9ea4ce127506616e894fd7590ab139394c6707
800SHA1 (patch-src_3rdparty_chromium_ui_views_selection__controller.cc) = d4af1ef108691f1cacbed17e90f27706693009c5 800SHA1 (patch-src_3rdparty_chromium_ui_views_selection__controller.cc) = d4af1ef108691f1cacbed17e90f27706693009c5
801SHA1 (patch-src_3rdparty_chromium_ui_views_style_platform__style.cc) = 5b66f5e67e3844f1161adf6592e7a662cd2564ec 801SHA1 (patch-src_3rdparty_chromium_ui_views_style_platform__style.cc) = 5b66f5e67e3844f1161adf6592e7a662cd2564ec
802SHA1 (patch-src_3rdparty_chromium_ui_views_views__delegate.cc) = 24a515e37db3b5ddf486ca8c542e6a621c5a45dc 802SHA1 (patch-src_3rdparty_chromium_ui_views_views__delegate.cc) = 24a515e37db3b5ddf486ca8c542e6a621c5a45dc
803SHA1 (patch-src_3rdparty_chromium_ui_views_views__delegate.h) = 78afe809b561f7e86e3d09fd9aa49d1bef6ac3d2 803SHA1 (patch-src_3rdparty_chromium_ui_views_views__delegate.h) = 78afe809b561f7e86e3d09fd9aa49d1bef6ac3d2
804SHA1 (patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc) = 651059a587315d3b34c23daf1fac75a595203a0a 804SHA1 (patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc) = 651059a587315d3b34c23daf1fac75a595203a0a
805SHA1 (patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc) = 1464a12a7078d9d7f8a3b7151d32ea12eeb0b02c 805SHA1 (patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc) = 1464a12a7078d9d7f8a3b7151d32ea12eeb0b02c
806SHA1 (patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc) = a055c00d4c50b5b8c46161e9f5ea11f3b23afab0 806SHA1 (patch-src_3rdparty_chromium_ui_views_window_custom__frame__view.cc) = a055c00d4c50b5b8c46161e9f5ea11f3b23afab0
807SHA1 (patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc) = 928037cdc490f2b907d55539d944fddbb93eaac4 807SHA1 (patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc) = 928037cdc490f2b907d55539d944fddbb93eaac4
808SHA1 (patch-src_3rdparty_chromium_ui_views_window_frame__background.cc) = 0a780b0186396fb0c4ddbb149737f1f43c90af0e 808SHA1 (patch-src_3rdparty_chromium_ui_views_window_frame__background.cc) = 0a780b0186396fb0c4ddbb149737f1f43c90af0e
809SHA1 (patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js) = 37278073ceabf117dfecf10d18fd51d54cb90cbf 809SHA1 (patch-src_3rdparty_chromium_ui_webui_resources_js_cr.js) = 37278073ceabf117dfecf10d18fd51d54cb90cbf
810SHA1 (patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js) = bd956152e8c9aabeb5f8f64ca3f29d7ec5d10e7b 810SHA1 (patch-src_3rdparty_chromium_ui_webui_resources_js_icon.js) = bd956152e8c9aabeb5f8f64ca3f29d7ec5d10e7b
811SHA1 (patch-src_3rdparty_chromium_ui_webui_webui__features.gni) = c8ce066c2075e27524913c414e740dffb74d34e7 811SHA1 (patch-src_3rdparty_chromium_ui_webui_webui__features.gni) = c8ce066c2075e27524913c414e740dffb74d34e7
812SHA1 (patch-src_3rdparty_chromium_v8_BUILD.gn) = 34688616a2dc8e2548a9ca53e36ab17fcb79834e 812SHA1 (patch-src_3rdparty_chromium_v8_BUILD.gn) = 4163421e85e03bd96ef9ee34926ccf5e38b3ef1e
813SHA1 (patch-src_3rdparty_chromium_v8_gni_v8.gni) = 944c7c8e2363b07aa0242a2e748cc381cc2bc216 813SHA1 (patch-src_3rdparty_chromium_v8_gni_v8.gni) = 944c7c8e2363b07aa0242a2e748cc381cc2bc216
814SHA1 (patch-src_3rdparty_chromium_v8_src_api_api.cc) = d563a6b50e5dff265d5a4b1b516de02e7149cab6 814SHA1 (patch-src_3rdparty_chromium_v8_src_api_api.cc) = d563a6b50e5dff265d5a4b1b516de02e7149cab6
815SHA1 (patch-src_3rdparty_chromium_v8_src_base_cpu.cc) = f6ec99bba983bb93e8515478f64681440ffbda1e 815SHA1 (patch-src_3rdparty_chromium_v8_src_base_cpu.cc) = f6ec99bba983bb93e8515478f64681440ffbda1e
816SHA1 (patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc) = 7e587fac8a26a975b33a93aa09ccf9af82afabb7 816SHA1 (patch-src_3rdparty_chromium_v8_src_base_platform_platform-posix.cc) = 7e587fac8a26a975b33a93aa09ccf9af82afabb7
817SHA1 (patch-src_3rdparty_chromium_v8_src_objects_js-list-format.cc) = 077357c9113ff9267ecc96ec5b65b66b4b5b6083 817SHA1 (patch-src_3rdparty_chromium_v8_src_objects_js-list-format.cc) = 077357c9113ff9267ecc96ec5b65b66b4b5b6083
818SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc) = 568877d1ebcaaee5782527f232a6fcc7f096066a 818SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc) = 568877d1ebcaaee5782527f232a6fcc7f096066a
819SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h) = a64ca7574cca4cb804e0ca24dd3454507d3d556d 819SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h) = a64ca7574cca4cb804e0ca24dd3454507d3d556d
820SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h) = d0b72fff980d5072d2221dd31b2e95526cd33875 820SHA1 (patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h) = d0b72fff980d5072d2221dd31b2e95526cd33875
821SHA1 (patch-src_3rdparty_chromium_v8_tools_run-paxctl.py) = af4832a81cfeef6e4259bc72d21774ebe7ac3fed 821SHA1 (patch-src_3rdparty_chromium_v8_tools_run-paxctl.py) = af4832a81cfeef6e4259bc72d21774ebe7ac3fed
822SHA1 (patch-src_3rdparty_chromium_weblayer_BUILD.gn) = 5e4be39bed0a2b590e9d894c1ee600f7baaaead3 822SHA1 (patch-src_3rdparty_chromium_weblayer_BUILD.gn) = 5e4be39bed0a2b590e9d894c1ee600f7baaaead3
823SHA1 (patch-src_3rdparty_chromium_weblayer_app_content__main__delegate__impl.cc) = 1b4fee00fef11ced079b08c5c9e94e741caac6e3 823SHA1 (patch-src_3rdparty_chromium_weblayer_app_content__main__delegate__impl.cc) = 1b4fee00fef11ced079b08c5c9e94e741caac6e3
824SHA1 (patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc) = 4b149c46e00b908cdbfb011e33304a728941717d 824SHA1 (patch-src_3rdparty_chromium_weblayer_browser_browser__main__parts__impl.cc) = 4b149c46e00b908cdbfb011e33304a728941717d
825SHA1 (patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc) = 7070059da3f67fff23b910b43bca9d11dba45c08 825SHA1 (patch-src_3rdparty_chromium_weblayer_browser_content__browser__client__impl.cc) = 7070059da3f67fff23b910b43bca9d11dba45c08
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_BUILD.gn (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_BUILD.gn 2021/08/03 21:04:36 1.1
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_v8_BUILD.gn 2021/09/05 20:32:03 1.2
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: patch-src_3rdparty_chromium_v8_BUILD.gn,v 1.1 2021/08/03 21:04:36 markd Exp $ 1$NetBSD: patch-src_3rdparty_chromium_v8_BUILD.gn,v 1.2 2021/09/05 20:32:03 wiz Exp $
2 2
3--- src/3rdparty/chromium/v8/BUILD.gn.orig 2020-11-07 01:22:36.000000000 +0000 3--- src/3rdparty/chromium/v8/BUILD.gn.orig 2020-11-07 01:22:36.000000000 +0000
4+++ src/3rdparty/chromium/v8/BUILD.gn 4+++ src/3rdparty/chromium/v8/BUILD.gn
5@@ -1333,6 +1333,23 @@ action("generate_bytecode_builtins_list" 5@@ -1333,6 +1333,23 @@ action("generate_bytecode_builtins_list"
6 ] 6 ]
7 } 7 }
8  8
9+action("run_paxctl_mksnapshot") { 9+action("run_paxctl_mksnapshot") {
10+ deps = [ ":mksnapshot($v8_snapshot_toolchain)" ] 10+ deps = [ ":mksnapshot($v8_snapshot_toolchain)" ]
11+ 11+
12+ script = "tools/run-paxctl.py" 12+ script = "tools/run-paxctl.py"
13+ stamp = "$target_gen_dir/paxctl_stamp" 13+ stamp = "$target_gen_dir/paxctl_stamp"
14+ outputs = [ stamp ] 14+ outputs = [ stamp ]
15+ 15+
16+ sources = [] 16+ sources = []
17+ data = [] 17+ data = []
18+ 18+
19+ args = [ 19+ args = [
20+ rebase_path(stamp, root_build_dir), "paxctl", "+m", "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", 20+ rebase_path(stamp, root_build_dir), "/usr/sbin/paxctl", "+m", "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
21+ "root_out_dir") + "/mksnapshot", 21+ "root_out_dir") + "/mksnapshot",
22+ root_build_dir), 22+ root_build_dir),
23+ ] 23+ ]
24+} 24+}
25+ 25+
26 # Template to generate different V8 snapshots based on different runtime flags. 26 # Template to generate different V8 snapshots based on different runtime flags.
27 # Can be invoked with run_mksnapshot(<name>). The target will resolve to 27 # Can be invoked with run_mksnapshot(<name>). The target will resolve to
28 # run_mksnapshot_<name>. If <name> is "default", no file suffixes will be used. 28 # run_mksnapshot_<name>. If <name> is "default", no file suffixes will be used.
29@@ -1353,7 +1370,7 @@ template("run_mksnapshot") { 29@@ -1353,7 +1370,7 @@ template("run_mksnapshot") {
30 action("run_mksnapshot_" + name) { 30 action("run_mksnapshot_" + name) {
31 visibility = [ ":*" ] # Only targets in this file can depend on this. 31 visibility = [ ":*" ] # Only targets in this file can depend on this.
32  32
33- deps = [ ":mksnapshot($v8_snapshot_toolchain)" ] 33- deps = [ ":mksnapshot($v8_snapshot_toolchain)" ]