From bf68aa28d835cbd7e1a0bf40fd9795d7ae946224 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 22 Nov 2021 05:06:17 +0100 Subject: [PATCH] Fix loading on Gnome when in flatpak See https://gitlab.gnome.org/GNOME/libsecret/-/issues/49 fixes #816 --- .gitlab-ci.yml | 8 ++++---- io.github.NhekoReborn.Nheko.yaml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36253e1c..ad64f716 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,8 +110,8 @@ build-flatpak-amd64: - 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 - 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.Sdk//5.15 + - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08 + - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08 script: - export VERSION=$(git describe) - mkdir -p build-flatpak @@ -140,8 +140,8 @@ build-flatpak-arm64: - 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 - 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.Sdk//5.15 + - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08 + - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08 script: - export VERSION=$(git describe) - mkdir -p build-flatpak diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index 22e52ae8..6f15caa8 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -1,7 +1,7 @@ id: io.github.NhekoReborn.Nheko command: nheko runtime: org.kde.Platform -runtime-version: '5.15' +runtime-version: '5.15-21.08' sdk: org.kde.Sdk rename-icon: nheko rename-desktop-file: nheko.desktop @@ -90,6 +90,8 @@ modules: - -Dvapi=false - -Dgtk_doc=false - -Dintrospection=false + # https://gitlab.gnome.org/GNOME/libsecret/-/issues/49 + - -Dgcrypt=false sources: - commit: 3fe635e64efd4b8dbc9ec3548b0bc8034c7665c4 tag: 0.20.4