[evolution/gnome-3-30] Improve Flatpak manifests



commit b90aec34e5a20332ed3ebf44ca82c010ed8a6678
Author: Milan Crha <mcrha redhat com>
Date:   Tue Sep 11 13:29:00 2018 +0200

    Improve Flatpak manifests

 flatpak/org.gnome.Evolution-master.json | 77 +++++++++++++--------------------
 flatpak/org.gnome.Evolution-stable.json | 75 +++++++++++++-------------------
 2 files changed, 61 insertions(+), 91 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index 94307c21f5..159c73402e 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -1,7 +1,7 @@
 {
        "app-id": "org.gnome.Evolution",
        "runtime": "org.gnome.Platform",
-       "runtime-version": "3.26",
+       "runtime-version": "3.28",
        "sdk": "org.gnome.Sdk",
        "command": "evolution",
        "rename-icon": "evolution",
@@ -27,15 +27,15 @@
                "--socket=x11",
                "--socket=wayland",
                "--socket=pulseaudio",
-                "--talk-name=org.freedesktop.Notifications",
-                "--talk-name=org.freedesktop.portal.Desktop",
-                "--talk-name=org.gnome.OnlineAccounts"
+               "--talk-name=org.freedesktop.Notifications",
+               "--talk-name=org.freedesktop.portal.Desktop",
+               "--talk-name=org.gnome.OnlineAccounts"
        ],
        "modules": [
                {
                        "name": "libical",
                        "cleanup": [ "/lib/cmake" ],
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "config-opts": [
                                "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib",
                                "-DBUILD_SHARED_LIBS:BOOL=ON",
@@ -137,6 +137,7 @@
 
                {
                        "name": "openldap",
+                       "rm-configure": true,
                        "cleanup": [
                                "/bin",
                                "/share/man"
@@ -153,8 +154,16 @@
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.tgz";,
-                                       "sha256": 
"cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"
+                                       "url": 
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.tgz";,
+                                       "sha256": 
"9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
+                               },
+
+                               {
+                                       "type": "script",
+                                       "dest-filename": "autogen.sh",
+                                       "commands": [
+                                               "AUTOMAKE=\"/bin/true\" autoreconf -vfi"
+                                       ]
                                }
                        ]
                },
@@ -179,41 +188,9 @@
                        ]
                },
 
