CVS commit: pkgsrc/x11/qt5-qtlocation

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun 16 11:33:39 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtlocation: distinfo
Added Files:
        pkgsrc/x11/qt5-qtlocation/patches:
            patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h
            patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp
            patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp
            patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp

Log Message:
qr5-qtlocation: fix build with gcc14


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/qt5-qtlocation/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h \
    pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp \
    pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp \
    pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp

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-qtlocation/distinfo
diff -u pkgsrc/x11/qt5-qtlocation/distinfo:1.36 pkgsrc/x11/qt5-qtlocation/distinfo:1.37
--- pkgsrc/x11/qt5-qtlocation/distinfo:1.36     Sat May 25 14:21:20 2024
+++ pkgsrc/x11/qt5-qtlocation/distinfo  Sun Jun 16 11:33:39 2024
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.36 2024/05/25 14:21:20 adam Exp $
+$NetBSD: distinfo,v 1.37 2024/06/16 11:33:39 markd Exp $
 
 BLAKE2s (qtlocation-everywhere-opensource-src-5.15.14.tar.xz) = 41bf9f385dd83727c2bd0d0a90fed9493789ca2796c3f073789862c0c369c214
 SHA512 (qtlocation-everywhere-opensource-src-5.15.14.tar.xz) = 5a6271d61bb9ede80b8483e784d8cc15170cf3f7b019472b2362c742e1e1fd52d811c2132b751574dacee6f7274b81e6049b8a3dc934ba7612c0aef6643062dd
 Size (qtlocation-everywhere-opensource-src-5.15.14.tar.xz) = 6549056 bytes
+SHA1 (patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h) = a9383d626c823a16f0ea974aaec7fdfc5e8f9e46
+SHA1 (patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp) = 501cb3d4cc473b505c3917d7a969f07baeb303dc
+SHA1 (patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp) = 2ce7af6f41492693ef3c0f35a89f54580973d4d2
+SHA1 (patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp) = 5a4e2c9be884f1dd7f7d09cd565b1bbb3ac905d4
 SHA1 (patch-src_location_configure.json) = 75d7280e8ff3cbc8b03dc776e2c4da5cdeac183e

Added files:

Index: pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h
diff -u /dev/null pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h:1.1
--- /dev/null   Sun Jun 16 11:33:39 2024
+++ pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h     Sun Jun 16 11:33:39 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_3rdparty_mapbox-gl-native_deps_rapidjson_1.1.0_include_rapidjson_document.h,v 1.1 2024/06/16 11:33:39 markd Exp $
+
+https://github.com/Tencent/rapidjson/commit/3b2441b8.patch
+fix build with gcc14
+
+--- src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h.orig       2024-05-08 05:14:45.000000000 +0000
++++ src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h
+@@ -316,8 +316,6 @@ struct GenericStringRef {
+ 
+     GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+ 
+-    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
+-
+     //! implicit conversion to plain CharType pointer
+     operator const Ch *() const { return s; }
+ 
Index: pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp
diff -u /dev/null pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp:1.1
--- /dev/null   Sun Jun 16 11:33:39 2024
+++ pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp        Sun Jun 16 11:33:39 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_geometry.hpp,v 1.1 2024/06/16 11:33:39 markd Exp $
+
+https://bugreports.qt.io/browse/QTBUG-122589
+fix build with gcc14
+
+--- src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp.orig  2024-05-08 05:14:45.000000000 +0000
++++ src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp
+@@ -3,6 +3,7 @@
+ #include <mapbox/geometry/geometry.hpp>
+ #include <mapbox/geometry/point_arithmetic.hpp>
+ #include <mapbox/geometry/for_each_point.hpp>
++#include <cstdint>
+ 
+ namespace mbgl {
+ 
Index: pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp
diff -u /dev/null pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp:1.1
--- /dev/null   Sun Jun 16 11:33:39 2024
+++ pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp  Sun Jun 16 11:33:39 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_mapbox-gl-native_include_mbgl_util_string.hpp,v 1.1 2024/06/16 11:33:39 markd Exp $
+
+https://bugreports.qt.io/browse/QTBUG-122589
+fix build with gcc14
+
+--- src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp.orig    2024-05-08 05:14:45.000000000 +0000
++++ src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp
+@@ -4,6 +4,7 @@
+ #include <string>
+ #include <cassert>
+ #include <cstdlib>
++#include <cstdint>
+ #include <exception>
+ 
+ // Polyfill needed by Qt when building for Android with GCC
Index: pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp
diff -u /dev/null pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp:1.1
--- /dev/null   Sun Jun 16 11:33:40 2024
+++ pkgsrc/x11/qt5-qtlocation/patches/patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp Sun Jun 16 11:33:39 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_3rdparty_mapbox-gl-native_src_mbgl_gl_stencil__mode.hpp,v 1.1 2024/06/16 11:33:39 markd Exp $
+
+
+https://bugreports.qt.io/browse/QTBUG-122589
+fix build with gcc14
+
+--- src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp.orig    2024-05-08 05:14:45.000000000 +0000
++++ src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp
+@@ -1,6 +1,7 @@
+ #pragma once
+ 
+ #include <mbgl/util/variant.hpp>
++#include <cstdint>
+ 
+ namespace mbgl {
+ namespace gl {