From 42b9fb4cf5fc351ae12f907da855596fc7dcf59a Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 11 Jul 2019 19:07:57 +0800 Subject: [PATCH] Revert to simple buildsystem until https://github.com/flatpak/flatpak- builder/issues/271 is fixed. --- flatpak/org.eu.encom.spectral.yaml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/flatpak/org.eu.encom.spectral.yaml b/flatpak/org.eu.encom.spectral.yaml index 0efaac7e3..5a9ed563d 100644 --- a/flatpak/org.eu.encom.spectral.yaml +++ b/flatpak/org.eu.encom.spectral.yaml @@ -1,6 +1,6 @@ id: org.eu.encom.spectral runtime: org.kde.Platform -runtime-version: 5.12 +runtime-version: "5.12" sdk: org.kde.Sdk command: spectral finish-args: @@ -12,8 +12,23 @@ finish-args: - --filesystem=xdg-download - --talk-name=org.freedesktop.Notifications modules: +- name: olm + buildsystem: cmake-ninja + sources: + - type: git + url: https://gitlab.matrix.org/matrix-org/olm.git + tag: 3.1.3 + commit: ebd3ba6cc17862aefc9cb3299d60aeae953cc143 + disable-shallow-clone: true + config-opts: + - -DCMAKE_BUILD_TYPE=Release - name: spectral - buildsystem: qmake + buildsystem: simple sources: - type: dir path: ../ + build-commands: + - qmake QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" PREFIX=/app . + - make -j4 + - make install +