updated flatpak manifest files to match github

2 files changed, 97 insertions, 88 deletions

diff --git a/flatpak/org.remmina.Remmina-local.json b/flatpak/org.remmina.Remmina-local.json
index b2da8f60f..13a0c430e 100644
--- a/flatpak/org.remmina.Remmina-local.json
+++ b/flatpak/org.remmina.Remmina-local.json
@@ -1,7 +1,7 @@
 {
     "app-id": "org.remmina.Remmina",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "43",
+    "runtime-version": "42",
     "sdk": "org.gnome.Sdk",
     "command": "remmina",
     "cleanup": [
@@ -26,7 +26,6 @@
         "--socket=pulseaudio",
         "--socket=ssh-auth",
         "--socket=wayland",
-        "--socket=x11",
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
         "--device=all",
         "--talk-name=ca.desrt.dconf",
@@ -49,9 +48,9 @@
     "add-extensions": {
         "org.freedesktop.Platform.ffmpeg-full": {
             "directory": "lib/ffmpeg",
-            "version": "22.08",
+            "version": "21.08",
             "add-ld-path": ".",
-            "no-autodownload": true,
+            "no-autodownload": false,
             "autodelete": false
         },
         "org.freedesktop.Platform.openh264": {
@@ -61,8 +60,8 @@
         }
     },
     "cleanup-commands": [
-        "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg",
-        "mkdir -p ${FLATPAK_DEST}/lib/openh264"
+        "mkdir -p /app/lib/ffmpeg",
+        "mkdir -p /app/lib/openh264"
     ],
     "modules": [
         "shared-modules/intltool/intltool-0.51.json",
@@ -95,12 +94,12 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-1.1.3.tar.bz2",
-                    "sha256": "9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731",
+                    "url": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-1.1.4.tar.xz",
+                    "sha256": "210de3ab9c3e9382572c25d17c2518a854ce6e2c62c5f8315deac7579e758244",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 1785,
-                        "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-$version.tar.bz2"
+                        "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-$version.tar.xz"
                     }
                 }
             ]
@@ -170,8 +169,8 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/vte.git",
-                    "tag": "0.70.0",
-                    "commit": "ae4a5d7df9e32ab40ceca5e06240561e819db148",
+                    "tag": "0.70.1",
+                    "commit": "5bf476f1d7283bc805ac8ae6abe94f81ffd7be05",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^([\\d.]+)$"
@@ -253,8 +252,8 @@
                 {
                     "type": "git",
                     "url": "https://github.com/LudovicRousseau/PCSC.git",
-                    "tag": "1.9.9",
-                    "commit": "15c16c7796607b1c8a2ce253d3f536918ab26b4a",
+                    "tag": "pcsc-1.9.0",
+                    "commit": "e796a0f12fbefa459bff0d25e27089615fa91f21",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^pcsc-([\\d.]+)$"
@@ -273,8 +272,7 @@
             "config-opts": [
                 "-Dvapi=enabled",
                 "-Dwebdav=enabled",
-                "-Dgtk_doc=disabled",
-                "-Dpolkit=disabled"
+                "-Dgtk_doc=disabled"
             ],
             "sources": [
                 {
@@ -361,15 +359,22 @@
                         "/bin",
                         "/sbin"
                     ],
+                    "config-opts": [
+                        "-Dgtk_doc=disabled",
+                        "-Dsystemd=disabled"
+                    ],
                     "sources": [
                         {
                             "type": "archive",
-                            "url": "https://download.gnome.org/sources/phodav/3.0/phodav-3.0.tar.xz",
-                            "sha256": "392ec2d06d50300dcff1ef269a2a985304e29bce3520002fca29f2edc1d138d1",
+                            "url": "https://download.gnome.org/sources/phodav/2.5/phodav-2.5.tar.xz",
+                            "sha256": "71f0a9cd70afd4dd1412a0298331dbb8ac71c0377f52117afc15eb88dc6fb910",
                             "x-checker-data": {
                                 "type": "gnome",
                                 "name": "phodav",
-                                "stable-only": false
+                                "stable-only": false,
+                                "versions": {
+                                    "<": "3"
+                                }
                             }
                         }
                     ]
@@ -410,9 +415,14 @@
             "name": "libsodium",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/jedisct1/libsodium.git",
-                    "commit": "7389bf7f2968be75520e932704f18f038c29e581"
+                    "type": "archive",
+                    "url": "https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz",
+                    "sha256": "b7292dd1da67a049c8e78415cd498ec138d194cfdb302e716b08d26b80fecc10",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1728,
+                        "url-template": "https://github.com/jedisct1/libsodium/archive/$version.tar.gz"
+                    }
                 }
             ],
             "post-install": [
@@ -432,12 +442,12 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://www.libssh.org/files/0.9/libssh-0.9.6.tar.xz",
-                    "sha256": "86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b",
+                    "url": "https://www.libssh.org/files/0.10/libssh-0.10.4.tar.xz",
+                    "sha256": "07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 1729,
-                        "url-template": "https://www.libssh.org/files/0.9/libssh-$version.tar.xz"
+                        "url-template": "https://www.libssh.org/files/0.10/libssh-$version.tar.xz"
                     }
                 }
             ]
