git: 29209339c35d - 2024Q1 - www/{*chromium,iridium}: xmlError is only a const since version 2.12
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 09 Feb 2024 14:23:09 UTC
The branch 2024Q1 has been updated by rnagy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=29209339c35ddb4e9ec7a62acbd3cebaa6ad4a19
commit 29209339c35ddb4e9ec7a62acbd3cebaa6ad4a19
Author: Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2024-02-09 14:19:47 +0000
Commit: Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2024-02-09 14:23:04 +0000
www/{*chromium,iridium}: xmlError is only a const since version 2.12
the previous patches were checking if libxml is older than 2.11.6,
but that breaks builds with 2.11.7 as xmlError has been changed to
a const at 2.12
PR: 276901, 276902, 276903
Reported by: diizzy@
(cherry picked from commit 1e1b3d42f560254a9c6e533d20e1c081c184cf5b)
---
.../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +-
...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +-
.../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +-
...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +-
.../files/patch-third__party_blink_renderer_core_xml_xslt__processor.h | 2 +-
...tch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
index d2cf5dab1c60..c7f635ce4a7e 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
@@ -4,7 +4,7 @@
void reset();
-+#if (LIBXML_VERSION > 21106)
++#if (LIBXML_VERSION >= 21200)
static void ParseErrorFunc(void* user_data, const xmlError*);
+#else
+ static void ParseErrorFunc(void* user_data, xmlError*);
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
index 1f01a503d293..b87237b27ed9 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
@@ -4,7 +4,7 @@
// It would be nice to do something with this error message.
}
-+#if (LIBXML_VERSION > 21106)
++#if (LIBXML_VERSION >= 21200)
void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+#else
+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
index 2edb2287f6f0..a1a326e2f41e 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
@@ -4,7 +4,7 @@
void reset();
-+#if (LIBXML_VERSION > 21106)
++#if (LIBXML_VERSION >= 21200)
+ static void ParseErrorFunc(void* user_data, const xmlError*);
+#else
static void ParseErrorFunc(void* user_data, xmlError*);
diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
index 083d02b21347..d9539fd1c05c 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
@@ -4,7 +4,7 @@
// It would be nice to do something with this error message.
}
-+#if (LIBXML_VERSION > 21106)
++#if (LIBXML_VERSION >= 21200)
+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+#else
void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
index c3359d6b9be6..fe0402779151 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor.h
@@ -4,7 +4,7 @@
void reset();
-+#if (LIBXML_VERSION > 21106)
++#if (LIBXML_VERSION >= 21200)
static void ParseErrorFunc(void* user_data, const xmlError*);
+#else
+ static void ParseErrorFunc(void* user_data, xmlError*);
diff --git a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
index 5af5353c3fcc..e7186fa96e7c 100644
--- a/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
+++ b/www/ungoogled-chromium/files/patch-third__party_blink_renderer_core_xml_xslt__processor__libxslt.cc
@@ -4,7 +4,7 @@
// It would be nice to do something with this error message.
}
-+#if (LIBXML_VERSION > 21106)
++#if (LIBXML_VERSION >= 21200)
void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+#else
+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {