diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f57f01a1..2dc051558 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: tasks.flatpak - manifest-path: io.elementary.tasks.yml + manifest-path: io.elementary.tasks.json run-tests: true repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6a01f5976..d14f4cfe8 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -34,7 +34,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: tasks.flatpak - manifest-path: io.elementary.tasks.yml + manifest-path: io.elementary.tasks.json repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo cache-key: "flatpak-builder-${{ github.sha }}" @@ -72,7 +72,7 @@ jobs: - name: Update Translation Files uses: elementary/actions/gettext-flatpak@main with: - manifest-path: 'io.elementary.tasks.yml' + manifest-path: 'io.elementary.tasks.json' env: GIT_USER_NAME: "elementaryBot" GIT_USER_EMAIL: "builds@elementary.io" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba4f9fdb5..acb524c95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6 with: bundle: tasks.flatpak - manifest-path: io.elementary.tasks.yml + manifest-path: io.elementary.tasks.json run-tests: true repository-name: appcenter repository-url: https://flatpak.elementary.io/repo.flatpakrepo diff --git a/io.elementary.tasks.json b/io.elementary.tasks.json new file mode 100644 index 000000000..150be8651 --- /dev/null +++ b/io.elementary.tasks.json @@ -0,0 +1,222 @@ +{ + "app-id": "io.elementary.tasks", + "runtime": "io.elementary.Platform", + "runtime-version": "7.1", + "sdk": "io.elementary.Sdk", + "command": "io.elementary.tasks", + "finish-args": [ + "--device=dri", + "--share=ipc", + "--share=network", + "--socket=fallback-x11", + "--socket=wayland", + "--system-talk-name=org.freedesktop.GeoClue2", + "--talk-name=org.gnome.evolution.dataserver.Calendar8", + "--talk-name=org.gnome.evolution.dataserver.Sources5", + "--metadata=X-DConf=migrate-path=/io/elementary/tasks/" + ], + "cleanup": [ + "/include", + "/lib/pkgconfig", + "/share/vala", + "*.a", + "*.la" + ], + "modules": [ + { + "name": "libical", + "buildsystem": "cmake-ninja", + "cleanup": [ + "/lib/cmake" + ], + "config-opts": [ + "-DCMAKE_BUILD_TYPE=RelWithDebInfo", + "-DCMAKE_INSTALL_LIBDIR=/app/lib", + "-DBUILD_SHARED_LIBS=ON", + "-DICAL_GLIB=true", + "-DICAL_GLIB_VAPI=true", + "-DGOBJECT_INTROSPECTION=true", + "-DICAL_BUILD_DOCS=false" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/libical/libical/releases/download/v3.0.16/libical-3.0.16.tar.gz", + "sha256": "b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33" + } + ] + }, + { + "name": "evolution-data-server", + "buildsystem": "cmake-ninja", + "cleanup": [ + "/lib/evolution-data-server/*-backends", + "/libexec", + "/share/dbus-1/services" + ], + "config-opts": [ + "-DCMAKE_BUILD_TYPE=RelWithDebInfo", + "-DENABLE_GTK=ON", + "-DENABLE_VALA_BINDINGS=ON", + "-DENABLE_INTROSPECTION=ON", + "-DENABLE_GOA=OFF", + "-DENABLE_CANBERRA=OFF", + "-DWITH_LIBDB=OFF", + "-DENABLE_WEATHER=OFF", + "-DWITH_OPENLDAP=OFF", + "-DENABLE_INSTALLED_TESTS=OFF", + "-DENABLE_GTK=OFF", + "-DENABLE_GTK_DOC=OFF", + "-DENABLE_EXAMPLES=OFF" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/evolution-data-server/3.46/evolution-data-server-3.46.4.tar.xz", + "sha256": "a59b254145c59facd7c7b5382db78dc5f0ed1f6a6e9b8fe7d5e75959f93c0cc8" + }, + { + "type": "patch", + "path": "eds-gdatasession.patch" + } + ], + "modules": [ + { + "name": "intltool", + "cleanup": [ + "*" + ], + "sources": [ + { + "type": "archive", + "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", + "md5": "12e517cac2b57a0121cda351570f1e63" + } + ] + } + ] + }, + { + "name": "clutter-gtk", + "cleanup": [ + "/share/gtk-doc" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz", + "sha256": "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" + } + ], + "modules": [ + { + "name": "cogl", + "config-opts": [ + "--disable-cogl-gst", + "--disable-gtk-doc", + "--enable-xlib-egl-platform", + "--enable-wayland-egl-platform" + ], + "cleanup": [ + "/share/gtk-doc", + "/share/cogl/examples-data" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz", + "sha256": "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" + } + ] + }, + { + "name": "clutter", + "config-opts": [ + "--disable-gtk-doc", + "--enable-egl-backend", + "--enable-wayland-backend", + "--enable-deprecated=no" + ], + "cleanup": [ + "/share/gtk-doc" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz", + "sha256": "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" + } + ] + }, + { + "name": "clutter-gst", + "config-opts": [ + "--disable-gtk-doc" + ], + "cleanup": [ + "/share/gtk-doc" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz", + "sha256": "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" + } + ] + } + ] + }, + { + "name": "champlain", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/libchamplain/0.12/libchamplain-0.12.21.tar.xz", + "sha256": "a915cd172a0c52944c5579fcb4683f8a878c571bf5e928254b5dafefc727e5a7" + } + ] + }, + { + "name": "geocode-glib", + "buildsystem": "meson", + "config-opts": [ + "-Denable-installed-tests=false", + "-Denable-gtk-doc=false", + "-Dsoup2=false" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/geocode-glib/3.26/geocode-glib-3.26.4.tar.xz", + "sha256": "2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa" + } + ] + }, + { + "name": "libportal", + "buildsystem": "meson", + "config-opts": [ + "-Ddocs=false", + "-Dbackends=['gtk3']" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz", + "sha256": "88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566" + } + ] + }, + { + "name": "tasks", + "buildsystem": "meson", + "sources": [ + { + "type": "dir", + "path": "." + } + ] + } + ] +} diff --git a/io.elementary.tasks.yml b/io.elementary.tasks.yml deleted file mode 100644 index 17a3ae337..000000000 --- a/io.elementary.tasks.yml +++ /dev/null @@ -1,154 +0,0 @@ -app-id: io.elementary.tasks -runtime: io.elementary.Platform -runtime-version: '7.1' -sdk: io.elementary.Sdk -command: io.elementary.tasks -finish-args: - - '--device=dri' - - '--share=ipc' - - '--share=network' - - '--socket=fallback-x11' - - '--socket=wayland' - - - '--system-talk-name=org.freedesktop.GeoClue2' - - # EDS DBus interfaces - - '--talk-name=org.gnome.evolution.dataserver.Calendar8' - - '--talk-name=org.gnome.evolution.dataserver.Sources5' - - - '--metadata=X-DConf=migrate-path=/io/elementary/tasks/' -cleanup: - - '/include' - - '/lib/pkgconfig' - - '/share/vala' - - '*.a' - - '*.la' -modules: - - name: libical - buildsystem: cmake-ninja - cleanup: - - '/lib/cmake' - config-opts: - - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' - - '-DCMAKE_INSTALL_LIBDIR=/app/lib' - - '-DBUILD_SHARED_LIBS=ON' - - '-DICAL_GLIB=true' - - '-DICAL_GLIB_VAPI=true' - - '-DGOBJECT_INTROSPECTION=true' - - '-DICAL_BUILD_DOCS=false' - sources: - - type: archive - url: https://github.com/libical/libical/releases/download/v3.0.16/libical-3.0.16.tar.gz - sha256: b44705dd71ca4538c86fb16248483ab4b48978524fb1da5097bd76aa2e0f0c33 - - - name: evolution-data-server - buildsystem: cmake-ninja - cleanup: - - '/lib/evolution-data-server/*-backends' - - '/libexec' - - '/share/dbus-1/services' - config-opts: - - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' - - '-DENABLE_GTK=ON' - - '-DENABLE_VALA_BINDINGS=ON' - - '-DENABLE_INTROSPECTION=ON' - - '-DENABLE_GOA=OFF' - - '-DENABLE_CANBERRA=OFF' - - '-DWITH_LIBDB=OFF' - - '-DENABLE_WEATHER=OFF' - - '-DWITH_OPENLDAP=OFF' - - '-DENABLE_INSTALLED_TESTS=OFF' - - '-DENABLE_GTK=OFF' - - '-DENABLE_GTK_DOC=OFF' - - '-DENABLE_EXAMPLES=OFF' - sources: - - type: archive - url: https://download.gnome.org/sources/evolution-data-server/3.46/evolution-data-server-3.46.4.tar.xz - sha256: a59b254145c59facd7c7b5382db78dc5f0ed1f6a6e9b8fe7d5e75959f93c0cc8 - - type: patch - path: 'eds-gdatasession.patch' - modules: - - name: intltool - cleanup: - - '*' - sources: - - type: archive - url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz - md5: 12e517cac2b57a0121cda351570f1e63 - - - name: clutter-gtk - cleanup: - - "/share/gtk-doc" - sources: - - type: archive - url: https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz - sha256: 521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06 - modules: - - name: cogl - config-opts: - - "--disable-cogl-gst" - - "--disable-gtk-doc" - - "--enable-xlib-egl-platform" - - "--enable-wayland-egl-platform" - cleanup: - - "/share/gtk-doc" - - "/share/cogl/examples-data" - sources: - - type: archive - url: https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz - sha256: a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759 - - name: clutter - config-opts: - - "--disable-gtk-doc" - - "--enable-egl-backend" - - "--enable-wayland-backend" - - "--enable-deprecated=no" - cleanup: - - "/share/gtk-doc" - sources: - - type: archive - url: https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz - sha256: 8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6 - - name: clutter-gst - config-opts: - - "--disable-gtk-doc" - cleanup: - - "/share/gtk-doc" - sources: - - type: archive - url: https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz - sha256: fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d - - - name: champlain - buildsystem: meson - sources: - - type: archive - url: https://download.gnome.org/sources/libchamplain/0.12/libchamplain-0.12.21.tar.xz - sha256: a915cd172a0c52944c5579fcb4683f8a878c571bf5e928254b5dafefc727e5a7 - - - name: geocode-glib - buildsystem: meson - config-opts: - - '-Denable-installed-tests=false' - - '-Denable-gtk-doc=false' - - '-Dsoup2=false' - sources: - - type: archive - url: https://download.gnome.org/sources/geocode-glib/3.26/geocode-glib-3.26.4.tar.xz - sha256: 2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa - - - name: libportal - buildsystem: meson - config-opts: - - '-Ddocs=false' - - "-Dbackends=['gtk3']" - sources: - - type: archive - url: https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz - sha256: 88a12c3ba71bc31acff7238c280de697d609cebc50830c3766776ec35abc6566 - - - name: tasks - buildsystem: meson - sources: - - type: dir - path: .