@@ -455,9 +465,14 @@
             ],
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/LibVNC/libvncserver.git",
-                    "branch": "master"
+                    "type": "archive",
+                    "url": "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz",
+                    "sha256": "0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1756,
+                        "url-template": "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$version.tar.gz"
+                    }
                 }
             ]
         },
@@ -466,32 +481,30 @@
             "buildsystem": "cmake-ninja",
             "cleanup": [],
             "config-opts": [
-                "-DCMAKE_VERBOSE_MAKEFILE=ON",
                 "-DCMAKE_BUILD_TYPE:STRING=Release",
                 "-DCMAKE_INSTALL_LIBDIR:PATH=lib",
                 "-DWITH_WAYLAND:BOOL=ON",
-                "-DCHANNEL_TSMF:BOOL=OFF",
+                "-DCHANNEL_TSMF:BOOL=ON",
                 "-DCHANNEL_URBDRC:BOOL=ON",
                 "-DBUILD_TESTING:BOOL=OFF",
+                "-DWITH_ICU:BOOL=ON",
                 "-DWITH_MANPAGES:BOOL=OFF",
                 "-DWITH_GSSAPI:BOOL=OFF",
                 "-DWITH_PCSC:BOOL=ON",
-                "-DWITH_PKCS11:BOOL=ON",
-                "-DWITH_SWSCALE:BOOL=ON",
                 "-DWITH_SERVER:BOOL=OFF",
                 "-DWITH_CUPS:BOOL=ON",
                 "-DWITH_FFMPEG:BOOL=ON",
-                "-DWITH_DSP_FFMPEG:BOOL=ON",
                 "-DWITH_OSS:BOOL=OFF",
                 "-DWITH_PULSE:BOOL=ON",
+                "-DWITH_CHANNELS:BOOL=ON",
                 "-DWITH_LIBSYSTEMD:BOOL=OFF"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/FreeRDP/FreeRDP.git",
-                    "tag": "2.8.0",
-                    "commit": "e3fc97feb512053189e276b2ca79762990bb8c4c",
+                    "tag": "2.9.0",
+                    "commit": "fa8e1b1c765a4466030ac52240f052c0b440a4d1",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^([\\d.]+)$"
@@ -510,14 +523,12 @@
             ],
             "config-opts": [
                 "-DCMAKE_BUILD_TYPE:STRING=Debug",
-                "-DWITH_NEWS:BOOL=ON",
                 "-DCMAKE_INSTALL_LIBDIR:PATH=lib",
                 "-DWITH_FREERDP3:BOOL=OFF",
                 "-DWITH_GVNC:BOOL=ON",
                 "-DWITH_CUPS:BOOL=ON",
                 "-DWITH_PYTHONLIBS:BOOL=ON",
-                "-DWITH_MANPAGES:BOOL=OFF",
-                "-DWITH_WWW=ON"
+                "-DWITH_MANPAGES:BOOL=OFF"
             ],
             "sources": [
                 {
diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json
index 756d3fae4..6187e2d78 100644
--- a/flatpak/org.remmina.Remmina.json
+++ b/flatpak/org.remmina.Remmina.json
@@ -1,7 +1,7 @@
 {
     "app-id": "org.remmina.Remmina",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "43",
+    "runtime-version": "42",
     "sdk": "org.gnome.Sdk",
     "command": "remmina",
     "cleanup": [
@@ -26,7 +26,6 @@
         "--socket=pulseaudio",
         "--socket=ssh-auth",
         "--socket=wayland",
-        "--socket=x11",
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
         "--device=all",
         "--talk-name=ca.desrt.dconf",
@@ -49,9 +48,9 @@
     "add-extensions": {
         "org.freedesktop.Platform.ffmpeg-full": {
             "directory": "lib/ffmpeg",
-            "version": "22.08",
+            "version": "21.08",
             "add-ld-path": ".",
-            "no-autodownload": true,
+            "no-autodownload": false,
             "autodelete": false
         },
         "org.freedesktop.Platform.openh264": {
@@ -61,8 +60,8 @@
         }
     },
     "cleanup-commands": [
-        "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg",
-        "mkdir -p ${FLATPAK_DEST}/lib/openh264"
+        "mkdir -p /app/lib/ffmpeg",
+        "mkdir -p /app/lib/openh264"
     ],
     "modules": [
         "shared-modules/intltool/intltool-0.51.json",
@@ -70,9 +69,6 @@
         "shared-modules/libappindicator/libappindicator-gtk3-12.10.json",
         "shared-modules/libusb/libusb.json",
         {
-            /**
-            * libfreerdp uses xprop to try to detect keyboard layout
-            */
             "name": "xprop",
             "sources": [
                 {
@@ -88,27 +84,21 @@
             ]
         },
         {
-            /**
-            * Remmina uses xauth, that needs libXmu
-            */
             "name": "libXmu",
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-1.1.3.tar.bz2",
-                    "sha256": "9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731",
+                    "url": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-1.1.4.tar.xz",
+                    "sha256": "210de3ab9c3e9382572c25d17c2518a854ce6e2c62c5f8315deac7579e758244",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 1785,
-                        "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-$version.tar.bz2"
+                        "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-$version.tar.xz"
                     }
                 }
             ]
         },
         {
-            /**
-            * Remmina uses xauth with the SSH X11 Forwarding
-            */
             "name": "xauth",
             "sources": [
                 {
@@ -170,8 +160,8 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/vte.git",
-                    "tag": "0.70.0",
-                    "commit": "ae4a5d7df9e32ab40ceca5e06240561e819db148",
+                    "tag": "0.70.1",
+                    "commit": "5bf476f1d7283bc805ac8ae6abe94f81ffd7be05",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^([\\d.]+)$"
@@ -253,8 +243,8 @@
                 {
                     "type": "git",
                     "url": "https://github.com/LudovicRousseau/PCSC.git",
-                    "tag": "1.9.9",
-                    "commit": "15c16c7796607b1c8a2ce253d3f536918ab26b4a",
+                    "tag": "pcsc-1.9.0",
+                    "commit": "e796a0f12fbefa459bff0d25e27089615fa91f21",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^pcsc-([\\d.]+)$"
@@ -273,8 +263,7 @@
             "config-opts": [
                 "-Dvapi=enabled",
                 "-Dwebdav=enabled",
-                "-Dgtk_doc=disabled",
-                "-Dpolkit=disabled"
+                "-Dgtk_doc=disabled"
             ],
             "sources": [
                 {
@@ -352,24 +341,28 @@
                     ]
                 },
                 {
-                    /**
-                    * For webdav (shared folder) support
-                    */
                     "name": "phodav",
                     "buildsystem": "meson",
                     "cleanup": [
                         "/bin",
                         "/sbin"
                     ],
+                    "config-opts": [
+                        "-Dgtk_doc=disabled",
+                        "-Dsystemd=disabled"
+                    ],
                     "sources": [
                         {
                             "type": "archive",
-                            "url": "https://download.gnome.org/sources/phodav/3.0/phodav-3.0.tar.xz",
-                            "sha256": "392ec2d06d50300dcff1ef269a2a985304e29bce3520002fca29f2edc1d138d1",
+                            "url": "https://download.gnome.org/sources/phodav/2.5/phodav-2.5.tar.xz",
+                            "sha256": "71f0a9cd70afd4dd1412a0298331dbb8ac71c0377f52117afc15eb88dc6fb910",
                             "x-checker-data": {
                                 "type": "gnome",
                                 "name": "phodav",
-                                "stable-only": false
+                                "stable-only": false,
+                                "versions": {
+                                    "<": "3"
+                                }
                             }
                         }
                     ]
@@ -410,9 +403,14 @@
             "name": "libsodium",
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/jedisct1/libsodium.git",
-                    "commit": "7389bf7f2968be75520e932704f18f038c29e581"
+                    "type": "archive",
+                    "url": "https://github.com/jedisct1/libsodium/archive/1.0.18-RELEASE.tar.gz",
+                    "sha256": "b7292dd1da67a049c8e78415cd498ec138d194cfdb302e716b08d26b80fecc10",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1728,
+                        "url-template": "https://github.com/jedisct1/libsodium/archive/$version.tar.gz"
+                    }
                 }
             ],
             "post-install": [
@@ -432,12 +430,12 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://www.libssh.org/files/0.9/libssh-0.9.6.tar.xz",
-                    "sha256": "86bcf885bd9b80466fe0e05453c58b877df61afa8ba947a58c356d7f0fab829b",
+                    "url": "https://www.libssh.org/files/0.10/libssh-0.10.4.tar.xz",
+                    "sha256": "07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 1729,
-                        "url-template": "https://www.libssh.org/files/0.9/libssh-$version.tar.xz"
+                        "url-template": "https://www.libssh.org/files/0.10/libssh-$version.tar.xz"
                     }
                 }
             ]
@@ -455,9 +453,14 @@
             ],
             "sources": [
                 {
-                    "type": "git",
-                    "url": "https://github.com/LibVNC/libvncserver.git",
-                    "branch": "master"
+                    "type": "archive",
+                    "url": "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz",
+                    "sha256": "0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 1756,
+                        "url-template": "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$version.tar.gz"
+                    }
                 }
             ]
         },
