Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

conan: Update Boost to 1.83 & OpenSSL to 3.2.0 #5007

Merged
merged 3 commits into from
Dec 8, 2023
Merged

conan: Update Boost to 1.83 & OpenSSL to 3.2.0 #5007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf2fbd
Update conanfilel.py openssl dependency to 3.2.0
pajlada Dec 8, 2023
4e9f79d
add changelog entry
pajlada Dec 8, 2023
37028f6
update boost to 1.83
pajlada Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
- Dev: Temporarily disable High DPI scaling on Qt6 builds on Windows. (#4767)
- Dev: Tests now run on Ubuntu 22.04 instead of 20.04 to loosen C++ restrictions in tests. (#4774)
- Dev: Do a pretty major refactor of the Settings classes. List settings (e.g. highlights) are most heavily modified, and should have an extra eye kept on them. (#4775)
- Dev: conan: Update Boost to 1.83 & OpenSSL to 3.2.0. (#5007)
- Dev: Remove `boost::noncopyable` use & `boost_random` dependency. (#4776)
- Dev: Fix clang-tidy `cppcoreguidelines-pro-type-member-init` warnings. (#4426)
- Dev: Immediate layout for invisible `ChannelView`s is skipped. (#4811)
Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class Chatterino(ConanFile):
name = "Chatterino"
requires = "boost/1.81.0"
requires = "boost/1.83.0"
settings = "os", "compiler", "build_type", "arch"
default_options = {
"with_benchmark": False,
Expand All @@ -24,7 +24,7 @@ def requirements(self):
self.requires("benchmark/1.7.1")

if self.options.get_safe("with_openssl3", False):
self.requires("openssl/3.1.0")
self.requires("openssl/3.2.0")
else:
self.requires("openssl/1.1.1t")

Expand Down
Loading