diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 985d23434..b6f4d6c17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: name: Build on macOS runs-on: macos-latest env: - MACOSX_DEPLOYMENT_TARGET: '10.14' + MACOSX_DEPLOYMENT_TARGET: 10.14 steps: - name: Checkout uses: actions/checkout@v2 @@ -21,7 +21,7 @@ jobs: branch: master name: pkgs path: libdigidocpp-pkg - repo: 'open-eid/libdigidocpp' + repo: open-eid/libdigidocpp - name: Install dependencies run: | HASH=($(shasum prepare_osx_build_environment.sh)) @@ -50,11 +50,11 @@ jobs: container: ${{ matrix.container }} strategy: matrix: - container: ['ubuntu:20.04', 'ubuntu:21.10', 'ubuntu:22.04'] + container: ['ubuntu:20.04', 'ubuntu:22.04'] env: DEBIAN_FRONTEND: noninteractive - DEBFULLNAME: 'github-actions' - DEBEMAIL: 'github-actions@github.com' + DEBFULLNAME: github-actions + DEBEMAIL: github-actions@github.com steps: - name: Checkout uses: actions/checkout@v1 @@ -69,7 +69,7 @@ jobs: branch: master name: debs path: libdigidocpp-pkg - repo: 'open-eid/libdigidocpp' + repo: open-eid/libdigidocpp - name: Install artifact run: | apt install --no-install-recommends -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.deb @@ -96,7 +96,7 @@ jobs: container: ${{ matrix.container }} strategy: matrix: - container: ['fedora:33'] + container: ['fedora:34'] env: MAKEFLAGS: -j3 steps: @@ -104,10 +104,8 @@ jobs: uses: actions/checkout@v1 with: submodules: recursive - - name: Install Build Deps - run: dnf groupinstall -y "Development Tools" "Development Libraries" fedora-packager - name: Install Deps - run: dnf install -y cmake openssl-devel vim-common qt5-qtsvg-devel qt5-linguist + run: dnf install -y gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt5-qtsvg-devel qt5-linguist - name: Download artifact uses: dawidd6/action-download-artifact@v2 with: @@ -115,7 +113,7 @@ jobs: branch: master name: rpms path: libdigidocpp-pkg - repo: 'open-eid/libdigidocpp' + repo: open-eid/libdigidocpp - name: Install artifact run: dnf install -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.rpm - name: Build @@ -174,7 +172,7 @@ jobs: branch: master name: msi path: ./ - repo: 'open-eid/libdigidocpp' + repo: open-eid/libdigidocpp - name: Install artifact run: | Rename-Item "libdigidocpp*VS${{ matrix.vcver }}.msi" libdigidocpp.msi @@ -220,7 +218,7 @@ jobs: runs-on: ubuntu-20.04 env: TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} - PROJECTNAME: 'open-eid/DigiDoc4-Client' + PROJECTNAME: open-eid/DigiDoc4-Client steps: - name: Checkout uses: actions/checkout@v2 @@ -235,7 +233,7 @@ jobs: branch: master name: debs path: libdigidocpp-pkg - repo: 'open-eid/libdigidocpp' + repo: open-eid/libdigidocpp - name: Install artifact run: sudo dpkg -i libdigidocpp-pkg/*$(lsb_release -rs)*.deb - name: Download Coverity Build Tool diff --git a/client/Application.cpp b/client/Application.cpp index 56315f43e..e1e63012c 100644 --- a/client/Application.cpp +++ b/client/Application.cpp @@ -395,8 +395,10 @@ Application::Application( int &argc, char **argv ) tl.remove(); QFile::copy(":/TSL/" + file, tl.fileName()); tl.setPermissions(QFile::Permissions(0x6444)); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) if(tl.open(QFile::Append)) tl.setFileTime(tslTime, QFileDevice::FileModificationTime); +#endif } }