diff --git a/org.kde.discover.json b/org.kde.discover.json index c764385..650b7d9 100644 --- a/org.kde.discover.json +++ b/org.kde.discover.json @@ -1,157 +1,164 @@ { "id": "org.kde.discover", "branch": "master", "runtime": "org.kde.Platform", "runtime-version": "5.11", "sdk": "org.kde.Sdk", "command": "/app/bin/discoverwrapper.sh", "tags": ["nightly"], "desktop-file-name-suffix": " (Nightly)", "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--share=network", "--filesystem=home", "--filesystem=~/.local/share/flatpak", "--filesystem=xdg-data" ], "cleanup": [ "/share/bash-completion" ], "build-options" : { "env": { "MOUNT_FUSE_PATH": "../tmp/", "BASH_COMPLETIONSDIR": "/app/share/bash-completion/completions" } }, "modules": [ { "name": "yaml", "config-opts": [ "--disable-static", "--enable-x11" ], "sources": [ { "type": "archive", "url": "http://pyyaml.org/download/libyaml/yaml-0.1.7.zip", "sha256": "bd16d734a82ccc806eab7784b3a97ee4773daf359496b298968fc2eedc3d1b19" } ] }, { "name": "xmlto", "sources": [ { "type": "archive", "url": "https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2", "sha256": "1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276" } ] }, { "config-opts": ["--libdir=lib", "-Denable-qt=true", "-Dstemming=false", "-Dqt=true"], "name": "appstream", "buildsystem": "meson", "builddir": true, "sources": [ { "type": "git", "url": "https://github.com/ximion/appstream.git", "branch": "master" } ], "modules": [ { "name": "glib", "config-opts": [ "--with-pcre=system", "--with-python=python3" ], "ensure-writable": [ "/share/glib-2.0/codegen/*.pyc" ], "cleanup-platform": [ "/share/glib-2.0/codegen", "/bin/gdbus-codegen", "/bin/glib-*", "/bin/gobject-query", "/bin/gresource", "/bin/gtester*" ], "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/glib.git" } ] }, { "name": "gobject-introspection", "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/gobject-introspection", "branch": "1.56.1" } ] } ] }, { "name": "glib-networking", "buildsystem": "meson", "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/glib-networking.git", "branch": "glib-2-56" } ] }, { "name": "flatpak", "config-opts": ["--disable-documentation", "--disable-seccomp", "--disable-sandboxed-triggers", "--disable-system-helper"], "make-args": [ "XDG_APP_BINDIR=/usr/bin" ], "cleanup": [ "/etc/profile.d", "/libexec", "/lib/systemd", "/share/dbus-1/interfaces/org.freedesktop.*", "/share/dbus-1/services/org.freedesktop.*", "/share/gdm" ], "post-install": [ "cp /usr/bin/gtk-update-icon-cache /app/bin", "cp /usr/bin/update-mime-database /app/bin", "cp /usr/bin/update-desktop-database /app/bin"], "sources": [ { "type": "git", "url": "https://github.com/flatpak/flatpak", "branch": "1.0.6" } ], "modules": [ { "name": "libfuse", "config-opts": ["--disable-util"], "cleanup": [ "/bin" ], "sources": [ { "type": "archive", "url": "https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz", "sha256": "832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874" } ] }, { "name": "ostree", "config-opts": ["--disable-man"], "cleanup": [ "/bin", "/etc/grub.d", "/libexec" ], "sources": [ { "type": "git", "url": "https://github.com/ostreedev/ostree.git" } ] } ] }, - { "name": "discover", "config-opts": ["-DENABLE_TESTING=OFF" , "-DBUILD_SnapBackend=OFF", "-DBUILD_DummyBackend=ON"], "buildsystem": "cmake-ninja", "builddir": true, "sources": [ - { "type": "git", "url": "git://anongit.kde.org/discover.git" }, - { - "type": "file", - "path": "discover/wrapper.sh", - "dest-filename": "discoverwrapper.sh" - } + { "type": "git", "url": "git://anongit.kde.org/discover.git" } ], - "post-install": [ "cp discoverwrapper.sh /app/bin/" ], "modules-not-building": [ { "name": "snapd-glib", "sources": [ { "type": "git", "url": "https://github.com/snapcore/snapd-glib.git", "branch": "master" } ] } ] + }, + { + "name": "wrapper", + "buildsystem": "simple", + "build-commands": [ + "install -m775 discoverwrapper.sh ${FLATPAK_DEST}/bin" + ], + "sources": [ + { + "type": "file", + "path": "discover/wrapper.sh", + "dest-filename": "discoverwrapper.sh" + } + ] } ] }