mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 20:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build with XCode15 (try to fix Apple permissions that doesn't popup)

Browse source
This commit is contained in:
Julien Wadel 2024-11-07 18:49:40 +01:00
parent e15186e63b
commit f999889709
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci-files/macosx-desktop.yml
View file

@ -24,7 +24,7 @@
.macosx-desktop:
stage: build
tags: [ "macos-xcode13" ]
tags: [ "macos-xcode15" ]
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
@ -91,7 +91,7 @@ macosx-ninja-novideo:
# WAIT for QT6 for arm64
macosx-makefile-package:
stage: package
tags: [ "macos-xcode13" ]
tags: [ "macos-xcode15" ]
dependencies: []
rules:
- !reference [.rules-merge-request-manual, rules]
@ -115,7 +115,7 @@ macosx-makefile-package:
macosx-codesigning:
stage: signing
tags: [ "macos-xcode13" ]
tags: [ "macos-xcode15" ]
needs:
- macosx-makefile-package
rules:
@ -140,7 +140,7 @@ macosx-codesigning:
macosx-makefile-deploy:
stage: deploy
tags: [ "macos-xcode13" ]
tags: [ "macos-xcode15" ]
needs:
- macosx-codesigning
only:
@ -158,7 +158,7 @@ macosx-makefile-deploy:
macosx-makefile-plugins-deploy:
stage: deploy
tags: [ "macos-xcode13" ]
tags: [ "macos-xcode15" ]
needs:
- macosx-makefile
only:

6
Linphone/CMakeLists.txt
View file

@ -40,9 +40,9 @@ endif()
################################################################
# CONFIGS
################################################################
if(NOT WIN32)
add_compile_options(-Werror=deprecated-declarations)
endif()
#if(NOT WIN32)
# add_compile_options(-Werror=deprecated-declarations)
#endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_QML_DEBUG -DQT_DECLARATIVE_DEBUG")

4
Linphone/core/conference/ConferenceInfoList.cpp
View file

@ -236,6 +236,10 @@ int ConferenceInfoList::sort(QList<QSharedPointer<ConferenceInfoCore>> &listToSo
[nowDate](const QSharedPointer<QObject> &a, const QSharedPointer<QObject> &b) {
auto l = a.objectCast<ConferenceInfoCore>();
auto r = b.objectCast<ConferenceInfoCore>();
if (!l && !r) {
lCritical() << "[ConferenceInfoList] there are 2 null pointers in list that should not happen!";
return false;
}
if (!l || !r) { // sort on date
return !l ? nowDate <= r->getDateTimeUtc().date() : l->getDateTimeUtc().date() < nowDate;
} else {