Updated swipl devel to 9.1.5

[JanWielemaker]

Also addresses SWI-Prolog/docker-swipl#32 (armhf/armel builds) by dropping affected plugin on these platforms.

[github-actions]

Diff for e77ad36:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 844b135..304a266 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,10 +1,10 @@
 Maintainers: Jan Wielemaker <[email protected]> (@JanWielemaker), Dave Curylo <[email protected]> (@ninjarobot)
 Architectures: amd64, arm32v7, arm64v8
 GitRepo: https://github.com/SWI-Prolog/docker-swipl.git
-GitCommit: 366d912cf8e9c8ba3783a76acf57380d7a281883
+GitCommit: 67b156afb3feb8e0a4537bfb7671662f12526156
 
-Tags: latest, 9.1.4
-Directory: 9.1.4/bullseye
+Tags: latest, 9.1.5
+Directory: 9.1.5/bullseye
 
 Tags: stable, 9.0.4
 Directory: 9.0.4/bullseye
diff --git a/_bashbrew-list b/_bashbrew-list
index fa34c15..72cada4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,4 +1,4 @@
 swipl:9.0.4
-swipl:9.1.4
+swipl:9.1.5
 swipl:latest
 swipl:stable
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 54039a0..717383b 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-swipl:9.1.4
+swipl:9.1.5
 swipl:9.0.4
diff --git a/swipl_9.1.4/Dockerfile b/swipl_9.1.5/Dockerfile
similarity index 91%
rename from swipl_9.1.4/Dockerfile
rename to swipl_9.1.5/Dockerfile
index d2d5d40..8920a6f 100644
--- a/swipl_9.1.4/Dockerfile
+++ b/swipl_9.1.5/Dockerfile
@@ -25,8 +25,8 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 ENV LANG C.UTF-8
 RUN set -eux; \
-    SWIPL_VER=9.1.4; \
-    SWIPL_CHECKSUM=ce064399da14611cf044fa22c32a0a5ec1df0ec5ffe0e21ae70518c39364f4f8; \
+    SWIPL_VER=9.1.5; \
+    SWIPL_CHECKSUM=f58c8f2b4427d7fa874121afa9649bbbad6089735111ca7530d6d46948c09ce7; \
     BUILD_DEPS='make cmake ninja-build gcc g++ wget git autoconf libarchive-dev libgmp-dev libossp-uuid-dev libpcre2-dev libreadline-dev libedit-dev libssl-dev zlib1g-dev libdb-dev unixodbc-dev libsqlite3-dev libserd-dev libraptor2-dev libgeos++-dev libspatialindex-dev libgoogle-perftools-dev libgeos-dev libspatialindex-dev'; \
     dpkgArch="$(dpkg --print-architecture)"; \
     apt-get update; apt-get install -y --no-install-recommends $BUILD_DEPS; rm -rf /var/lib/apt/lists/*; \
@@ -61,7 +61,7 @@ RUN set -eux; \
         find "$1" -name '*.so' -exec strip {} +; \
     }; \
     dpkgArch="$(dpkg --print-architecture)"; \
-    install_addin space https://github.com/JanWielemaker/space.git 8ab230a67e2babb3e81fac043512a7de7f4593bf; \
+    [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin space https://github.com/JanWielemaker/space.git 8ab230a67e2babb3e81fac043512a7de7f4593bf; \
     install_addin prosqlite https://github.com/nicos-angelopoulos/prosqlite.git cfd2f68709f5fb61833c0e2f8e9c6546e542009c; \
     [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rocksdb https://github.com/JanWielemaker/rocksdb.git 634c31e928e2a5100fbcfd26c21cd32eeb6bf369; \
     [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] ||  install_addin hdt https://github.com/JanWielemaker/hdt.git e0a0eff87fc3318434cb493690c570e1255ed30e; \

Relevant Maintainers:

• swipl: @JanWielemaker @ninjarobot

[tianon]

This is good and has the intended effect, but then it fails on prosqlite (and then rserve_client) 😅 😂 ❤️ 😭

I've grabbed the swipl:latest source Dockerfile locally and built it on arm32v7 and can confirm the following diff fixes the build (although I don't know what the end resulting effect excluding all these addons is - maybe it's fine?):

diff --git a/9.1.5/bullseye/Dockerfile b/9.1.5/bullseye/Dockerfile
index 8920a6f..b2fb8c8 100644
--- a/9.1.5/bullseye/Dockerfile
+++ b/9.1.5/bullseye/Dockerfile
@@ -62,9 +62,9 @@ RUN set -eux; \
     }; \
     dpkgArch="$(dpkg --print-architecture)"; \
     [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin space https://github.com/JanWielemaker/space.git 8ab230a67e2babb3e81fac043512a7de7f4593bf; \
-    install_addin prosqlite https://github.com/nicos-angelopoulos/prosqlite.git cfd2f68709f5fb61833c0e2f8e9c6546e542009c; \
+    [ "$dpkgArch" = 'armhf' ] || install_addin prosqlite https://github.com/nicos-angelopoulos/prosqlite.git cfd2f68709f5fb61833c0e2f8e9c6546e542009c; \
     [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] || install_addin rocksdb https://github.com/JanWielemaker/rocksdb.git 634c31e928e2a5100fbcfd26c21cd32eeb6bf369; \
     [ "$dpkgArch" = 'armhf' ] || [ "$dpkgArch" = 'armel' ] ||  install_addin hdt https://github.com/JanWielemaker/hdt.git e0a0eff87fc3318434cb493690c570e1255ed30e; \
-    install_addin rserve_client https://github.com/JanWielemaker/rserve_client.git 48a46160bc2768182be757ab179c26935db41de7; \
+    [ "$dpkgArch" = 'armhf' ] || install_addin rserve_client https://github.com/JanWielemaker/rserve_client.git 48a46160bc2768182be757ab179c26935db41de7; \
     apt-get purge -y --auto-remove $BUILD_DEPS
 CMD ["swipl"]

Did you want to also apply similar fixes to the swipl:stable build?

[JanWielemaker]

Thanks. The rserve_client is also C++, so suffering from the same issues. I thought the prosqlite was plain C. Do you have the errors?

If this is resolved I'll probably release 9.0.5 (stable) and include the patches there.

[tianon]

Oh, I misread the output -- as I pasted it here to share it with you, I noticed the prosqlite install actually does succeed and it's just rserve_client that's failing. 🤦

Sorry for the false alarm on that half!

[JanWielemaker]

Thanks. So if all goes right there will be armhf docker images for 9.1.5 shortly and I should do the same update for the next 9.0 release.