mumble: rebuild against protobuf-23.3_1

This commit is contained in:
John 2023-06-27 12:02:57 +02:00 committed by John Zimmermann
parent 9569763683
commit 9e7eaf037e
4 changed files with 46 additions and 1 deletions

View file

@ -0,0 +1,20 @@
--- a/src/murmur/CMakeLists.txt 2022-09-13 19:24:40.000000000 +0200
+++ - 2023-07-14 17:23:13.145173297 +0200
@@ -77,6 +77,7 @@
)
target_link_libraries(mumble-server PRIVATE shared Qt5::Sql)
+target_link_libraries(mumble-server PRIVATE shared absl_log_internal_message)
if(static)
# MariaDB and MySQL
--- a/src/mumble/CMakeLists.txt 2022-09-13 19:24:40.000000000 +0200
+++ - 2023-07-14 17:25:05.556023593 +0200
@@ -472,6 +472,7 @@
Qt5::Sql
Qt5::Svg
Qt5::Widgets
+ absl_log_internal_message
)
if(static)

View file

@ -0,0 +1,11 @@
--- mumble-1.4.287/CMakeLists.txt 2022-09-13 19:24:40.000000000 +0200
+++ - 2023-07-10 20:12:27.869019033 +0200
@@ -35,7 +35,7 @@
set(3RDPARTY_DIR "${CMAKE_SOURCE_DIR}/3rdparty")
set(PLUGINS_DIR "${CMAKE_SOURCE_DIR}/plugins")
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
list(APPEND CMAKE_MODULE_PATH

View file

@ -0,0 +1,14 @@
Newer musl expands NULL to nullptr, which is not a bool.
Either way, the check is always true with openssl 1.1+, so it can probably removed alltogether
---
--- mumble-1.4.287/src/SSL.cpp 2022-09-13 19:24:40.000000000 +0200
+++ - 2023-02-07 22:18:16.093759105 +0100
@@ -33,7 +34,7 @@
// If we detect that no locking callback is configured, we
// have to set it up ourselves to allow multi-threaded use
// of OpenSSL.
- if (!CRYPTO_get_locking_callback()) {
+ if (CRYPTO_get_locking_callback() == NULL) {
SSLLocks::initialize();
}
}

View file

@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.4.287
revision=3
revision=4
build_style=cmake
make_cmd=make
configure_args="-Doverlay-xcompile=OFF -Dbundled-opus=OFF