CVS commit: pkgsrc/x11/qt5-qtwebengine

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Aug 13 18:35:14 UTC 2023

Modified Files:
        pkgsrc/x11/qt5-qtwebengine: distinfo
        pkgsrc/x11/qt5-qtwebengine/patches:
            patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h

Log Message:
qt5-qtwebengine: fix build on NetBSD with mempcpy


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/qt5-qtwebengine/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h

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

Modified files:

Index: pkgsrc/x11/qt5-qtwebengine/distinfo
diff -u pkgsrc/x11/qt5-qtwebengine/distinfo:1.14 pkgsrc/x11/qt5-qtwebengine/distinfo:1.15
--- pkgsrc/x11/qt5-qtwebengine/distinfo:1.14    Sat Jun 10 18:23:06 2023
+++ pkgsrc/x11/qt5-qtwebengine/distinfo Sun Aug 13 18:35:14 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2023/06/10 18:23:06 adam Exp $
+$NetBSD: distinfo,v 1.15 2023/08/13 18:35:14 wiz Exp $
 
 BLAKE2s (qtwebengine-everywhere-opensource-src-5.15.10.tar.xz) = 0801cd15847412f2316affd5a7cd4efe628abfb0e3251a9069184dde1b42ad5b
 SHA512 (qtwebengine-everywhere-opensource-src-5.15.10.tar.xz) = e35d0cab5f66a148420206616b3517e62b8320572beac53650096c0db58db8b4942d52a3abf4f0d6db1450de27befeb92f8b632c1277b0939464c1407a904b1b
@@ -668,7 +668,7 @@ SHA1 (patch-src_3rdparty_chromium_third_
 SHA1 (patch-src_3rdparty_chromium_third__party_libxslt_BUILD.gn) = 9b5a87f7997f57cfefcf32e06b0ba171cc915821
 SHA1 (patch-src_3rdparty_chromium_third__party_libyuv_BUILD.gn) = 896dba64969d78f6f968bdbfc0bef2f42893f999
 SHA1 (patch-src_3rdparty_chromium_third__party_minigbm_BUILD.gn) = 6eebeab3d0fa62752c54435658610149e406ef18
-SHA1 (patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h) = 91d1feb0cc92cb3d8cdc398256418e64afd01562
+SHA1 (patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h) = 16f3a397c6d4309b1838ae4723737d44ebefd94d
 SHA1 (patch-src_3rdparty_chromium_third__party_node_node.py) = 84be875a18bf81b721c9b723c44ef0cbec2afb8c
 SHA1 (patch-src_3rdparty_chromium_third__party_openh264_BUILD.gn) = e53826fcc69d735c2e8425db24e2358c208d8ded
 SHA1 (patch-src_3rdparty_chromium_third__party_openscreen_src_build_config_BUILD.gn) = a54b14e264a6b82b9e68c1c0a746b53bbd4db8da

Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h
diff -u pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h:1.2 
pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h:1.3
--- pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h:1.2  Mon Apr 18 11:18:19 2022
+++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h      Sun Aug 13 18:35:14 2023
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h,v 1.2 2022/04/18 11:18:19 adam Exp $
+$NetBSD: patch-src_3rdparty_chromium_third__party_nasm_config_config-linux.h,v 1.3 2023/08/13 18:35:14 wiz Exp $
 
---- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig  2021-02-19 16:41:59.000000000 +0000
+--- src/3rdparty/chromium/third_party/nasm/config/config-linux.h.orig  2022-04-06 13:32:17.000000000 +0000
 +++ src/3rdparty/chromium/third_party/nasm/config/config-linux.h
 @@ -139,7 +139,7 @@
  #define HAVE_ACCESS 1
@@ -11,11 +11,16 @@ $NetBSD: patch-src_3rdparty_chromium_thi
  
  /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
  /* #undef HAVE_CPU_TO_LE16 */
-@@ -336,7 +336,7 @@
+@@ -336,7 +336,13 @@
  #define HAVE_MEMORY_H 1
  
  /* Define to 1 if you have the `mempcpy' function. */
--#define HAVE_MEMPCPY 1
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Version__ >= 1099000700
+ #define HAVE_MEMPCPY 1
++#endif
++#endif
 +/* #undef HAVE_MEMPCPY */
  
  /* Define to 1 if you have a working `mmap' system call. */