Skip to content

Commit

Permalink
Upgrade most dependencies to their latest version.
Browse files Browse the repository at this point in the history
  • Loading branch information
saurik committed May 7, 2024
1 parent f28cd86 commit b204e11
Show file tree
Hide file tree
Showing 56 changed files with 84 additions and 67 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,6 @@
[submodule "mingw-w64"]
path = env/mingw-w64
url = https://git.code.sf.net/p/mingw-w64/mingw-w64
[submodule "base"]
path = min-v8/base
url = https://chromium.googlesource.com/chromium/src/base
2 changes: 1 addition & 1 deletion app-shared/flutter-desktop-embedding
13 changes: 8 additions & 5 deletions env/output.mk
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ $(output)/%.mm.o: $$(specific) $$(folder).mm $$(code)
$(specific)
@mkdir -p $(dir $@)
@echo [CC] $(target)/$(arch) $<
$(call compile,cxx,objective-c++,-std=gnu++17 -fobjc-arc)
$(call compile,cxx,objective-c++,-std=gnu++20 -fobjc-arc)

$(output)/%.cc.o: $$(specific) $$(folder).cc $$(code)
$(specific)
Expand All @@ -77,18 +77,21 @@ $(output)/%.c++.o: $$(specific) $$(folder).c++ $$(code)
@echo [CC] $(target)/$(arch) $<
$(call compile,cxx,c++,-std=c++20)

# XXX: -std=c++2b is currently blocked on an incompatibility with libwebrtc
# https://issues.webrtc.org/issues/339074792

$(output)/%.cpp.o: $$(specific) $$(folder).cpp $$(code)
$(specific)
@mkdir -p $(dir $@)
ifeq ($(filter notidy,$(debug)),)
@if [[ $< =~ $(filter) && ! $< =~ .*/(base58|lwip|monitor)\.cpp ]]; then \
echo [CT] $(target)/$(arch) $<; \
$(tidy) $< --quiet --warnings-as-errors='*' --header-filter='$(filter)' --config='{Checks: "$(checks)", CheckOptions: [$(foreach v,$(filter checks/%,$(.VARIABLES)),{key: "$(patsubst checks/%,%,$(v))", value: $($(v))}$(comma) )]}' -- \
$(wordlist 2,$(words $(cxx)),$(cxx)) $(more/$(arch)) -std=c++2b -Wconversion -Wno-sign-conversion $(flags) $(xflags); \
$(wordlist 2,$(words $(cxx)),$(cxx)) $(more/$(arch)) -std=c++20 -Wconversion -Wno-sign-conversion $(flags) $(xflags); \
fi
endif
@echo [CC] $(target)/$(arch) $<
$(call compile,cxx,c++,-std=c++2b)
$(call compile,cxx,c++,-std=c++20)

