Bump $pkgrel: fix xsdconvert compilation errors

https://gitlab.eclipse.org/eclipse/titan/titan.core/-/merge_requests/431

3 files changed, 59 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aac74ed5801d..1950be50a5b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = eclipse-titan
 	pkgdesc = A free and open source (FOSS) compiler both for TTCN-3 and for ASN.1
 	pkgver = 10.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://projects.eclipse.org/projects/tools.titan
 	arch = i686
 	arch = x86_64
@@ -20,8 +20,10 @@ pkgbase = eclipse-titan
 	options = !buildflags
 	options = !makeflags
 	source = https://gitlab.eclipse.org/eclipse/titan/titan.core/-/archive/10.0.0/titan.core-10.0.0.tar.gz
+	source = 0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
 	source = eclipse-titan.profile
 	sha256sums = 09433cffeb64aba1a97331ab5d73aa5e9c03455815310440b89e23eb15c20711
+	sha256sums = e7f0c46fe6398dfd0fa96cf0f67f9e0f429e147750bd84fbbb6a5058bce0c37d
 	sha256sums = ac28aeffaa7931d2bf1945778b088d6764e566fc04aa307d1bc3d2fb95f558cd
 
 pkgname = eclipse-titan
diff --git a/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch b/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
new file mode 100644
index 000000000000..4e17eda79dee
--- /dev/null
+++ b/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
@@ -0,0 +1,51 @@
+From 9d0675181ffce9f938bf77a53ab4186415011e41 Mon Sep 17 00:00:00 2001
+From: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
+Date: Wed, 8 May 2024 15:44:21 +0200
+Subject: [PATCH] xsdconvert: xmlGetLastError(): fix invalid pointer conversion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes the following errors observed with libxml2 v2.12.6:
+
+XMLParser.cc: In static member function ‘static void XMLParser::warningHandler(void*, const char*, ...)’:
+XMLParser.cc:193:38: error: invalid conversion from ‘const xmlError*’ {aka ‘const _xmlError*’} to ‘xmlErrorPtr’ {aka ‘_xmlError*’} [-fpermissive]
+  193 |   xmlErrorPtr error = xmlGetLastError();
+      |                       ~~~~~~~~~~~~~~~^~
+      |                                      |
+      |                                      const xmlError* {aka const _xmlError*}
+XMLParser.cc: In static member function ‘static void XMLParser::errorHandler(void*, const char*, ...)’:
+XMLParser.cc:213:38: error: invalid conversion from ‘const xmlError*’ {aka ‘const _xmlError*’} to ‘xmlErrorPtr’ {aka ‘_xmlError*’} [-fpermissive]
+  213 |   xmlErrorPtr error = xmlGetLastError();
+      |                       ~~~~~~~~~~~~~~~^~
+      |                                      |
+      |                                      const xmlError* {aka const _xmlError*}
+---
+ xsdconvert/XMLParser.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xsdconvert/XMLParser.cc b/xsdconvert/XMLParser.cc
+index 567a8027f..6d1c416cb 100644
+--- a/xsdconvert/XMLParser.cc
++++ b/xsdconvert/XMLParser.cc
+@@ -190,7 +190,7 @@ void XMLParser::warningHandler(void *, const char *, ...) {
+     return;
+   }
+ 
+-  xmlErrorPtr error = xmlGetLastError();
++  const xmlError *error = xmlGetLastError();
+ 
+   if (error->file == NULL) {
+     fprintf(stderr,
+@@ -210,7 +210,7 @@ void XMLParser::warningHandler(void *, const char *, ...) {
+ }
+ 
+ void XMLParser::errorHandler(void *, const char *, ...) {
+-  xmlErrorPtr error = xmlGetLastError();
++  const xmlError *error = xmlGetLastError();
+ 
+   if (error->code == XML_SCHEMAP_SRC_RESOLVE) {
+     return;
+-- 
+2.45.0
+
diff --git a/PKGBUILD b/PKGBUILD
index bcc16d197c58..d8aff32d904c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=eclipse-titan
 _pkgname=titan.core
 pkgver=10.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A free and open source (FOSS) compiler both for TTCN-3 and for ASN.1"
 arch=('i686' 'x86_64')
 url="https://projects.eclipse.org/projects/tools.titan"
@@ -26,8 +26,10 @@ depends=(
 )
 conflicts=('titan-git')
 source=("https://gitlab.eclipse.org/eclipse/titan/${_pkgname}/-/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
+        0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
         eclipse-titan.profile)
 sha256sums=('09433cffeb64aba1a97331ab5d73aa5e9c03455815310440b89e23eb15c20711'
+            'e7f0c46fe6398dfd0fa96cf0f67f9e0f429e147750bd84fbbb6a5058bce0c37d'
             'ac28aeffaa7931d2bf1945778b088d6764e566fc04aa307d1bc3d2fb95f558cd')
 
 # Currently we cannot build even old versions due to broken dependencies in
@@ -41,6 +43,8 @@ prepare() {
     cd "${srcdir}/${_pkgname}-${pkgver}"
     echo "TTCN3_DIR := /usr/ttcn3" >> Makefile.personal
     echo "JDKDIR := /usr/lib/jvm/$(archlinux-java get)" >> Makefile.personal
+    # fix compilation errors
+    patch -p1 < "${srcdir}/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch"
 }
 
 build() {