vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

build: Build flatpaks on GNOME 43 runtime

Browse source
This commit is contained in:
Kévin Commaille 2023-02-21 18:00:20 +01:00
parent 3188c3b7c6
commit 80c8ae16be
No known key found for this signature in database
GPG key ID: DD507DAE96E8245C
3 changed files with 104 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
flatpak/org.gnome.Fractal-release.json
View file

@ -1,48 +1,51 @@
{ {
"app-id" : "org.gnome.Fractal", "app-id": "org.gnome.Fractal",
"runtime" : "org.gnome.Platform", "runtime": "org.gnome.Platform",
"runtime-version" : "3.36", "runtime-version": "43",
"sdk" : "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"sdk-extensions" : [ "sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable" "org.freedesktop.Sdk.Extension.rust-stable"
], ],
"command" : "fractal", "command": "fractal",
"finish-args" : [ "finish-args": [
"--share=network", "--share=network",
"--share=ipc", "--share=ipc",
"--socket=x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--socket=pulseaudio", "--socket=pulseaudio",
"--device=dri", "--device=dri",
"--talk-name=org.freedesktop.secrets", "--talk-name=org.freedesktop.secrets",
"--talk-name=org.freedesktop.Notifications", "--talk-name=org.freedesktop.Notifications"
"--filesystem=home"
], ],
"build-options" : { "build-options": {
"append-path" : "/usr/lib/sdk/rust-stable/bin", "append-path": "/usr/lib/sdk/rust-stable/bin",
"build-args" : [ "build-args": [
"--share=network" "--share=network"
], ]
"env" : {
"CARGO_HOME" : "/run/build/Fractal/cargo",
"RUST_BACKTRACE" : "1"
}
}, },
"add-extensions": { "add-extensions": {
"org.freedesktop.Platform.ffmpeg-full": { "org.freedesktop.Platform.ffmpeg-full": {
"directory": "lib/ffmpeg", "directory": "lib/ffmpeg",
"version": "19.08", "version": "22.08",
"add-ld-path": "." "add-ld-path": "."
} }
}, },
"cleanup-commands": [ "cleanup-commands": [
"mkdir -p /app/lib/ffmpeg" "mkdir -p /app/lib/ffmpeg"
], ],
"modules" : [ "cleanup": [
"/include",
"/lib/pkgconfig",
"/lib/*.la",
"/lib/girepository-1.0",
"/share/gir-1.0",
"/share/vala"
],
"modules": [
{ {
"name" : "libhandy", "name": "libhandy",
"buildsystem" : "meson", "buildsystem": "meson",
"config-opts" : [ "config-opts": [
"-Dprofiling=false", "-Dprofiling=false",
"-Dintrospection=enabled", "-Dintrospection=enabled",
"-Dgtk_doc=false", "-Dgtk_doc=false",
@ -51,21 +54,21 @@
"-Dvapi=false", "-Dvapi=false",
"-Dglade_catalog=disabled" "-Dglade_catalog=disabled"
], ],
"sources" : [ "sources": [
{ {
"type" : "git", "type": "git",
"url" : "https://source.puri.sm/Librem5/libhandy", "url": "https://source.puri.sm/Librem5/libhandy",
"tag" : "v0.0.13" "tag": "v0.0.13"
} }
] ]
}, },
{ {
"name" : "gspell", "name": "gspell",
"config-opts" : [ "config-opts": [
"--disable-gtk-doc", "--disable-gtk-doc",
"--disable-gtk-doc-html" "--disable-gtk-doc-html"
], ],
"cleanup" : [ "cleanup": [
"/bin", "/bin",
"/include", "/include",
"/lib/pkgconfig", "/lib/pkgconfig",
@ -74,40 +77,39 @@
"/share/gtk-doc", "/share/gtk-doc",
"/share/vala" "/share/vala"
], ],
"sources" : [ "sources": [
{ {
"type" : "archive", "type": "archive",
"url" : "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.2.tar.xz", "url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.4.tar.xz",
"sha256" : "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6" "sha256": "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4"
} }
] ]
}, },
{ {
"name" : "gst-editing-services", "name": "gst-editing-services",
"config-opts" : [ "buildsystem": "meson",
"--disable-Werror" "sources": [
],
"sources" : [
{ {
"type" : "git", "type": "git",
"url" : "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git", "url": "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
"tag" : "1.16.1" "tag": "1.18.5",
"commit": "29dcc5c1a54f1fabf470bff15dd92b266c527909"
} }
] ]
}, },
{ {
"name" : "Fractal", "name": "Fractal",
"buildsystem" : "meson", "buildsystem": "meson",
"config-opts" : [ "config-opts": [
"-Dprofile=default" "-Dprofile=default"
], ],
"sources" : [ "sources": [
{ {
"type" : "git", "type": "git",
"branch" : "release-4.4.0", "branch": "release-4.4.0",
"url" : ".." "url": ".."
} }
] ]
} }
] ]
} }

107
flatpak/org.gnome.Fractal.json
View file

