d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-23 19:38:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try a qt6 flatpak build

Browse source
This commit is contained in:
Nicolas Werner 2022-04-15 03:02:45 +02:00
parent fdae12df6f
commit 8e4e3f2eb0
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -136,8 +136,8 @@ build-flatpak-amd64:
before_script: before_script:
- apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
- flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08 - flatpak --noninteractive install --user flathub org.kde.Platform//6.2
- flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08 - flatpak --noninteractive install --user flathub org.kde.Sdk//6.2
script: script:
- export VERSION=$(git describe) - export VERSION=$(git describe)
- mkdir -p build-flatpak - mkdir -p build-flatpak
@ -164,8 +164,8 @@ build-flatpak-arm64:
before_script: before_script:
- apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
- flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08 - flatpak --noninteractive install --user flathub org.kde.Platform//6.2
- flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08 - flatpak --noninteractive install --user flathub org.kde.Sdk//6.2
script: script:
- export VERSION=$(git describe) - export VERSION=$(git describe)
- mkdir -p build-flatpak - mkdir -p build-flatpak

9
io.github.NhekoReborn.Nheko.yaml
View file

@ -1,7 +1,7 @@
id: io.github.NhekoReborn.Nheko id: io.github.NhekoReborn.Nheko
command: nheko command: nheko
runtime: org.kde.Platform runtime: org.kde.Platform
runtime-version: '5.15-21.08' runtime-version: '6.2'
sdk: org.kde.Sdk sdk: org.kde.Sdk
finish-args: finish-args:
- --device=dri - --device=dri
@ -105,12 +105,13 @@ modules:
- config-opts: - config-opts:
- -DCMAKE_BUILD_TYPE=Release - -DCMAKE_BUILD_TYPE=Release
- -DBUILD_TEST_APPLICATION=OFF - -DBUILD_TEST_APPLICATION=OFF
- -DQTKEYCHAIN_STATIC=ON - -DBUILD_WITH_QT6=ON
- -DBUILD_SHARED_LIBS=OFF
buildsystem: cmake-ninja buildsystem: cmake-ninja
name: QtKeychain name: QtKeychain
sources: sources:
- commit: f59ac26be709fd2d8d7a062fab1cf1e67a93806c - commit: c236f9241e37f1754879cf8726d59351a2b2b24a
tag: v0.13.1 tag: v0.13.2
type: git type: git
url: https://github.com/frankosterfeld/qtkeychain.git url: https://github.com/frankosterfeld/qtkeychain.git
- config-opts: - config-opts:

2
src/Cache.cpp
View file

@ -20,7 +20,7 @@
#if __has_include(<keychain.h>) #if __has_include(<keychain.h>)
#include <keychain.h> #include <keychain.h>
#else #else
#include <qt5keychain/keychain.h> #include <qt6keychain/keychain.h>
#endif #endif
#include <mtx/responses/common.hpp> #include <mtx/responses/common.hpp>