$(output)/%.rc.o: $$(specific) $$(folder).rc $$(code)
$(specific)
Expand All @@ -111,11 +114,11 @@ $(shell env/meson.sh $(1) $(output) '$(CURDIR)' '$(meson) $(meson/$(1))' '$(ar/$
endef
$(each)

%/configure: %/configure.ac
%/configure: %/configure.ac $$(call head,$$(dir $$@))
cd $(dir $@) && git clean -fxd .
@# XXX: https://gitlab.freedesktop.org/pkg-config/pkg-config/-/issues/55
@sed -i -e 's/^m4_copy(/m4_copy_force(/' $(dir $@)/glib/m4macros/glib-gettext.m4 || true
env/autogen.sh $(dir $@)
env/autogen.sh $(dir $@) $(a_$(notdir $(patsubst %/configure.ac,%,$<)))

$(output)/%/Makefile: $$(specific) $$(folder)/configure $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config
$(specific)
Expand Down
2 changes: 1 addition & 1 deletion env/setup-ndk.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -e
set -o pipefail
echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.2.11394342" "platforms;android-33" >/dev/null
echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-33" >/dev/null
3 changes: 0 additions & 3 deletions env/target-apl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ more += -fno-strict-return
include $(pwd)/kit-android.mk
cxx += -stdlib=libc++

xflags += -nostdinc++
xflags += -isystem $(toolchain)/usr/include/c++/v1

# the r22 NDK prefers its own copy of ld
wflags += -fuse-ld=/usr/bin/ld

Expand Down
4 changes: 2 additions & 2 deletions env/target-win.mk
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ qflags += -I$(CURDIR)/$(pwd)/mingw
# XXX: I need gcc as I don't have windows compiler-rt in NDK
#qflags += --rtlib=compiler-rt

mingw := git-10.0.0.r258.g530c58e17
mingw := git-11.0.0.r680.g257321cea

msys2 :=
msys2 += crt-$(mingw)-2
msys2 += crt-$(mingw)-1
msys2 += dlfcn-1.4.0-1
msys2 += gcc-13.2.0-5
msys2 += headers-$(mingw)-1
Expand Down
2 changes: 1 addition & 1 deletion gui-orchid/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 21e78760fee629465f00ee6e1b0ca78764f69ff7

COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion gui-orchid/macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: ce32ab99a0089086c289cf0789c8382f403ce92b

COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion min-cairo/libpng
Submodule libpng updated from c22ef3 to f1848a
1 change: 1 addition & 0 deletions min-cairo/libpng.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

# XXX: this relied on pre-_.a behavior of archive

a_libpng += --maintainer
p_libpng := -I$(CURDIR)/$(pwd)/zlb/libz
l_libpng := -L@/$(pwd)/zlb

Expand Down
2 changes: 1 addition & 1 deletion min-krypton/vpn-libraries
Submodule vpn-libraries updated 369 files
2 changes: 1 addition & 1 deletion min-pcre2/pcre2
Submodule pcre2 updated from 4a6a8b to 5634d0
1 change: 1 addition & 0 deletions min-v8/_/base
1 change: 1 addition & 0 deletions min-v8/base
Submodule base added at 6ca251
4 changes: 2 additions & 2 deletions min-v8/target-win.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ cflags/$(pwd/v8)/src/base/platform/platform-win32.cc += -U__MINGW32__ -DPAGE_TAR
cflags/$(pwd/v8)/src/base/platform/time.cc += -include $(pwd/v8)/../time.hpp

# XXX: https://bugs.chromium.org/p/v8/issues/detail?id=12099
cflags/$(pwd/v8)/src/base/platform/ += -include vista.hpp
cflags/$(pwd/v8)/src/diagnostics/unwinding-info-win64.cc += -include vista.hpp
cflags/$(pwd/v8)/src/base/platform/ += -include $(pwd/v8)/../vista.hpp
cflags/$(pwd/v8)/src/diagnostics/unwinding-info-win64.cc += -include $(pwd/v8)/../vista.hpp
#cflags/$(pwd/v8)/src/diagnostics/unwinding-info-win64.cc += -U_WIN32_WINNT -D_WIN32_WINNT=0x0602

cflags/$(pwd)/v8/ += -Wno-format
Expand Down
1 change: 1 addition & 0 deletions min-v8/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ header += $(filter %.h %.inc,$(tqsrc))

cflags += -I$(pwd/v8)/src
cflags += -I$(pwd/v8)/include
cflags += -I$(pwd)/_
cflags += -I$(pwd)/extra

# XXX: this is un-breaking something the -iquote for sed hacks is breaking in cppgc
Expand Down
2 changes: 1 addition & 1 deletion min-v8/trace_event
Submodule trace_event updated from 29ac73 to 35f065
File renamed without changes.
Empty file.
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion min-webrtc/libsrtp
Submodule libsrtp updated from 17b2d5 to 7a7e64
4 changes: 3 additions & 1 deletion min-webrtc/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ webrtc += $(wildcard $(pwd)/webrtc/api/units/*.cc)

webrtc += $(pwd)/webrtc/api/field_trials_registry.cc

webrtc += $(pwd)/webrtc/api/audio/audio_processing_statistics.cc

webrtc += $(pwd)/webrtc/api/audio_codecs/audio_codec_pair_id.cc
webrtc += $(pwd)/webrtc/api/audio_codecs/audio_encoder.cc

Expand Down Expand Up @@ -99,7 +101,6 @@ webrtc += $(filter-out \
webrtc += $(wildcard $(pwd)/webrtc/media/sctp/*.cc)

webrtc += $(pwd)/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc
webrtc += $(pwd)/webrtc/modules/audio_processing/include/audio_processing_statistics.cc

webrtc += $(wildcard $(pwd)/webrtc/modules/congestion_controller/goog_cc/*.cc)
webrtc += $(wildcard $(pwd)/webrtc/modules/congestion_controller/rtp/*.cc)
Expand Down Expand Up @@ -137,6 +138,7 @@ webrtc += $(filter-out \
%/ifaddrs_converter.cc \
%/nat_server.cc \
%/nat_socket_factory.cc \
%/trace_categories.cc \
,$(wildcard $(pwd)/webrtc/rtc_base/*.cc))

# XXX: I'd prefer to remove all %/experiments/*
Expand Down
2 changes: 1 addition & 1 deletion min-webrtc/webrtc
Submodule webrtc updated from c8068f to 84e905
6 changes: 6 additions & 0 deletions min-wireshark/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,14 @@ ifneq ($(filter ios mac,$(target)),)
# XXX: rndlinux.c ret = getentropy (buffer, nbytes); (syscall() backup)
# error: implicit declaration of function 'getentropy' is invalid in C99
w_libgcrypt += ac_cv_func_getentropy=no
# the README file seems to indicate they don't know how to implement this
w_libgcrypt += ac_cv_sys_symbol_underscore=yes
endif

# these symbols conflict with OpenSSL :/
p_libgcrypt += -Daria_encrypt=gcrypt_aria_encrypt
p_libgcrypt += -Dgf_mul=gcrypt_gf_mul

w_libgcrypt += --with-libgpg-error-prefix=@/usr
$(call depend,$(pwd)/libgcrypt/Makefile,@/usr/include/gpg-error.h)
$(call depend,$(pwd)/libgcrypt/Makefile,@/usr/lib/libgpg-error.a)
Expand Down
2 changes: 1 addition & 1 deletion min-zlib/googletest
Submodule googletest updated 132 files
2 changes: 1 addition & 1 deletion min-zlib/libz
Submodule libz updated from 2d44c5 to 7d77fb
5 changes: 4 additions & 1 deletion modules
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ head[env/libcxxabi]=origin/release_90
head[app-shared/flutter]=3.13.9
head[app-shared/engine]=$(cat app-shared/flutter/bin/internal/engine.version)

# pcre2 is stuck due to https://github.com/PCRE2Project/pcre2/issues/205
# cairo and pixman decided to drop autotools, which is really annoying :/
# intx is stuck due to use of concepts (so need a newer version of libc++)
# libgcrypt is stuck on aarch64 Android due to https://dev.gnupg.org/T7111
# libgpg-error is stuck due to libgcrypt as it breaks the older detection

# url is stuck due to https://forums.developer.apple.com/thread/120977 :/
# (I tried to use a local copy of libcxx on Apple, but crashed on iOS 14)
Expand Down
2 changes: 2 additions & 0 deletions p2p/asio.mk
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ boost += random
boost += range
boost += rational
boost += regex
boost += scope
boost += serialization
boost += signals2
boost += smart_ptr
Expand All @@ -95,6 +96,7 @@ cflags += -DBOOST_ASIO_DISABLE_CONNECTEX
#cflags += -DBOOST_ASIO_NO_DEPRECATED

# XXX: this is because I am still using an old version of libc++
cflags += -DBOOST_ASIO_DISABLE_STD_COROUTINE
cflags += -DBOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF
cflags += -DBOOST_NO_CXX20_HDR_CONCEPTS

Expand Down
2 changes: 1 addition & 1 deletion p2p/boost
Submodule boost updated 92 files
+42 −10 .github/workflows/ci.yml
+131 −0 .github/workflows/release-cmake.yml
+0 −60 .github/workflows/release.yml
+10 −0 .gitmodules
+1 −1 CMakeLists.txt
+1 −1 Jamroot
+1 −1 libs/any
+1 −1 libs/array
+1 −1 libs/asio
+1 −1 libs/assert
+1 −1 libs/atomic
+1 −1 libs/beast
+1 −1 libs/bimap
+1 −1 libs/bind
+1 −0 libs/charconv
+1 −1 libs/chrono
+1 −1 libs/cobalt
+1 −1 libs/compat
+1 −1 libs/config
+1 −1 libs/container
+1 −1 libs/container_hash
+1 −1 libs/context
+1 −1 libs/conversion
+1 −1 libs/core
+1 −1 libs/describe
+1 −1 libs/detail
+1 −1 libs/dll
+1 −1 libs/exception
+1 −1 libs/filesystem
+1 −1 libs/function
+1 −1 libs/geometry
+1 −1 libs/hana
+1 −1 libs/integer
+1 −1 libs/interprocess
+1 −1 libs/intrusive
+1 −1 libs/iterator
+1 −1 libs/json
+1 −1 libs/lambda2
+1 −1 libs/leaf
+1 −1 libs/lexical_cast
+1 −1 libs/local_function
+1 −1 libs/locale
+1 −1 libs/log
+5 −3 libs/maintainers.txt
+1 −1 libs/math
+1 −1 libs/move
+1 −1 libs/mp11
+1 −1 libs/msm
+1 −1 libs/multi_index
+1 −1 libs/multiprecision
+1 −1 libs/mysql
+1 −1 libs/nowide
+1 −1 libs/numeric/odeint
+1 −1 libs/outcome
+1 −1 libs/parameter
+1 −1 libs/pfr
+1 −1 libs/pool
+1 −1 libs/preprocessor
+1 −1 libs/process
+1 −1 libs/program_options
+1 −1 libs/property_tree
+1 −1 libs/qvm
+1 −1 libs/random
+1 −1 libs/range
+1 −1 libs/redis
+1 −0 libs/scope
+1 −1 libs/signals2
+1 −1 libs/smart_ptr
+1 −1 libs/spirit
+1 −1 libs/stacktrace
+1 −1 libs/stl_interfaces
+1 −1 libs/system
+1 −1 libs/test
+1 −1 libs/throw_exception
+1 −1 libs/timer
+1 −1 libs/type_index
+1 −1 libs/type_traits
+1 −1 libs/unordered
+1 −1 libs/url
+1 −1 libs/utility
+1 −1 libs/uuid
+1 −1 libs/variant
+1 −1 libs/variant2
+1 −1 libs/wave
+1 −1 more
+1 −1 tools/auto_index
+1 −1 tools/boost_install
+1 −1 tools/boostbook
+1 −1 tools/build
+1 −1 tools/cmake
+1 −1 tools/inspect
+1 −1 tools/quickbook
2 changes: 1 addition & 1 deletion p2p/c-ares
Submodule c-ares updated 146 files
2 changes: 1 addition & 1 deletion p2p/challenge-bypass-ristretto-ffi
2 changes: 1 addition & 1 deletion p2p/ctre
2 changes: 1 addition & 1 deletion p2p/curl
Submodule curl updated 1120 files
2 changes: 1 addition & 1 deletion p2p/expected
2 changes: 1 addition & 1 deletion p2p/extra/sockets.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <sys/filio.h>
typedef int msg_iovlen_t;
#else
#define TCP_KEEPALIVE 0
typedef size_t msg_iovlen_t;
#endif

Expand Down Expand Up @@ -57,6 +56,7 @@ struct msghdr {
#ifdef __linux__
#include <asm/ioctls.h>
#include <asm/socket.h>
#define TCP_KEEPALIVE 0xFF
#ifndef __ANDROID__
#include <bits/xopen_lim.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion p2p/lwip
Submodule lwip updated from 3fe8d2 to 1cc153
2 changes: 1 addition & 1 deletion p2p/lz4
Submodule lz4 updated 101 files
14 changes: 2 additions & 12 deletions p2p/openvpn3.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,18 @@ cflags += -DUSE_OPENSSL
cflags += -DOPENVPN_FORCE_TUN_NULL
cflags += -DUSE_TUN_BUILDER

ifeq (,)
ifeq ($(target),ios)
source += $(pwd)/ovpncli.mm
else
source += $(pwd)/openvpn3/client/ovpncli.cpp
endif
else
source += $(wildcard $(pwd)/openvpn3/client/*.cpp)
cflags/$(pwd)/openvpn3/ += -ObjC++
endif

cflags += -I$(pwd)/openvpn3
cflags += -I$(pwd)/openvpn3/client

cflags += -DOPENVPN_EXTERNAL_TRANSPORT_FACTORY
cflags += -DOPENVPN_EXTERNAL_TUN_FACTORY

# XXX: this is unfortunate
cflags/$(pwd)/ovpncli.mm += -Wno-deprecated-enum-enum-conversion
cflags/$(pwd)/openvpn3/ += -Wno-deprecated-enum-enum-conversion

# XXX: https://github.com/OpenVPN/openvpn3/issues/204
cflags/$(pwd)/openvpn3/client/ovpncli.cpp += -Wno-bitwise-instead-of-logical

ifeq ($(target),win)
cflags/$(pwd)/openvpn3/ += -Wno-missing-braces
cflags/$(pwd)/openvpn3/ += -Wno-pointer-bool-conversion
Expand Down
1 change: 0 additions & 1 deletion p2p/ovpncli.mm

This file was deleted.

2 changes: 1 addition & 1 deletion p2p/pugixml
2 changes: 1 addition & 1 deletion p2p/snappy
2 changes: 0 additions & 2 deletions p2p/source/connection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
#define TCP_KEEPIDLE TCP_KEEPALIVE
#define TCP_KEEPCNT 16
#define TCP_KEEPINTVL 17
#elif defined(__linux__)
#define TCP_USER_TIMEOUT 18
#endif

namespace orc {
Expand Down
5 changes: 3 additions & 2 deletions p2p/source/integer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ using boost::multiprecision::uint256_t;

static const uint128_t Max128((uint256_t(1) << 128) - 1);

inline bool operator ==(const std::from_chars_result &lhs, const std::from_chars_result &rhs) {
// XXX: remove this once I upgrade libc++
inline bool Compare(const std::from_chars_result &lhs, const std::from_chars_result &rhs) {
return lhs.ptr == rhs.ptr && lhs.ec == rhs.ec;
}

Expand All @@ -61,7 +62,7 @@ std::enable_if_t<std::is_integral_v<Type_>, Type_> To(const std::string_view &va
return 16;
}());
Type_ number;
orc_assert_((std::from_chars(start, end, number, detected) == std::from_chars_result{end, std::errc()}), value << " is not a number");
orc_assert_(Compare(std::from_chars(start, end, number, detected), std::from_chars_result{end, std::errc()}), value << " is not a number");
return number;
}

Expand Down
2 changes: 1 addition & 1 deletion p2p/tap-windows6
Submodule tap-windows6 updated 2 files
+15 −3 src/rxpath.c
+4 −4 version.m4
13 changes: 11 additions & 2 deletions p2p/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ $(call depend,$(pwd)/source/version.cpp.o,@/extra/revision.hpp)
cflags += -I$(pwd)/expected/include
cflags += -I$(pwd)/url/include
cflags += -I$(pwd)/url/src

# XXX: this might be fixed in a later version
cflags/$(pwd)/url/ += -include iterator

source += $(filter-out \
%/filesystem.cpp \
,$(wildcard \
Expand Down Expand Up @@ -73,6 +77,11 @@ endif
cflags += -I$(pwd)/lwip/src/include

cflags += -DLWIP_ERRNO_STDINCLUDE
cflags += -DLWIP_TCP

ifeq ($(target),lnx)
cflags += -DTCP_USER_TIMEOUT=18
endif


# Android sockaddr_storage is more indirect
Expand Down Expand Up @@ -169,9 +178,9 @@ cflags += -I$(pwd)/challenge-bypass-ristretto-ffi/src
source += $(pwd)/challenge-bypass-ristretto-ffi/src/wrapper.cpp


linked += $(pwd)/boringtun/librust.a
linked += $(pwd)/boringtun/boringtun/librust.a
cflags += -I$(pwd)/boringtun/boringtun/src
features/$(pwd)/boringtun += ffi-bindings
features/$(pwd)/boringtun/boringtun += ffi-bindings


source += $(pwd)/SPCDNS/src/codec.c
Expand Down
2 changes: 1 addition & 1 deletion srv-daemon/source/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ bool Server::Bill(const Buffer &data, bool force) {
return true;

const auto amount(cashier_->Bill(data.size()));
const auto floor(cashier_->Bill(1024UZ*128));
const auto floor(cashier_->Bill(1024ULL*128)); // XXX: c++2b UZ

S<Server> self;

Expand Down
2 changes: 1 addition & 1 deletion srv-worker/capnproto
Submodule capnproto updated 265 files
2 changes: 1 addition & 1 deletion srv-worker/workerd
Submodule workerd updated 384 files
2 changes: 1 addition & 1 deletion vpn-shared/libevent
Submodule libevent updated 105 files
2 changes: 1 addition & 1 deletion vpn-shared/libmaxminddb
Loading

0 comments on commit b204e11

Please sign in to comment.