Skip to content

Commit cd94814

Browse files
committed
chore: bump to version 0.16.0 and update static build script
1 parent ca5aae9 commit cd94814

3 files changed

Lines changed: 8 additions & 10 deletions

File tree

apidoc/python/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
# built documents.
5656
#
5757
# The short X.Y version.
58-
version = '0.15.1'
58+
version = '0.16.0'
5959
# The full version, including alpha/beta/rc tags.
60-
release = '0.15.1'
60+
release = '0.16.0'
6161

6262
# The language for content autogenerated by Sphinx. Refer to documentation
6363
# for a list of supported languages.

cfg/global_vars.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Version
2-
TOXIC_VERSION = 0.15.1
2+
TOXIC_VERSION = 0.16.0
33
REV = $(shell git rev-list HEAD --count 2>/dev/null || echo -n "error")
44
ifneq (, $(findstring error, $(REV)))
55
VERSION = $(TOXIC_VERSION)

script/build-minimal-static-toxic.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ mkdir -p "$BUILD_DIR"
143143
cd "$BUILD_DIR"
144144

145145
# The git hash of the c-toxcore version we're using
146-
TOXCORE_VERSION="v0.2.19"
146+
TOXCORE_VERSION="v0.2.20"
147147

148148
# The sha256sum of the c-toxcore tarball for TOXCORE_VERSION
149-
TOXCORE_HASH="b770206a5ce59734279ac79f533bebcc8c8ff1d452cdd6628289a49b9200f428"
149+
TOXCORE_HASH="5c1bc37d24a1e37fc6c03580e2602019a09393cd2e8ae1f58e338438f14d5871"
150150

151151
TOXCORE_FILENAME="c-toxcore-$TOXCORE_VERSION.tar.gz"
152152

@@ -187,8 +187,8 @@ cmake --build _build --target install
187187
# location with SSL_CERT_FILE env variable.
188188
cd "$BUILD_DIR"
189189

190-
CURL_VERSION="8.7.1"
191-
CURL_HASH="6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"
190+
CURL_VERSION="8.11.0"
191+
CURL_HASH="db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb"
192192
CURL_FILENAME="curl-$CURL_VERSION.tar.xz"
193193

194194
wget --timeout=10 -O "$CURL_FILENAME" "https://curl.haxx.se/download/$CURL_FILENAME"
@@ -197,9 +197,6 @@ tar -xf "$CURL_FILENAME"
197197
rm "$CURL_FILENAME"
198198
cd curl*
199199

200-
# TODO(nurupo): backport of https://github.com/curl/curl/commit/4b42cda3df85419328ba8c9160a3e8306605d094
201-
# remove once that commit makes it into a curl release
202-
sed -i 's/man_MANS = $(MANPAGE)/@BUILD_DOCS_TRUE@man_MANS = $(MANPAGE)/g' docs/cmdline-opts/Makefile.in
203200
./configure \
204201
--prefix="$BUILD_DIR/prefix-curl" \
205202
--disable-shared \
@@ -240,6 +237,7 @@ sed -i 's/man_MANS = $(MANPAGE)/@BUILD_DOCS_TRUE@man_MANS = $(MANPAGE)/g' docs/c
240237
--disable-websockets \
241238
--without-ca-bundle \
242239
--without-ca-path \
240+
--without-libpsl \
243241
--with-ca-fallback \
244242
--with-nghttp2 \
245243
--with-brotli \

0 commit comments

Comments
 (0)