-               {
-                       "name": "libgpg-error",
-                       "cleanup": [
-                               "/bin",
-                               "/share/common-lisp",
-                               "/share/info",
-                               "/share/man"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2";,
-                                       "sha256": 
"4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"
-                               }
-                       ]
-               },
-
-               {
-                       "name": "libgcrypt",
-                       "cleanup": [
-                               "/bin",
-                               "/share/info",
-                               "/share/man"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2";,
-                                       "sha256": 
"7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3"
-                               }
-                       ]
-               },
-
                {
                        "name": "gnome-keyring",
+                       "rm-configure": true,
                        "config-opts": [
                                "--with-pkcs11-config=/app/share/gk-to-remove",
                                "--with-pkcs11-modules=/app/share/gk-to-remove",
@@ -230,15 +207,23 @@
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz";,
-                                       "sha256": 
"97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c"
+                                       "url": 
"https://download.gnome.org/sources/gnome-keyring/3.28/gnome-keyring-3.28.2.tar.xz";,
+                                       "sha256": 
"81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a"
+                               },
+
+                               {
+                                       "type": "script",
+                                       "dest-filename": "autogen.sh",
+                                       "commands": [
+                                               "AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
+                                       ]
                                }
                        ]
                },
 
                {
                        "name": "evolution-data-server",
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "cleanup": [ "/share/GConf" ],
                        "config-opts": [
                                "-DENABLE_FILE_LOCKING=fcntl",
@@ -285,7 +270,7 @@
 
                {
                        "name": "evolution",
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "config-opts": [
                                "-DENABLE_AUTOAR=OFF",
                                "-DENABLE_CONTACT_MAPS=OFF",
@@ -313,7 +298,7 @@
                                        "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 HEAD^..HEAD)\\)|\" >config.h.in"
+                                               "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| 
\\(flatpak git$(git log --pretty=format:%h --max-count=1)\\)|\" >config.h.in"
                                        ]
                                },
 
@@ -370,7 +355,7 @@
 
                {
                        "name": "evolution-ews",
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "sources": [
                                {
                                        "type": "git",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 2190da43b8..7e86ab3a75 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -26,15 +26,15 @@
                "--socket=x11",
                "--socket=wayland",
                "--socket=pulseaudio",
-                "--talk-name=org.gnome.OnlineAccounts",
-                "--talk-name=org.freedesktop.Notifications",
-                "--talk-name=org.freedesktop.portal.Desktop"
+               "--talk-name=org.freedesktop.Notifications",
+               "--talk-name=org.freedesktop.portal.Desktop",
+               "--talk-name=org.gnome.OnlineAccounts"
        ],
        "modules": [
                {
                        "name": "libical",
                        "cleanup": [ "/lib/cmake" ],
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "config-opts": [
                                "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib",
                                "-DBUILD_SHARED_LIBS:BOOL=ON",
@@ -136,6 +136,7 @@
 
                {
                        "name": "openldap",
+                       "rm-configure": true,
                        "cleanup": [
                                "/bin",
                                "/share/man"
@@ -152,8 +153,16 @@
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.tgz";,
-                                       "sha256": 
"cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"
+                                       "url": 
"http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.tgz";,
+                                       "sha256": 
"9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
+                               },
+
+                               {
+                                       "type": "script",
+                                       "dest-filename": "autogen.sh",
+                                       "commands": [
+                                               "AUTOMAKE=\"/bin/true\" autoreconf -vfi"
+                                       ]
                                }
                        ]
                },
@@ -178,41 +187,9 @@
                        ]
                },
 
-               {
-                       "name": "libgpg-error",
-                       "cleanup": [
-                               "/bin",
-                               "/share/common-lisp",
-                               "/share/info",
-                               "/share/man"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2";,
-                                       "sha256": 
"4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"
-                               }
-                       ]
-               },
-
-               {
-                       "name": "libgcrypt",
-                       "cleanup": [
-                               "/bin",
-                               "/share/info",
-                               "/share/man"
-                       ],
-                       "sources": [
-                               {
-                                       "type": "archive",
-                                       "url": 
"https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.1.tar.bz2";,
-                                       "sha256": 
"7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3"
-                               }
-                       ]
-               },
-
                {
                        "name": "gnome-keyring",
+                       "rm-configure": true,
                        "config-opts": [
                                "--with-pkcs11-config=/app/share/gk-to-remove",
                                "--with-pkcs11-modules=/app/share/gk-to-remove",
@@ -229,15 +206,23 @@
                        "sources": [
                                {
                                        "type": "archive",
-                                       "url": 
"https://download.gnome.org/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz";,
-                                       "sha256": 
"97964e723f454be509c956ed5e38b5c2fd7363f43bd3f153b94a4a63eb888c8c"
+                                       "url": 
"https://download.gnome.org/sources/gnome-keyring/3.28/gnome-keyring-3.28.2.tar.xz";,
+                                       "sha256": 
"81171b7d07211b216b4c9bb79bf2deb3deca18fe8d56d46dda1c4549b4a2646a"
+                               },
+
+                               {
+                                       "type": "script",
+                                       "dest-filename": "autogen.sh",
+                                       "commands": [
+                                               "AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
+                                       ]
                                }
                        ]
                },
 
                {
                        "name": "evolution-data-server",
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "cleanup": [ "/share/GConf" ],
                        "config-opts": [
                                "-DENABLE_FILE_LOCKING=fcntl",
@@ -284,7 +269,7 @@
 
                {
                        "name": "evolution",
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "config-opts": [
                                "-DENABLE_AUTOAR=OFF",
                                "-DENABLE_CONTACT_MAPS=OFF",
@@ -312,7 +297,7 @@
                                        "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 HEAD^..HEAD)\\)|\" >config.h.in"
+                                               "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| 
\\(flatpak git$(git log --pretty=format:%h --max-count=1)\\)|\" >config.h.in"
                                        ]
                                },
 
@@ -369,7 +354,7 @@
 
                {
                        "name": "evolution-ews",
-                       "buildsystem": "cmake",
+                       "buildsystem": "cmake-ninja",
                        "sources": [
                                {
                                        "type": "git",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]