diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 10ea6d8d..06771614 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ flatpak: variables: APP_ID: org.gnome.GearyDevel FLATPAK_MODULE: geary - MANIFEST_PATH: org.gnome.Geary.json + MANIFEST_PATH: org.gnome.Geary.yml MESON_ARGS: "-Dprofile=development" RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo' TEST_RUN_ARGS: $TEST_ARGS diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json deleted file mode 100644 index 7e33ea6c..00000000 --- a/org.gnome.Geary.json +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Flatpak builder manifest for Geary. - * - * When updating this file after branching a new stable release, - * the following should be updated: - * - * - app branch and geary source branches - * - remove app tags and desktop-file-name-prefix - * - * When updating the Flathub manifest, copy the stable manifest over - * it and pin each source to a specific tarball. - */ - -{ - "app-id": "org.gnome.GearyDevel", - "branch": "master", - "runtime": "org.gnome.Platform", - "runtime-version": "master", - "sdk": "org.gnome.Sdk", - "command": "geary", - - "tags": ["nightly"], - "desktop-file-name-suffix": " (Development)", - - "finish-args": [ - /* X11 + XShm access */ - "--share=ipc", "--socket=x11", - - /* Wayland access */ - "--socket=wayland", - - /* OpenGL access for WK2 */ - "--device=dri", - - /* Pulseaudio */ - "--socket=pulseaudio", - - /* Needs to talk to the network: */ - "--share=network", - - /* Secrets access */ - "--talk-name=org.freedesktop.secrets", - - /* GOA support */ - "--talk-name=org.gnome.ControlCenter", - "--talk-name=org.gnome.OnlineAccounts", - - /* Folks contact and avatar support (via EDS) */ - "--talk-name=org.gnome.evolution.dataserver.AddressBook9", - "--talk-name=org.gnome.evolution.dataserver.Sources5", - "--filesystem=xdg-cache/evolution/addressbook:ro", - - /* Migrate GSettings into the sandbox */ - "--metadata=X-DConf=migrate-path=/org/gnome/Geary/", - - /* Let view source keep on working as-sis for now. Bug 779311. */ - "--filesystem=/tmp" - ], - "cleanup": ["/include", "/lib/pkgconfig", - "/share/pkgconfig", "/share/aclocal", - "/man", "/share/man", "/share/gtk-doc", - "/share/vala", "/share/girepository-1", "/share/gir-1.0", - "*.la", "*.a"], - "modules": [ - { - "name": "gnome-online-accounts", - "config-opts": [ - "--disable-telepathy", - "--disable-documentation", - "--disable-backend", - /* Enabling debug via configure causes both -g and -O0 - to be set, which is bad since the former is - redundant with the default fd.o build-options, - and the latter conflicts with them. So disable - debug instead. */ - "--enable-debug=no" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git", - "branch": "master" - } - ] - }, - { - "name" : "gspell", - "config-opts" : [ - "--disable-gtk-doc", - "--disable-gtk-doc-html" - ], - "cleanup" : [ - "/bin", - "/include", - "/lib/pkgconfig", - "*.la", - "/share" - ], - "sources" : [ - { - "type" : "archive", - "url": "https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz", - "sha256": "819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5" - } - ] - }, - { - "name": "libical", - "cleanup": [ - "/lib/cmake" - ], - "buildsystem": "cmake-ninja", - "config-opts": [ - "-DCMAKE_BUILD_TYPE=Release", - "-DCMAKE_INSTALL_LIBDIR=lib", - "-DBUILD_SHARED_LIBS:BOOL=ON", - "-DICAL_GLIB=true", - "-DGOBJECT_INTROSPECTION=true", - "-DICAL_GLIB_VAPI=true", - "-DICAL_BUILD_DOCS=false" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/libical/libical/releases/download/v3.0.5/libical-3.0.5.tar.gz", - "sha256": "7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6" - } - ] - }, - { - "name": "intltool", - "cleanup": [ "*" ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", - "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" - } - ] - }, - { - "name": "evolution-data-server", - "cleanup": [ - "/lib/cmake", - "/lib/evolution-data-server/*-backends", - "/libexec", - "/share/dbus-1/services" - ], - "config-opts": [ - "-DCMAKE_BUILD_TYPE=Release", - "-DENABLE_GTK=ON", - "-DENABLE_GOA=ON", - "-DENABLE_UOA=OFF", - "-DENABLE_GOOGLE_AUTH=OFF", - "-DENABLE_GOOGLE=OFF", - "-DENABLE_WITH_PHONENUMBER=OFF", - "-DENABLE_VALA_BINDINGS=ON", - "-DENABLE_WEATHER=OFF", - "-DWITH_OPENLDAP=OFF", - "-DWITH_LIBDB=OFF", - "-DENABLE_INTROSPECTION=ON", - "-DENABLE_INSTALLED_TESTS=OFF", - "-DENABLE_GTK_DOC=OFF", - "-DENABLE_EXAMPLES=OFF" - ], - "buildsystem": "cmake-ninja", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git" - } - ] - }, - { - "name": "folks", - "buildsystem": "meson", - "cleanup": [ - "/bin" - ], - "config-opts": [ - "-Dtelepathy_backend=false", - "-Dinspect_tool=false", - "-Dimport_tool=false" - ], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/folks.git" - } - ] - }, - { - "name": "gmime", - "sources": [ - { - "type": "git", - "url": "https://github.com/jstedfast/gmime.git", - "branch": "gmime-2-6" - } - ] - }, - { - "name": "libhandy", - "buildsystem": "meson", - "builddir": true, - "config-opts": [ - "-Dglade_catalog=disabled" - ], - "sources": [ - { - "type": "git", - "url": "https://source.puri.sm/Librem5/libhandy.git" - } - ] - }, - { - "name": "libytnef", - "sources": [ - { - "type": "git", - "url": "https://github.com/Yeraze/ytnef.git", - "branch": "master" - } - ] - }, - { - "name": "geary", - "buildsystem": "meson", - "builddir": true, - "config-opts" : ["-Dprofile=development"], - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/geary.git", - "branch": "mainline" - } - ] - } - ] -} diff --git a/org.gnome.Geary.yml b/org.gnome.Geary.yml new file mode 100644 index 00000000..60a74eb8 --- /dev/null +++ b/org.gnome.Geary.yml @@ -0,0 +1,203 @@ +--- +# Flatpak builder manifest for Geary. +# +# When updating this file after branching a new stable release, the +# following should be updated: +# +# - app branch and geary source branches +# - remove app tags and desktop-file-name-prefix +# +# When updating the Flathub manifest, copy the stable manifest over it +# and pin each source to a specific tarball. +# + +app-id: org.gnome.GearyDevel +branch: master +runtime: org.gnome.Platform +runtime-version: master +sdk: org.gnome.Sdk +command: geary + +desktop-file-name-suffix: " (Development)" +tags: + - "nightly" + +finish-args: + # X11 + XShm access + - "--share=ipc" + - "--socket=x11" + + # Wayland access + - "--socket=wayland" + + # OpenGL access for WK2 + - "--device=dri" + + # Pulseaudio + - "--socket=pulseaudio" + + # Needs to talk to the network + - "--share=network" + + # Secrets access + - "--talk-name=org.freedesktop.secrets" + + # GOA support + - "--talk-name=org.gnome.ControlCenter" + - "--talk-name=org.gnome.OnlineAccounts" + + # Folks contact and avatar support (via EDS) + - "--talk-name=org.gnome.evolution.dataserver.AddressBook9" + - "--talk-name=org.gnome.evolution.dataserver.Sources5" + - "--filesystem=xdg-cache/evolution/addressbook:ro" + + # Migrate GSettings into the sandbox + - "--metadata=X-DConf=migrate-path=/org/gnome/Geary/" + + # Let view source keep on working as-sis for now. Bug 779311. */ + - "--filesystem=/tmp" + +cleanup: + - /include + - /lib/pkgconfig + - /man + - /share/aclocal + - /share/gir-1.0 + - /share/girepository-1 + - /share/gtk-doc + - /share/man + - /share/pkgconfig + - /share/vala + - "*.la" + - "*.a" + +modules: + + # Geary dependency + - name: gnome-online-accounts + config-opts: + - "--disable-telepathy" + - "--disable-documentation" + - "--disable-backend" + # Enabling debug via configure causes both -g and -O0 # to be + # set, which is bad since the former is redundant with the + # default fd.o build-options, and the latter conflicts with + # them. So disable debug instead. + - "--enable-debug=no" + sources: + - type: git + url: "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git" + branch: master + + # Geary dependency + - name: gspell + config-opts: + - "--disable-gtk-doc" + - "--disable-gtk-doc-html" + sources: + - type: archive + url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz + sha256: 819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5 + cleanup: + - /bin + - /share + + # EDS dependency + - name: libical + buildsystem: cmake-ninja + config-opts: + - "-DCMAKE_BUILD_TYPE=Release" + - "-DCMAKE_INSTALL_LIBDIR=lib" + - "-DBUILD_SHARED_LIBS:BOOL=ON" + - "-DICAL_GLIB=true" + - "-DGOBJECT_INTROSPECTION=true" + - "-DICAL_GLIB_VAPI=true" + - "-DICAL_BUILD_DOCS=false" + sources: + - type: archive + url: https://github.com/libical/libical/releases/download/v3.0.5/libical-3.0.5.tar.gz + sha256: 7ad550c8c49c9b9983658e3ab3e68b1eee2439ec17b169a6b1e6ecb5274e78e6 + cleanup: + - /lib/cmake + + # EDS dependency + - name: "intltool" + sources: + - type: archive + url: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz + sha256: 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd + cleanup: + - "*" + + # Geary dependency + - name: evolution-data-server + buildsystem: cmake-ninja + config-opts: + - "-DCMAKE_BUILD_TYPE=Release" + - "-DENABLE_GTK=ON" + - "-DENABLE_GOA=ON" + - "-DENABLE_UOA=OFF" + - "-DENABLE_GOOGLE_AUTH=OFF" + - "-DENABLE_GOOGLE=OFF" + - "-DENABLE_WITH_PHONENUMBER=OFF" + - "-DENABLE_VALA_BINDINGS=ON" + - "-DENABLE_WEATHER=OFF" + - "-DWITH_OPENLDAP=OFF" + - "-DWITH_LIBDB=OFF" + - "-DENABLE_INTROSPECTION=ON" + - "-DENABLE_INSTALLED_TESTS=OFF" + - "-DENABLE_GTK_DOC=OFF" + - "-DENABLE_EXAMPLES=OFF" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/evolution-data-server.git + cleanup: + - /lib/cmake + - /lib/evolution-data-server/*-backends + - /libexec + - /share/dbus-1/services + + # Geary dependency + - name: folks + buildsystem: meson + config-opts: + - "-Dtelepathy_backend=false" + - "-Dinspect_tool=false" + - "-Dimport_tool=false" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/folks.git + cleanup: + - /bin + + # Geary dependency + - name: gmime + sources: + - type: git + url: https://github.com/jstedfast/gmime.git + branch: gmime-2-6 + + # Geary dependency + - name: libhandy + buildsystem: meson + config-opts: + - "-Dglade_catalog=disabled" + sources: + - type: git + url: https://source.puri.sm/Librem5/libhandy.git + + # Geary dependency + - name: "libytnef" + sources: + - type: git + url: https://github.com/Yeraze/ytnef.git + branch: master + + - name: geary + buildsystem: meson + config-opts: + - "-Dprofile=development" + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/geary.git + branch: mainline