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

Fix loading on Gnome when in flatpak

Browse source 
See https://gitlab.gnome.org/GNOME/libsecret/-/issues/49

fixes #816
This commit is contained in:
Nicolas Werner 2021-11-22 05:06:17 +01:00
parent 5bc9d885de
commit bf68aa28d8
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -110,8 +110,8 @@ build-flatpak-amd64:
- apt-get update && apt-get install -y software-properties-common - apt-get update && apt-get install -y software-properties-common
- add-apt-repository ppa:alexlarsson/flatpak && apt-get update && apt-get -y install flatpak-builder git python curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - add-apt-repository ppa:alexlarsson/flatpak && apt-get update && apt-get -y install flatpak-builder git python 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 - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08
- flatpak --noninteractive install --user flathub org.kde.Sdk//5.15 - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08
script: script:
- export VERSION=$(git describe) - export VERSION=$(git describe)
- mkdir -p build-flatpak - mkdir -p build-flatpak
@ -140,8 +140,8 @@ build-flatpak-arm64:
- apt-get update && apt-get install -y software-properties-common - apt-get update && apt-get install -y software-properties-common
- add-apt-repository ppa:alexlarsson/flatpak && apt-get update && apt-get -y install flatpak-builder git python curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - add-apt-repository ppa:alexlarsson/flatpak && apt-get update && apt-get -y install flatpak-builder git python 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 - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08
- flatpak --noninteractive install --user flathub org.kde.Sdk//5.15 - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08
script: script:
- export VERSION=$(git describe) - export VERSION=$(git describe)
- mkdir -p build-flatpak - mkdir -p build-flatpak

4
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' runtime-version: '5.15-21.08'
sdk: org.kde.Sdk sdk: org.kde.Sdk
rename-icon: nheko rename-icon: nheko
rename-desktop-file: nheko.desktop rename-desktop-file: nheko.desktop
@ -90,6 +90,8 @@ modules:
- -Dvapi=false - -Dvapi=false
- -Dgtk_doc=false - -Dgtk_doc=false
- -Dintrospection=false - -Dintrospection=false
# https://gitlab.gnome.org/GNOME/libsecret/-/issues/49
- -Dgcrypt=false
sources: sources:
- commit: 3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4 - commit: 3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4
tag: 0.20.4 tag: 0.20.4