Updated flatpak build manifest

* Use platform 19.08
* Remove shared-modules, no longer required (udev is now part of the
platform)
* Switch PCSC source to github to avoid rate limitations.
This commit is contained in:
Armin Novak 2020-02-19 10:28:46 +01:00
parent 75be471d78
commit 3941e1cda6
3 changed files with 6 additions and 76 deletions

View File

@ -1,7 +1,7 @@
{
"app-id": "com.freerdp.FreeRDP",
"runtime": "org.freedesktop.Platform",
"runtime-version": "18.08",
"runtime-version": "19.08",
"sdk": "org.freedesktop.Sdk",
"build-options" : {
"cflags": "-O2 -g",
@ -13,16 +13,16 @@
"finish-args": [
/* X11 + XShm access */
"--share=ipc",
"--socket=x11",
"--socket=fallback-x11",
"--socket=x11",
"--socket=fallback-x11",
/* Needs to talk to the network */
"--share=network",
/* Play sounds redirected from guests */
"--socket=pulseaudio",
/* Wayland access */
"--socket=wayland",
/* Allow rw access to download folder */
"--filesystem=xdg-download"
/* Allow rw access to download folder */
"--filesystem=xdg-download"
],
"modules": [
{
@ -38,8 +38,6 @@
}
]
},
"shared-modules/udev/udev-175.json",
"shared-modules/dbus-glib/dbus-glib-0.110.json",
{
"name": "libusb",
"config-opts": ["--disable-static"],
@ -64,7 +62,7 @@
"sources": [
{
"type": "git",
"url": "https://salsa.debian.org/rousseau/PCSC.git",
"url": "https://github.com/LudovicRousseau/PCSC.git",
"tag": "pcsc-1.8.24",
"commit": "73d95ada3221c060cbd7b6aa2375453f9d0e359b"
}

View File

@ -1,23 +0,0 @@
{
"name": "dbus-glib",
"cleanup": [
"*.la",
"/bin",
"/etc",
"/include",
"/libexec",
"/share/gtk-doc",
"/share/man"
],
"config-opts": [
"--disable-static",
"--disable-gtk-doc"
],
"sources": [
{
"type": "archive",
"url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz",
"sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
}
]
}

View File

@ -1,45 +0,0 @@
{
"name": "udev",
"rm-configure": true,
"config-opts": [
"--disable-hwdb",
"--disable-logging",
"--disable-introspection",
"--disable-keymap",
"--disable-mtd_probe",
"--with-systemdsystemunitdir=/app/lib/systemd/"
],
"cleanup": [
"/include",
"/etc",
"/libexec",
"/sbin",
"/lib/pkgconfig",
"/lib/systemd",
"/man",
"/share/aclocal",
"/share/doc",
"/share/gtk-doc",
"/share/man",
"/share/pkgconfig",
"*.la",
"*.a"
],
"sources": [
{
"type": "archive",
"url": "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.bz2",
"sha256": "4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"autoreconf -vfi"
]
}
],
"post-install": [
"sed -i 's|${exec_prefix}|/app|g' /app/share/pkgconfig/udev.pc"
]
}