pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt6-qtwebengine: fix build with gcc14



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Oct 31 10:39:01 2025 +0100
Changeset:	1e8bbf28c97ca08ae7ec94a206ccd8ddff0a908b

Modified Files:
	qt6-qtwebengine/distinfo
	qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp
Added Files:
	qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_graphics_cfgas__gegraphics.cpp

Log Message:
qt6-qtwebengine: fix build with gcc14

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1e8bbf28c97ca08ae7ec94a206ccd8ddff0a908b

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

diffstat:
 qt6-qtwebengine/distinfo                           |  3 ++-
 ..._third__party_pdfium_fxjs_fx__date__helpers.cpp | 20 +++++++++++++++++++-
 ..._pdfium_xfa_fgas_graphics_cfgas__gegraphics.cpp | 22 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diffs:
diff --git a/qt6-qtwebengine/distinfo b/qt6-qtwebengine/distinfo
index 4d71e8582d..4b9a9009a4 100644
--- a/qt6-qtwebengine/distinfo
+++ b/qt6-qtwebengine/distinfo
@@ -857,10 +857,11 @@ SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_core_fpdfapi_page_cpdf__ps
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_cfx__fontmapper.cpp) = 34b3da62c4f3bcd5ec38f5ab0b7a055f1027d766
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp) = 74c8421912763c0a66a3ec433c07a0aee51d2f72
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_fxjs_cjs__publicmethods.cpp) = 74fe28df9b443d508b9ec18236dfa1629a23f597
-SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp) = 696dde7bcffe347f72ff6b069c7fa08ce49b0668
+SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp) = 37a27c31187b80169d4ae0b5fd26a0d72f912797
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_fxjs_xfa_cfxjse__formcalc__context.cpp) = 2d1c414e9b56c331cd0c42c3ca7036682d5fb032
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_pdfium.gni) = 757c04aa30d76758153e282b6ca251a3b337ca1e
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_third__party_BUILD.gn) = cf77c0c4918da3ef1a61e58c0fd06414ee3e29a9
+SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_graphics_cfgas__gegraphics.cpp) = 84efe1a1b468451de9cc23e0b6c56bf72940e508
 SHA1 (patch-src_3rdparty_chromium_third__party_pdfium_xfa_fxfa_parser_cxfa__timezoneprovider.cpp) = 8117c2d7f3bc45c4ef0347ecf13309e9b3d8068e
 SHA1 (patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_build__config.h) = a6b07de8236bb7ffeaf64bc4a1eed93a830504ed
 SHA1 (patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_thread__utils.h) = 21bd61b286a0680efc1b60f15f05ce2f40a285a6
diff --git a/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp b/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp
index 27861c3fc0..166a83c566 100644
--- a/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp
+++ b/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_fxjs_fx__date__helpers.cpp
@@ -4,7 +4,7 @@ $NetBSD$
 * Based on OpenBSD's chromium patches, and
   pkgsrc's qt5-qtwebengine patches
 
---- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2024-12-17 17:58:49.000000000 +0000
+--- src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp.orig	2025-09-25 11:10:42.000000000 +0000
 +++ src/3rdparty/chromium/third_party/pdfium/fxjs/fx_date_helpers.cpp
 @@ -39,6 +39,11 @@ double GetLocalTZA() {
      return 0;
@@ -26,3 +26,21 @@ $NetBSD$
  }
  
  int GetDaylightSavingTA(double d) {
+@@ -264,7 +270,7 @@ double FX_MakeTime(int nHour, int nMin, 
+ }
+ 
+ double FX_MakeDate(double day, double time) {
+-  if (!isfinite(day) || !isfinite(time))
++  if (!std::isfinite(day) || !std::isfinite(time))
+     return nan("");
+ 
+   return day * 86400000 + time;
+@@ -543,7 +549,7 @@ ConversionStatus FX_ParseDateUsingFormat
+ 
+   dt = FX_MakeDate(FX_MakeDay(nYear, nMonth - 1, nDay),
+                    FX_MakeTime(nHour, nMin, nSec, 0));
+-  if (isnan(dt))
++  if (std::isnan(dt))
+     return ConversionStatus::kBadDate;
+ 
+   *result = dt;
diff --git a/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_graphics_cfgas__gegraphics.cpp b/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_graphics_cfgas__gegraphics.cpp
new file mode 100644
index 0000000000..31adcf6d6d
--- /dev/null
+++ b/qt6-qtwebengine/patches/patch-src_3rdparty_chromium_third__party_pdfium_xfa_fgas_graphics_cfgas__gegraphics.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/3rdparty/chromium/third_party/pdfium/xfa/fgas/graphics/cfgas_gegraphics.cpp.orig	2025-10-31 08:24:51.089364742 +0000
++++ src/3rdparty/chromium/third_party/pdfium/xfa/fgas/graphics/cfgas_gegraphics.cpp
+@@ -312,7 +312,7 @@ void CFGAS_GEGraphics::FillPathWithShadi
+             float x = static_cast<float>(column);
+             scale = (((x - start_x) * x_span) + ((y - start_y) * y_span)) /
+                     axis_len_square;
+-            if (isnan(scale) || scale < 0.0f) {
++            if (std::isnan(scale) || scale < 0.0f) {
+               if (!m_info.fillColor.GetShading()->IsExtendedBegin())
+                 continue;
+               scale = 0.0f;
+@@ -371,7 +371,7 @@ void CFGAS_GEGraphics::FillPathWithShadi
+               continue;
+             }
+           }
+-          if (isnan(s) || s < 0.0f) {
++          if (std::isnan(s) || s < 0.0f) {
+             if (!m_info.fillColor.GetShading()->IsExtendedBegin())
+               continue;
+             s = 0.0f;


Home | Main Index | Thread Index | Old Index