[evolution/bilelmoussaoui/flatpak: 2/5] Flatpak: Move dependencies around

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 53e59c6fff122d224b2a748a43f31110a998554a
Author: Bilal Elmoussaoui <belmouss redhat com>
Date:   Fri Mar 25 18:03:43 2022 +0100

    Flatpak: Move dependencies around
    
    In order for the flatpak manifest to work properly with Builder or other IDEs
    The latest module should be the one that builds the application so that
    the IDE in question can build the local checkout using the build configuration
    set in the manifest.
    
    Ideally it should not contain any extra scripts to run neither

 flatpak/org.gnome.Evolution.json | 134 +++++++++++++++------------------------
 1 file changed, 50 insertions(+), 84 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution.json b/flatpak/org.gnome.Evolution.json
index 4668ab36fb..7e0bb6b682 100644
--- a/flatpak/org.gnome.Evolution.json
+++ b/flatpak/org.gnome.Evolution.json
@@ -357,47 +357,33 @@
             ]
         },
         {
-            "name": "evolution",
-            "buildsystem": "cmake-ninja",
+            "name": "libsecret",
+            "buildsystem": "meson",
             "config-opts": [
-                "-DENABLE_AUTOAR=OFF",
-                "-DENABLE_CONTACT_MAPS=OFF",
-                "-DENABLE_GNOME_DESKTOP=OFF",
-                "-DENABLE_GTK_DOC=OFF",
-                "-DENABLE_INSTALLED_TESTS=OFF",
-                "-DENABLE_PST_IMPORT=OFF",
-                "-DENABLE_TEXT_HIGHLIGHT=OFF",
-                "-DENABLE_YTNEF=OFF",
-                "-DWITH_BOGOFILTER=/app/bin/bogofilter",
-                "-DWITH_GLADE_CATALOG=OFF",
-                "-DWITH_HELP=OFF",
-                "-DWITH_WMCLASS_OVERRIDE=evolution.bin"
-            ],
-            "cleanup": [
-                "/etc/xdg",
-                "/share/GConf",
-                "/share/man"
+                "-Dmanpage=false",
+                "-Dvapi=false",
+                "-Dgtk_doc=false"
             ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/libsecret/0.19/libsecret-0.19.1.tar.xz";,
+                    "sha256": "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
+                }
+            ]
+        },
+        {
+            "name": "evolution-ews",
+            "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/evolution.git";,
+                    "url": "https://gitlab.gnome.org/GNOME/evolution-ews.git";,
                     "branch": "master"
-                },
-                {
-                    "type": "shell",
-                    "commands": [
-                        "cp config.h.in config.h.in.orig",
-                        "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| \\(flatpak git$(git log 
--pretty=format:%h --max-count=1)\\)|\" >config.h.in",
-                        "cp data/org.gnome.Evolution.appdata.xml.in.in 
data/org.gnome.Evolution.appdata.xml.in.in.orig",
-                        "cat data/org.gnome.Evolution.appdata.xml.in.in.orig | sed -e 
\"s|\\@APPDATA_RELEASES\\@|APPDATA_RELEASES|\" >data/org.gnome.Evolution.appdata.xml.in.in"
-                    ]
                 }
             ],
             "post-install": [
-                "cp NEWS /app/share/NEWS.evo",
-                "cp news-to-appdata.c /app/share/",
-                "mv /app/share/metainfo/org.gnome.Evolution.appdata.xml /app/share/"
+                "cp NEWS /app/share/NEWS.ews"
             ]
         },
         {
@@ -421,67 +407,47 @@
             ]
         },
         {
-            "name": "evolution-ews",
+            "name": "evolution",
             "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DENABLE_AUTOAR=OFF",
+                "-DENABLE_CONTACT_MAPS=OFF",
+                "-DENABLE_GNOME_DESKTOP=OFF",
+                "-DENABLE_GTK_DOC=OFF",
+                "-DENABLE_INSTALLED_TESTS=OFF",
+                "-DENABLE_PST_IMPORT=OFF",
+                "-DENABLE_TEXT_HIGHLIGHT=OFF",
+                "-DENABLE_YTNEF=OFF",
+                "-DWITH_BOGOFILTER=/app/bin/bogofilter",
+                "-DWITH_GLADE_CATALOG=OFF",
+                "-DWITH_HELP=OFF",
+                "-DWITH_WMCLASS_OVERRIDE=evolution.bin"
+            ],
+            "cleanup": [
+                "/etc/xdg",
+                "/share/GConf",
+                "/share/man"
+            ],
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/evolution-ews.git";,
+                    "url": "https://gitlab.gnome.org/GNOME/evolution.git";,
                     "branch": "master"
