Bump $pkgver: 10.1.0 -> 10.1.1

4 files changed, 7 insertions, 176 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39759b4af599..af7a36e8d9b7 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.1.0
-	pkgrel = 2
+	pkgver = 10.1.1
+	pkgrel = 1
 	url = https://projects.eclipse.org/projects/tools.titan
 	arch = i686
 	arch = x86_64
@@ -19,13 +19,9 @@ pkgbase = eclipse-titan
 	options = !lto
 	options = !buildflags
 	options = !makeflags
-	source = https://gitlab.eclipse.org/eclipse/titan/titan.core/-/archive/10.1.0/titan.core-10.1.0.tar.gz
-	source = 0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
-	source = 0001-Fixes-for-selective-code-splitting-feature-issue-695.patch
+	source = https://gitlab.eclipse.org/eclipse/titan/titan.core/-/archive/10.1.1/titan.core-10.1.1.tar.gz
 	source = eclipse-titan.profile
-	sha256sums = 68e36e23a64cabca780650f82331fa4ef0e00f1e75ccf02fc82f97d46c18ff1b
-	sha256sums = e7f0c46fe6398dfd0fa96cf0f67f9e0f429e147750bd84fbbb6a5058bce0c37d
-	sha256sums = 58f3c4d08496fc756eaa7561233ee92f389505e6751201b2065e85bcc070954c
+	sha256sums = 373b7d14fcdd053a03eee49ee5cff827f67fa58f58d54929fe0977d7ca105a6e
 	sha256sums = ac28aeffaa7931d2bf1945778b088d6764e566fc04aa307d1bc3d2fb95f558cd
 
 pkgname = eclipse-titan
