From 09f8f65adb02e060bee46ae61637eec0e5759207 Mon Sep 17 00:00:00 2001 From: Ghislain Antony Vaillant Date: Fri, 20 Aug 2021 15:16:50 +0200 Subject: [PATCH] Restore libsecret shared module --- .gitmodules | 3 +++ com.bitwarden.desktop.yaml | 18 ++---------------- shared-modules | 1 + 3 files changed, 6 insertions(+), 16 deletions(-) create mode 100644 .gitmodules create mode 160000 shared-modules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1e7a990 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "shared-modules"] + path = shared-modules + url = https://github.com/flathub/shared-modules.git diff --git a/com.bitwarden.desktop.yaml b/com.bitwarden.desktop.yaml index 8cf8a19..2aac26d 100644 --- a/com.bitwarden.desktop.yaml +++ b/com.bitwarden.desktop.yaml @@ -19,6 +19,8 @@ finish-args: rename-desktop-file: bitwarden.desktop rename-icon: bitwarden modules: + - shared-modules/libsecret/libsecret.json + - name: Bitwarden sources: - type: file @@ -50,19 +52,3 @@ modules: - install bitwarden.sh $FLATPAK_DEST/bin/bitwarden - install -D -m 644 -t $FLATPAK_DEST/share/metainfo $FLATPAK_ID.appdata.xml - desktop-file-edit --set-key=Exec --set-value="bitwarden %U" $FLATPAK_DEST/share/applications/bitwarden.desktop - - name: libsecret - buildsystem: meson - config-opts: - - "-Dmanpage=false" - - "-Dvapi=false" - - "-Dgtk_doc=false" - cleanup: - - "/bin" - - "/include" - - "/lib/pkgconfig" - - "/share/gir-1.0" - - "/share/man" - sources: - - type: archive - url: https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.4.tar.xz - sha256: 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 diff --git a/shared-modules b/shared-modules new file mode 160000 index 0000000..ca1664c --- /dev/null +++ b/shared-modules @@ -0,0 +1 @@ +Subproject commit ca1664c5d1d94899432f364f006c582898afbae2