-                }
-            ],
-            "post-install": [
-                "cp NEWS /app/share/NEWS.ews"
-            ]
-        },
-        {
-            "name": "news-to-appdata",
-            "buildsystem": "simple",
-            "sources": [
+                },
                 {
-                    "type": "script",
+                    "type": "shell",
                     "commands": [
-                        "gcc /app/share/news-to-appdata.c -g -O0 -o news-to-appdata `pkg-config --cflags 
--libs glib-2.0`",
-                        "TYPE=${1}",
-                        "VER=$(pkg-config --modversion evolution-shell-3.0)",
-                        "if [ \"${VER}\" = \"\" ]; then",
-                        "   echo \"Failed to get evolution version\" 1>&2",
-                        "   exit 1",
-                        "fi",
-                        "VER=${VER%.*}",
-                        "APPDATA_RELEASES=`./news-to-appdata \"\" ${TYPE} ${VER} /app/share/NEWS.evo ${VER} 
/app/share/NEWS.eds ${VER} /app/share/NEWS.ews`",
-                        "APPDATA=`cat /app/share/org.gnome.Evolution.appdata.xml`",
-                        "if [ \"${APPDATA_RELEASES}\" = \"\" ]; then",
-                        "    APPDATA_RELEASES=\"<release version=\\\"$(pkg-config --modversion 
evolution-shell-3.0)\\\" date=\\\"$(date +%Y-%m-%d)\\\" type=\\\"${TYPE}\\\"/>\"",
-                        "fi",
-                        "echo 
\"${APPDATA%APPDATA_RELEASES*}${APPDATA_RELEASES}${APPDATA#*APPDATA_RELEASES}\">/app/share/metainfo/org.gnome.Evolution.appdata.xml",
-                        "rm /app/share/NEWS.eds",
-                        "rm /app/share/NEWS.evo",
-                        "rm /app/share/NEWS.ews",
-                        "rm /app/share/news-to-appdata.c",
-                        "rm /app/share/org.gnome.Evolution.appdata.xml"
-                    ],
-                    "dest-filename": "update-appdata.sh"
+                        "cp config.h.in config.h.in.orig",
+                        "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| \\(flatpak git$(git log 
--pretty=format:%h --max-count=1)\\)|\" >config.h.in",
+                        "cp data/org.gnome.Evolution.appdata.xml.in.in 
data/org.gnome.Evolution.appdata.xml.in.in.orig",
+                        "cat data/org.gnome.Evolution.appdata.xml.in.in.orig | sed -e 
\"s|\\@APPDATA_RELEASES\\@|APPDATA_RELEASES|\" >data/org.gnome.Evolution.appdata.xml.in.in"
+                    ]
                 }
             ],
-            "build-commands": [
-                "./update-appdata.sh development"
-            ]
-        },
-        {
-            "name": "libsecret",
-            "buildsystem": "meson",
-            "config-opts": [
-                "-Dmanpage=false",
-                "-Dvapi=false",
-                "-Dgtk_doc=false"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.19/libsecret-0.19.1.tar.xz";,
-                    "sha256": "8583e10179456ae2c83075d95455f156dc08db6278b32bf4bd61819335a30e3a"
-                }
+            "post-install": [
+                "cp NEWS /app/share/NEWS.evo",
+                "cp news-to-appdata.c /app/share/",
+                "mv /app/share/metainfo/org.gnome.Evolution.appdata.xml /app/share/"
             ]
         }
     ]