@ -1,54 +1,48 @@
{ {
"app-id" : "org.gnome.FractalDevel", "app-id": "org.gnome.FractalDevel",
"runtime" : "org.gnome.Platform", "runtime": "org.gnome.Platform",
"runtime-version" : "3.36", "runtime-version": "43",
"sdk" : "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"sdk-extensions" : [ "sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable" "org.freedesktop.Sdk.Extension.rust-stable"
], ],
"command" : "fractal", "command": "fractal",
"tags" : [ "tags": [
"devel", "devel",
"development", "development",
"nightly" "nightly"
], ],
"finish-args" : [ "finish-args": [
"--share=network", "--share=network",
"--share=ipc", "--share=ipc",
"--socket=x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--socket=pulseaudio", "--socket=pulseaudio",
"--device=dri", "--device=dri",
"--talk-name=org.freedesktop.secrets", "--talk-name=org.freedesktop.secrets",
"--talk-name=org.freedesktop.Notifications", "--talk-name=org.freedesktop.Notifications"
"--filesystem=home"
], ],
"build-options" : { "build-options": {
"append-path" : "/usr/lib/sdk/rust-stable/bin", "append-path": "/usr/lib/sdk/rust-stable/bin",
"build-args" : [ "build-args": [
"--share=network" "--share=network"
], ]
"env" : {
"CARGO_HOME" : "/run/build/Fractal/cargo",
"RUST_BACKTRACE" : "1",
"RUSTFLAGS" : ""
}
}, },
"add-extensions": { "add-extensions": {
"org.freedesktop.Platform.ffmpeg-full": { "org.freedesktop.Platform.ffmpeg-full": {
"directory": "lib/ffmpeg", "directory": "lib/ffmpeg",
"version": "19.08", "version": "22.08",
"add-ld-path": "." "add-ld-path": "."
} }
}, },
"cleanup-commands": [ "cleanup-commands": [
"mkdir -p /app/lib/ffmpeg" "mkdir -p /app/lib/ffmpeg"
], ],
"modules" : [ "modules": [
{ {
"name" : "libhandy", "name": "libhandy",
"buildsystem" : "meson", "buildsystem": "meson",
"config-opts" : [ "config-opts": [
"-Dprofiling=false", "-Dprofiling=false",
"-Dintrospection=enabled", "-Dintrospection=enabled",
"-Dgtk_doc=false", "-Dgtk_doc=false",
@ -57,21 +51,21 @@
"-Dvapi=false", "-Dvapi=false",
"-Dglade_catalog=disabled" "-Dglade_catalog=disabled"
], ],
"sources" : [ "sources": [
{ {
"type" : "git", "type": "git",
"url" : "https://source.puri.sm/Librem5/libhandy.git", "url": "https://source.puri.sm/Librem5/libhandy.git",
"tag" : "v0.0.13" "tag": "v0.0.13"
} }
] ]
}, },
{ {
"name" : "gspell", "name": "gspell",
"config-opts" : [ "config-opts": [
"--disable-gtk-doc", "--disable-gtk-doc",
"--disable-gtk-doc-html" "--disable-gtk-doc-html"
], ],
"cleanup" : [ "cleanup": [
"/bin", "/bin",
"/include", "/include",
"/lib/pkgconfig", "/lib/pkgconfig",
@ -79,41 +73,40 @@
"/share/gir-1.0", "/share/gir-1.0",
"/share/gtk-doc", "/share/gtk-doc",
"/share/vala" "/share/vala"
],
"sources" : [
{
"type" : "archive",
"url" : "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.2.tar.xz",
"sha256" : "bb9195c3a95bacf556d0203e9691f7489e0d3bc5ae1e5a440c89b2f2435d3ed6"
}
]
},
{
"name" : "gst-editing-services",
"config-opts" : [
"--disable-Werror"
], ],
"sources" : [ "sources": [
{ {
"type" : "git", "type": "archive",
"url" : "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git", "url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.4.tar.xz",
"tag" : "1.16.1" "sha256": "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4"
} }
] ]
}, },
{ {
"name" : "fractal", "name": "gst-editing-services",
"buildsystem" : "meson", "buildsystem": "meson",
"builddir" : true, "sources": [
"config-opts" : [ {
"type": "git",
"url": "https://gitlab.freedesktop.org/gstreamer/gst-editing-services.git",
"tag": "1.18.5",
"commit": "29dcc5c1a54f1fabf470bff15dd92b266c527909"
}
]
},
{
"name": "fractal",
"buildsystem": "meson",
"builddir": true,
"config-opts": [
"-Dprofile=development" "-Dprofile=development"
], ],
"sources" : [ "sources": [
{ {
"type" : "git", "type": "git",
"url" : "https://gitlab.gnome.org/GNOME/fractal.git" "url": "https://gitlab.gnome.org/GNOME/fractal.git"
} }
] ]
} }
] ]
} }

4
fractal-gtk/res/meson.build
View file

@ -2,7 +2,7 @@ subdir('icons')
desktop_conf = configuration_data() desktop_conf = configuration_data()
desktop_conf.set('icon', application_id) desktop_conf.set('icon', application_id)
desktop_file = i18n.merge_file ('desktop-file', desktop_file = i18n.merge_file (
type: 'desktop', type: 'desktop',
input: configure_file( input: configure_file(
input: files('org.gnome.Fractal.desktop.in.in'), input: files('org.gnome.Fractal.desktop.in.in'),
@ -28,7 +28,7 @@ endif
metainfo_conf = configuration_data() metainfo_conf = configuration_data()
metainfo_conf.set('appid', application_id) metainfo_conf.set('appid', application_id)
metainfo_file = i18n.merge_file ('metainfo-file', metainfo_file = i18n.merge_file (
input: configure_file( input: configure_file(
input: files('org.gnome.Fractal.metainfo.xml.in.in'), input: files('org.gnome.Fractal.metainfo.xml.in.in'),
output: 'org.gnome.Fractal.metainfo.xml.in', output: 'org.gnome.Fractal.metainfo.xml.in',