@@ -466,32 +469,30 @@
             "buildsystem": "cmake-ninja",
             "cleanup": [],
             "config-opts": [
-                "-DCMAKE_VERBOSE_MAKEFILE=ON",
                 "-DCMAKE_BUILD_TYPE:STRING=Release",
                 "-DCMAKE_INSTALL_LIBDIR:PATH=lib",
                 "-DWITH_WAYLAND:BOOL=ON",
-                "-DCHANNEL_TSMF:BOOL=OFF",
+                "-DCHANNEL_TSMF:BOOL=ON",
                 "-DCHANNEL_URBDRC:BOOL=ON",
                 "-DBUILD_TESTING:BOOL=OFF",
+                "-DWITH_ICU:BOOL=ON",
                 "-DWITH_MANPAGES:BOOL=OFF",
                 "-DWITH_GSSAPI:BOOL=OFF",
                 "-DWITH_PCSC:BOOL=ON",
-                "-DWITH_PKCS11:BOOL=ON",
-                "-DWITH_SWSCALE:BOOL=ON",
                 "-DWITH_SERVER:BOOL=OFF",
                 "-DWITH_CUPS:BOOL=ON",
                 "-DWITH_FFMPEG:BOOL=ON",
-                "-DWITH_DSP_FFMPEG:BOOL=ON",
                 "-DWITH_OSS:BOOL=OFF",
                 "-DWITH_PULSE:BOOL=ON",
+                "-DWITH_CHANNELS:BOOL=ON",
                 "-DWITH_LIBSYSTEMD:BOOL=OFF"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/FreeRDP/FreeRDP.git",
-                    "tag": "2.8.0",
-                    "commit": "e3fc97feb512053189e276b2ca79762990bb8c4c",
+                    "tag": "2.9.0",
+                    "commit": "fa8e1b1c765a4466030ac52240f052c0b440a4d1",
                     "x-checker-data": {
                         "type": "git",
                         "tag-pattern": "^([\\d.]+)$"
@@ -500,7 +501,6 @@
             ]
         },
         {
-            /* Remmina main build */
             "name": "remmina",
             "buildsystem": "cmake-ninja",
             "cleanup": [
@@ -510,14 +510,12 @@
             ],
             "config-opts": [
                 "-DCMAKE_BUILD_TYPE:STRING=Release",
-                "-DWITH_NEWS:BOOL=ON",
                 "-DCMAKE_INSTALL_LIBDIR:PATH=lib",
                 "-DWITH_FREERDP3:BOOL=OFF",
                 "-DWITH_GVNC:BOOL=ON",
                 "-DWITH_CUPS:BOOL=ON",
-                "-DWITH_PYTHON_LIBS:BOOL=ON",
-                "-DWITH_MANPAGES:BOOL=OFF",
-                "-DWITH_WWW=ON"
+                "-DWITH_PYTHONLIBS:BOOL=ON",
+                "-DWITH_MANPAGES:BOOL=OFF"
             ],
             "sources": [
                 {