Skip to content

Commit 60a3cde

Browse files
committed
Merge branch 'master' into develop
2 parents cf871b8 + adef7ac commit 60a3cde

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN if [ "$VERSION" = "distro" ]; then \
1616
echo -e "----------------------------------------------------------\nNOTE: Installing latest release as provided by Alpine package manager.\nThis version may diverge from the one in the git master tree or even from the latest release on github!\nFor development, build with --build-arg VERSION=development.\n----------------------------------------------------------\n" &&\
1717
apk update && apk add timbl; \
1818
else \
19-
PACKAGES="libtar libbz2 icu-libs libxml2 libgomp libstdc++" &&\
20-
BUILD_PACKAGES="build-base autoconf-archive autoconf automake libtool libtar-dev bzip2-dev icu-dev libxml2-dev git" &&\
19+
PACKAGES="libbz2 icu-libs libxml2 libgomp libstdc++" &&\
20+
BUILD_PACKAGES="build-base autoconf-archive autoconf automake libtool bzip2-dev icu-dev libxml2-dev git" &&\
2121
apk add $PACKAGES $BUILD_PACKAGES &&\
2222
cd /usr/src/ && ./timbl/build-deps.sh &&\
2323
cd timbl && sh ./bootstrap.sh && ./configure && make && make install &&\

NEWS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
6.11
1+
6.11 2025-12-11
2+
[Ko van der Sloot]
3+
* added a --prune option: https://github.com/LanguageMachines/timbl/issues/13
4+
* updated Github actions
5+
26
6.10 2024-12-16
37
[Ko van der Sloot]
48
* C++17 is required

0 commit comments

Comments
 (0)