diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-09 17:33:13 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-09 17:37:39 +0200 |
| commit | 09807cd41bc2141c13cd6298ede5232345894742 (patch) | |
| tree | 64e4f00883e3b0ad094772f7365585c14803a032 | |
| parent | 523511f282ed021a01e56c4cab80b78dc5c9b786 (diff) | |
Switch to using flatpak
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | fontconfig-flatpak.conf (renamed from fontconfig-xdg-app.conf) | 0 | ||||
| -rw-r--r-- | org.freedesktop.Sdk.json | 4 |
4 files changed, 4 insertions, 5 deletions
@@ -1,4 +1,4 @@ -.xdg-app-builder +.flatpak-builder sdk platform repo @@ -1,6 +1,5 @@ all: repo org.freedesktop.Sdk.json - rm -rf sdk - xdg-app-builder --ccache --require-changes --repo=repo --subject="build of org.freedesktop.Sdk, `date`" ${EXPORT_ARGS} sdk org.freedesktop.Sdk.json + flatpak-builder --force-clean --ccache --require-changes --repo=repo --subject="build of org.freedesktop.Sdk, `date`" ${EXPORT_ARGS} sdk org.freedesktop.Sdk.json rm -rf sdk repo: diff --git a/fontconfig-xdg-app.conf b/fontconfig-flatpak.conf index b2a7c60..b2a7c60 100644 --- a/fontconfig-xdg-app.conf +++ b/fontconfig-flatpak.conf diff --git a/org.freedesktop.Sdk.json b/org.freedesktop.Sdk.json index a294d44..564e4ad 100644 --- a/org.freedesktop.Sdk.json +++ b/org.freedesktop.Sdk.json @@ -931,7 +931,7 @@ { "name": "fontconfig", "config-opts": [ "--disable-static"], - "post-install": [ "install -m 0644 -p -T fontconfig-xdg-app.conf /etc/fonts/conf.d/50-xdg-app.conf"], + "post-install": [ "install -m 0644 -p -T fontconfig-flatpak.conf /etc/fonts/conf.d/50-flatpak.conf"], "sources": [ { "type": "archive", @@ -940,7 +940,7 @@ }, { "type": "file", - "path": "fontconfig-xdg-app.conf" + "path": "fontconfig-flatpak.conf" } ] }, |