This pulls in an upstream commit to fix the build with llvm 19 due to
missing parentheses.

/tmp/pobj/TeXmacs-2.1.2/TeXmacs-2.1.2-src/src/Kernel/Containers/hashtree.cpp:97:14:
 error: no member named 'contains' in 'hashtree<K, V>'
   97 |   if (*this->contains (key)) return *this->children (key);
      |        ~~~~  ^
/tmp/pobj/TeXmacs-2.1.2/TeXmacs-2.1.2-src/src/Kernel/Containers/hashtree.cpp:97:44:
 error: no member named 'children' in 'hashtree<K, V>'
   97 |   if (*this->contains (key)) return *this->children (key);
      |                                      ~~~~  ^

Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/TeXmacs/Makefile,v
diff -u -p -r1.34 Makefile
--- Makefile    21 Dec 2024 11:37:54 -0000      1.34
+++ Makefile    29 Jan 2025 15:32:01 -0000
@@ -2,7 +2,7 @@ COMMENT=        wysiwyw (what you see is what y
 
 DISTNAME=      TeXmacs-2.1.2-src
 PKGNAME=       ${DISTNAME:S/-src//}
-REVISION=      4
+REVISION=      5
 
 CATEGORIES=    editors print x11
 
Index: patches/patch-src_Kernel_Containers_hashtree_cpp
===================================================================
RCS file: patches/patch-src_Kernel_Containers_hashtree_cpp
diff -N patches/patch-src_Kernel_Containers_hashtree_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Kernel_Containers_hashtree_cpp    29 Jan 2025 15:32:01 
-0000
@@ -0,0 +1,14 @@
+https://svn.savannah.gnu.org/viewvc/texmacs/trunk/src/src/Kernel/Containers/hashtree.cpp?r1=2717&r2=14566&diff_format=u
+
+Index: src/Kernel/Containers/hashtree.cpp
+--- src/Kernel/Containers/hashtree.cpp.orig
++++ src/Kernel/Containers/hashtree.cpp
+@@ -94,7 +94,7 @@ hashtree<K,V>::operator-> (void) {
+ 
+ template<class K, class V> inline hashtree<K,V> 
+ hashtree<K,V>::operator[] (K key) {
+-  if (*this->contains (key)) return *this->children (key);
++  if ((*this)->contains (key)) return (*this)->children (key);
+   else FAILED ("read-access to non-existent node requested");
+ }
+   

Reply via email to