diff --git a/.gitlab-ci-files/job-linux-desktop-debian9.yml b/.gitlab-ci-files/job-linux-desktop-debian9.yml index 35f7e2d75..663f15a8b 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian9.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian9.yml @@ -71,7 +71,7 @@ job-debian9-ninja-clang-novideo: CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_PQCRYPTO=OFF extends: job-debian9-ninja-clang -job-debian9-makefile-clang: +job-debian9-makefile-gcc: tags: [ "docker-debian9" ] image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-appimage:$DEBIAN_9_QT_IMAGE_VERSION only: @@ -81,8 +81,8 @@ job-debian9-makefile-clang: variables: CMAKE_OPTIONS: -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ + CC: gcc + CXX: g++ ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS APPIMAGETOOL_SIGN_PASSPHRASE: $GPG_SIGNING_PASS script: @@ -109,7 +109,7 @@ job-debian9-makefile-clang: # Package - Nightly ################################################# -job-debian9-makefile-clang-package: +job-debian9-makefile-gcc-package: stage: package tags: [ "docker-test-liblinphone" ] image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-appimage:$DEBIAN_9_QT_IMAGE_VERSION @@ -122,8 +122,8 @@ job-debian9-makefile-clang-package: variables: CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DENABLE_G729=ON -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$LINUX_PLATFORM/$APP_FOLDER -DENABLE_PQCRYPTO=ON CMAKE_GENERATOR: Unix Makefiles - CC: clang - CXX: clang++ + CC: gcc + CXX: g++ APPIMAGETOOL_SIGN_PASSPHRASE: $GPG_SIGNING_PASS extends: .job-linux-desktop script: @@ -153,11 +153,11 @@ job-debian9-makefile-clang-package: # Deploy - Nightly ################################################# -job-debian9-makefile-clang-deploy: +job-debian9-makefile-gcc-deploy: stage: deploy tags: [ "deploy" ] needs: - - job-debian9-makefile-clang-package + - job-debian9-makefile-gcc-package only: variables: - $NIGHTLY_MASTER @@ -168,11 +168,11 @@ job-debian9-makefile-clang-deploy: - rsync -rlv build/OUTPUT/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM -job-debian9-makefile-clang-plugins-deploy: +job-debian9-makefile-gcc-plugins-deploy: stage: deploy tags: [ "deploy" ] needs: - - job-debian9-makefile-clang + - job-debian9-makefile-gcc only: variables: - $DEPLOY_PLUGINS diff --git a/.gitlab-ci-files/job-linux-prepare.yml b/.gitlab-ci-files/job-linux-prepare.yml index 932b0ff8d..b71b72ab3 100644 --- a/.gitlab-ci-files/job-linux-prepare.yml +++ b/.gitlab-ci-files/job-linux-prepare.yml @@ -26,6 +26,8 @@ - export CCACHE_BASEDIR=${PWD} - export CCACHE_DIR=${PWD}/ccache - ccache -s + - find $CI_PROJECT_DIR -name '.git' -exec bash -c 'git config --global --add safe.directory ${0%/.git}' {} \; + - git describe --debug || true after_script: - if ! [ -z ${TUNNEL_USER_KEY+x} ]; then rm -rf ~/.ssh || true; fi diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 814af29b4..ec2fadd84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ variables: # Docker image version ARCHLINUX_IMAGE_VERSION: latestupdated CENTOS_7_QT_IMAGE_VERSION: 20211012_add_qtwebview - DEBIAN_9_QT_IMAGE_VERSION: 20230222_qtcom + DEBIAN_9_QT_IMAGE_VERSION: 20230314_qtopen DEBIAN_10_IMAGE_VERSION: 20210217_python3 UBUNTU_ROLLING_IMAGE_VERSION: 20211012_add_qtwebview diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ddea9161..3c6d8ff38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - File viewer in chats (Image/Animated Image/Video/Texts) with the option to export the file. - Accept/decline CLI commands. -## 5.0.13 - 2023-03-13 +## 5.0.14 - 2023-03-16 + +## Fixed +- Downgrade Qt back to 5.15.2 because of Qt commercial licence that break other GPL licences. + +## 5.0.13 - 2023-03-13 - postprone to 5.0.14 ### Fixed - Conference layout refreshing on creation. @@ -20,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Show display name for local accounts. - Update SDK to 5.2.32 -## 5.0.12 - 2023-03-01 +## 5.0.12 - 2023-03-01 - postprone to 5.0.14 ### Fixed - Some case of unwanted settings folders creation. @@ -28,7 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Unusable Contact sheet. - Update SDK to 5.2.28 (cleanup orphan NAT sections and race condition on MSTicker threads). -## 5.0.11 - 2023-02-24 +## 5.0.11 - 2023-02-24 - postprone to 5.0.14 ### Fixed - Crash on ending call in conference. diff --git a/docker-files/bc-dev-debian9-appimage b/docker-files/bc-dev-debian9-appimage index cd11d839e..3687f124c 100644 --- a/docker-files/bc-dev-debian9-appimage +++ b/docker-files/bc-dev-debian9-appimage @@ -1,9 +1,10 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian9:20210421_python3_fix_pip +FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian9:20230302_newer_clang_cpp17 ARG QT_EMAIL ARG QT_PASSWORD -ARG QT_VERSION=5.15.12 +ARG QT_VERSION=5.15.2 ARG QT_VERSION_MODULE=qt.qt5.51512 +ARG QT_MODULES=qtwebengine qtnetworkauth MAINTAINER Peio Rigaux @@ -29,14 +30,28 @@ RUN sudo apt-get install -y wget fuse libfuse2 gnupg2 RUN sudo sed -i '/^mozilla\/DST_Root_CA_X3/s/^/!/' /etc/ca-certificates.conf RUN sudo update-ca-certificates -f + +########### QT # Add Qt and download -ADD https://download.qt.io/development_releases/online_installers/4.4/qt-unified-linux-x64-4.4.0-beta-online.run /home/bc/qt-unified-linux-x64-4.4.0-beta-online.run -RUN sudo chmod +x /home/bc/qt-unified-linux-x64-4.4.0-beta-online.run -RUN sudo /home/bc/qt-unified-linux-x64-4.4.0-beta-online.run install $QT_VERSION_MODULE $QT_VERSION_MODULE.qtpdf $QT_VERSION_MODULE.qtwebengine $QT_VERSION_MODULE.qtnetworkauth --email $QT_EMAIL --pw $QT_PASSWORD --accept-licenses --accept-obligations --auto-answer telemetry-question=No,AssociateCommonFiletypes=Yes --confirm-command --no-default-installations +#Maintenance tools +#ADD https://download.qt.io/development_releases/online_installers/4.4/qt-unified-linux-x64-4.4.0-beta-online.run /home/bc/qt-unified-linux-x64-4.4.0-beta-online.run +#RUN sudo chmod +x /home/bc/qt-unified-linux-x64-4.4.0-beta-online.run +#RUN sudo /home/bc/qt-unified-linux-x64-4.4.0-beta-online.run install $QT_VERSION_MODULE $QT_VERSION_MODULE.qtpdf $QT_VERSION_MODULE.qtwebengine $QT_VERSION_MODULE.qtnetworkauth --email $QT_EMAIL --pw $QT_PASSWORD --accept-licenses --accept-obligations --auto-answer telemetry-question=No,AssociateCommonFiletypes=Yes --confirm-command --no-default-installations USER bc WORKDIR /home/bc +# Manual +RUN sudo pip3 install aqtinstall +RUN sudo python3 -m aqt install $QT_VERSION linux desktop -O /opt/Qt -m $QT_MODULES +## QtCore need libxcb-util.so.1 that need xorg-macros that is in xutils-dev +RUN sudo apt-get install -y xutils-dev +RUN git clone --recursive git://anongit.freedesktop.org/git/xcb/util +## The copy is needed because the appimage doesn't get the dependency in /usr/local/lib (why is unknown) +RUN cd util && ./autogen.sh && make && sudo make install && sudo cp /usr/local/lib/libxcb-util.so.1 /opt/Qt/$QT_VERSION/gcc_64/lib/ +RUN sudo chown -R bc:bc /opt/Qt/ + + ENV Qt5_DIR=/opt/Qt/$QT_VERSION/gcc_64/lib/cmake ENV PATH=/opt/Qt/$QT_VERSION/gcc_64/bin:$PATH ENV PS1='\[\e[34m\]\u@bc-dev-centos7>\[\e[0m\] '