diff --git a/0001-Fixes-for-selective-code-splitting-feature-issue-695.patch b/0001-Fixes-for-selective-code-splitting-feature-issue-695.patch
deleted file mode 100644
index 6a7270348581..000000000000
--- a/0001-Fixes-for-selective-code-splitting-feature-issue-695.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 4b13e0898762649188a35c5bc0a5ea861299b1ae Mon Sep 17 00:00:00 2001
-From: Adam Knapp <adam.knapp@ericsson.com>
-Date: Fri, 31 May 2024 10:13:23 +0200
-Subject: [PATCH] Fixes for selective code splitting feature (issue #695 #726)
-
-Signed-off-by: Adam Knapp <adam.knapp@ericsson.com>
----
- compiler2/AST.cc     |  4 ++--
- compiler2/main.cc    | 20 +++++++++++++++++---
- compiler2/makefile.c | 18 +++++++++++++++---
- 3 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/compiler2/AST.cc b/compiler2/AST.cc
-index 41faea3b7..a47e509c0 100644
---- a/compiler2/AST.cc
-+++ b/compiler2/AST.cc
-@@ -1338,8 +1338,8 @@ namespace Common {
- 
-   Module::Module(moduletype_t p_mt, Identifier *p_modid)
-   : Scope(), moduletype(p_mt), modid(p_modid),
--    imp_checked(false), gen_code(false), has_checksum(false),
--    visible_mods(), module_checksum(),
-+    imp_checked(false), gen_code(false), need_code_split(false),
-+    has_checksum(false), visible_mods(), module_checksum(),
-     bs_literals(), bp_literals(), hs_literals(), hp_literals(), os_literals(),
-     op_literals(), cs_literals(), us_literals(), pp_literals(), mp_literals(),
-     oid_literals(), tmp_id_count(0),
-diff --git a/compiler2/main.cc b/compiler2/main.cc
-index 7f14d7922..cd2fae291 100644
---- a/compiler2/main.cc
-+++ b/compiler2/main.cc
-@@ -659,8 +659,12 @@ int main(int argc, char *argv[])
-   }
- 
-   if (!ttcn2json && !asn1_enc_only) {
-+    const char optstring[] = "aA:bBcC:dDeEfFghHiIjJ:kK:lLMnNo:OpP:qQ:rRsStT:uU:vV:wxXyYz:0-";
-+    const char optWArgs[] = "ACJKoPQTUVz";
-+    const int numOptWArgs = strlen(optWArgs);
-+
-     for ( ; ; ) {
--      int c = getopt(argc, argv, "aA:bBcC:dDeEfFghHiIjJ:kK:lLMnNo:OpP:qQ:rRsStT:uU:vV:wxXyYz:0-");
-+      int c = getopt(argc, argv, optstring);
-       if (c == -1) break;
-       switch (c) {
-       case 'U':
-@@ -670,8 +674,18 @@ int main(int argc, char *argv[])
-             "'type', or a positive number.", optarg);
-           errflag = true;
-         }
--        if (optind < argc && argv[optind][0] != '-') {
--          first_module_req_split = argv[optind];
-+        for (int i = optind; i < argc; i++) {
-+          if (argv[i][0] == '-') {
-+            if (strlen(argv[i]) > 1)
-+              for (int j = 0; j < numOptWArgs; j++)
-+                if (argv[i][1] == optWArgs[j]) {
-+                  i++;
-+                  break;
-+                }
-+            continue;
-+          }
-+          first_module_req_split = argv[i];
-+          break;
-         }
-         break;
-       case 'a':
-diff --git a/compiler2/makefile.c b/compiler2/makefile.c
-index c8c9f11c6..d41cb52d2 100644
---- a/compiler2/makefile.c
-+++ b/compiler2/makefile.c
-@@ -4897,8 +4897,12 @@ int main(int argc, char *argv[])
-     return EXIT_FAILURE;
-   }
- 
-+  const char optstring[] = "O:ab:c" C_flag "dDe:EfFgGhHiI:J:kK:o:lLmMnNpP:rRsSt:TU:vVwWXYz:Z";
-+  const char optWArgs[] = "ObeIJKoPtUz";
-+  const int numOptWArgs = strlen(optWArgs);
-+
-   for ( ; ; ) {
--    int c = getopt(argc, argv, "O:ab:c" C_flag "dDe:EfFgGhHiI:J:kK:o:lLmMnNpP:rRsSt:TU:vVwWXYz:Z");
-+    int c = getopt(argc, argv, optstring);
-     if (c == -1) break;
-     switch (c) {
-     case 'U':
-@@ -4926,8 +4930,16 @@ int main(int argc, char *argv[])
-         }
-       }
-       code_splitting_mode = n_slices == 1 ? "none" : optarg;
--      for (int i = optind; optind < argc; i++) {
--        if (argv[i][0] == '-') continue;
-+      for (int i = optind; i < argc; i++) {
-+        if (argv[i][0] == '-') {
-+          if (strlen(argv[i]) > 1)
-+            for (int j = 0; j < numOptWArgs; j++)
-+              if (argv[i][1] == optWArgs[j]) {
-+                i++;
-+                break;
-+              }
-+          continue;
-+        }
-         first_module_req_split = argv[i];
-         break;
-       }
--- 
-2.45.1
-
diff --git a/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch b/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
deleted file mode 100644
index 4e17eda79dee..000000000000
--- a/0001-xsdconvert-xmlGetLastError-fix-invalid-pointer-conv.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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 ed81f2ef94a1..9f77ef961ed7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=eclipse-titan
 _pkgname=titan.core
-pkgver=10.1.0
-pkgrel=2
+pkgver=10.1.1
+pkgrel=1
 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,12 +26,8 @@ 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
-        0001-Fixes-for-selective-code-splitting-feature-issue-695.patch
         eclipse-titan.profile)
-sha256sums=('68e36e23a64cabca780650f82331fa4ef0e00f1e75ccf02fc82f97d46c18ff1b'
-            'e7f0c46fe6398dfd0fa96cf0f67f9e0f429e147750bd84fbbb6a5058bce0c37d'
-            '58f3c4d08496fc756eaa7561233ee92f389505e6751201b2065e85bcc070954c'
+sha256sums=('373b7d14fcdd053a03eee49ee5cff827f67fa58f58d54929fe0977d7ca105a6e'
             'ac28aeffaa7931d2bf1945778b088d6764e566fc04aa307d1bc3d2fb95f558cd')
 
 # Currently we cannot build even old versions due to broken dependencies in
@@ -45,10 +41,6 @@ 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"
-    # https://gitlab.eclipse.org/eclipse/titan/titan.core/-/issues/726
-    patch -p1 < "${srcdir}/0001-Fixes-for-selective-code-splitting-feature-issue-695.patch"
 }
 
 build() {