diff options
author | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-10-03 20:38:35 +0300 |
---|---|---|
committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-10-03 20:38:35 +0300 |
commit | edbaeb1b588edc0e969b0eedd731758aad369391 (patch) | |
tree | 9c865a0d2d6319d77c0c369819a37188837028c7 /flatpak | |
parent | 30629c1629c7ac15f00340e8d205be59eade1ce9 (diff) |
Multiple changes to build and run with libsoup 3.0
Diffstat (limited to 'flatpak')
-rw-r--r-- | flatpak/org.remmina.Remmina-local.json | 93 | ||||
-rw-r--r-- | flatpak/org.remmina.Remmina.json | 67 | ||||
-rw-r--r-- | flatpak/requirements/webkit.json | 60 |
3 files changed, 133 insertions, 87 deletions
diff --git a/flatpak/org.remmina.Remmina-local.json b/flatpak/org.remmina.Remmina-local.json index 6bf4a0aad..b2da8f60f 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": "42", + "runtime-version": "43", "sdk": "org.gnome.Sdk", "command": "remmina", "cleanup": [ @@ -49,9 +49,9 @@ "add-extensions": { "org.freedesktop.Platform.ffmpeg-full": { "directory": "lib/ffmpeg", - "version": "21.08", + "version": "22.08", "add-ld-path": ".", - "no-autodownload": false, + "no-autodownload": true, "autodelete": false }, "org.freedesktop.Platform.openh264": { @@ -61,8 +61,8 @@ } }, "cleanup-commands": [ - "mkdir -p /app/lib/ffmpeg", - "mkdir -p /app/lib/openh264" + "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg", + "mkdir -p ${FLATPAK_DEST}/lib/openh264" ], "modules": [ "shared-modules/intltool/intltool-0.51.json", @@ -113,12 +113,13 @@ "sources": [ { "type": "archive", - "url": "https://xorg.freedesktop.org/archive/individual/app/xauth-1.1.1.tar.bz2", - "sha256": "164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92", + "url": "https://xorg.freedesktop.org/archive/individual/app/xauth-1.1.2.tar.xz", + "sha256": "78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200", "x-checker-data": { "type": "anitya", "project-id": 5253, - "url-template": "https://xorg.freedesktop.org/archive/individual/app/xauth-$version.tar.bz2" + "stable-only": true, + "url-template": "https://xorg.freedesktop.org/archive/individual/app/xauth-$version.tar.xz" } } ] @@ -135,8 +136,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/OpenPrinting/cups/archive/refs/tags/v2.4.1.tar.gz", - "sha256": "df195c931349949293c832e1337527e7831e1225f567b60caf5d9c206c2bffdc", + "url": "https://github.com/OpenPrinting/cups/archive/refs/tags/v2.4.2.tar.gz", + "sha256": "7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682", "x-checker-data": { "type": "anitya", "project-id": 380, @@ -152,8 +153,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtk-vnc/1.3/gtk-vnc-1.3.0.tar.xz", - "sha256": "5faaa5823b8cbe8c0b0ba1e456c4e70c4b1ae6685c9fe81a4282d98cf00a211d", + "url": "https://download.gnome.org/sources/gtk-vnc/1.3/gtk-vnc-1.3.1.tar.xz", + "sha256": "512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce", "x-checker-data": { "type": "gnome", "name": "gtk-vnc", @@ -169,8 +170,8 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/vte.git", - "tag": "0.68.0", - "commit": "0f438924f9f8a858b1b82434c876e31c2de180d4", + "tag": "0.70.0", + "commit": "ae4a5d7df9e32ab40ceca5e06240561e819db148", "x-checker-data": { "type": "git", "tag-pattern": "^([\\d.]+)$" @@ -252,8 +253,8 @@ { "type": "git", "url": "https://github.com/LudovicRousseau/PCSC.git", - "tag": "pcsc-1.9.0", - "commit": "e796a0f12fbefa459bff0d25e27089615fa91f21", + "tag": "1.9.9", + "commit": "15c16c7796607b1c8a2ce253d3f536918ab26b4a", "x-checker-data": { "type": "git", "tag-pattern": "^pcsc-([\\d.]+)$" @@ -272,13 +273,14 @@ "config-opts": [ "-Dvapi=enabled", "-Dwebdav=enabled", - "-Dgtk_doc=disabled" + "-Dgtk_doc=disabled", + "-Dpolkit=disabled" ], "sources": [ { "type": "archive", - "url": "https://www.spice-space.org/download/gtk/spice-gtk-0.40.tar.xz", - "sha256": "23f5ff7fa80b75647ce73cda5eaf8b322f3432dbbb7f6f3a839634618adbced3", + "url": "https://www.spice-space.org/download/gtk/spice-gtk-0.41.tar.xz", + "sha256": "d8f8b5cbea9184702eeb8cc276a67d72acdb6e36e7c73349fb8445e5bca0969f", "x-checker-data": { "type": "anitya", "project-id": 11576, @@ -296,8 +298,8 @@ "sources": [ { "type": "file", - "url": "https://files.pythonhosted.org/packages/d9/41/d9cfb4410589805cd787f8a82cddd13142d9bf7449d12adf2d05a4a7d633/pyparsing-3.0.8-py3-none-any.whl", - "sha256": "ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06", + "url": "https://files.pythonhosted.org/packages/6c/10/a7d0fa5baea8fe7b50f448ab742f26f52b80bfca85ac2be9d35cdd9a3246/pyparsing-3.0.9-py3-none-any.whl", + "sha256": "5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc", "x-checker-data": { "type": "pypi", "name": "pyparsing", @@ -339,8 +341,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz", - "sha256": "030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1", + "url": "https://github.com/lz4/lz4/archive/v1.9.4/lz4-1.9.4.tar.gz", + "sha256": "0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b", "x-checker-data": { "type": "anitya", "project-id": 1865, @@ -359,15 +361,11 @@ "/bin", "/sbin" ], - "config-opts": [ - "-Dgtk_doc=disabled", - "-Dsystemd=disabled" - ], "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/phodav/2.5/phodav-2.5.tar.xz", - "sha256": "71f0a9cd70afd4dd1412a0298331dbb8ac71c0377f52117afc15eb88dc6fb910", + "url": "https://download.gnome.org/sources/phodav/3.0/phodav-3.0.tar.xz", + "sha256": "392ec2d06d50300dcff1ef269a2a985304e29bce3520002fca29f2edc1d138d1", "x-checker-data": { "type": "gnome", "name": "phodav", @@ -412,14 +410,9 @@ "name": "libsodium", "sources": [ { - "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" - } + "type": "git", + "url": "https://github.com/jedisct1/libsodium.git", + "commit": "7389bf7f2968be75520e932704f18f038c29e581" } ], "post-install": [ @@ -462,14 +455,9 @@ ], "sources": [ { - "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" - } + "type": "git", + "url": "https://github.com/LibVNC/libvncserver.git", + "branch": "master" } ] }, @@ -478,30 +466,32 @@ "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=ON", + "-DCHANNEL_TSMF:BOOL=OFF", "-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.7.0", - "commit": "40ee5d3bcc70343af6c0300d71968858c1f1948f", + "tag": "2.8.0", + "commit": "e3fc97feb512053189e276b2ca79762990bb8c4c", "x-checker-data": { "type": "git", "tag-pattern": "^([\\d.]+)$" @@ -526,7 +516,8 @@ "-DWITH_GVNC:BOOL=ON", "-DWITH_CUPS:BOOL=ON", "-DWITH_PYTHONLIBS:BOOL=ON", - "-DWITH_MANPAGES:BOOL=OFF" + "-DWITH_MANPAGES:BOOL=OFF", + "-DWITH_WWW=ON" ], "sources": [ { diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json index c044ee5ec..756d3fae4 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": "42", + "runtime-version": "43", "sdk": "org.gnome.Sdk", "command": "remmina", "cleanup": [ @@ -49,9 +49,9 @@ "add-extensions": { "org.freedesktop.Platform.ffmpeg-full": { "directory": "lib/ffmpeg", - "version": "21.08", + "version": "22.08", "add-ld-path": ".", - "no-autodownload": false, + "no-autodownload": true, "autodelete": false }, "org.freedesktop.Platform.openh264": { @@ -61,8 +61,8 @@ } }, "cleanup-commands": [ - "mkdir -p /app/lib/ffmpeg", - "mkdir -p /app/lib/openh264" + "mkdir -p ${FLATPAK_DEST}/lib/ffmpeg", + "mkdir -p ${FLATPAK_DEST}/lib/openh264" ], "modules": [ "shared-modules/intltool/intltool-0.51.json", @@ -153,8 +153,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtk-vnc/1.3/gtk-vnc-1.3.0.tar.xz", - "sha256": "5faaa5823b8cbe8c0b0ba1e456c4e70c4b1ae6685c9fe81a4282d98cf00a211d", + "url": "https://download.gnome.org/sources/gtk-vnc/1.3/gtk-vnc-1.3.1.tar.xz", + "sha256": "512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce", "x-checker-data": { "type": "gnome", "name": "gtk-vnc", @@ -170,8 +170,8 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/vte.git", - "tag": "0.68.0", - "commit": "0f438924f9f8a858b1b82434c876e31c2de180d4", + "tag": "0.70.0", + "commit": "ae4a5d7df9e32ab40ceca5e06240561e819db148", "x-checker-data": { "type": "git", "tag-pattern": "^([\\d.]+)$" @@ -253,8 +253,8 @@ { "type": "git", "url": "https://github.com/LudovicRousseau/PCSC.git", - "tag": "pcsc-1.9.0", - "commit": "e796a0f12fbefa459bff0d25e27089615fa91f21", + "tag": "1.9.9", + "commit": "15c16c7796607b1c8a2ce253d3f536918ab26b4a", "x-checker-data": { "type": "git", "tag-pattern": "^pcsc-([\\d.]+)$" @@ -273,13 +273,14 @@ "config-opts": [ "-Dvapi=enabled", "-Dwebdav=enabled", - "-Dgtk_doc=disabled" + "-Dgtk_doc=disabled", + "-Dpolkit=disabled" ], "sources": [ { "type": "archive", - "url": "https://www.spice-space.org/download/gtk/spice-gtk-0.40.tar.xz", - "sha256": "23f5ff7fa80b75647ce73cda5eaf8b322f3432dbbb7f6f3a839634618adbced3", + "url": "https://www.spice-space.org/download/gtk/spice-gtk-0.41.tar.xz", + "sha256": "d8f8b5cbea9184702eeb8cc276a67d72acdb6e36e7c73349fb8445e5bca0969f", "x-checker-data": { "type": "anitya", "project-id": 11576, @@ -340,8 +341,8 @@ "sources": [ { "type": "archive", - "url": "https://github.com/lz4/lz4/archive/v1.9.3/lz4-1.9.3.tar.gz", - "sha256": "030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1", + "url": "https://github.com/lz4/lz4/archive/v1.9.4/lz4-1.9.4.tar.gz", + "sha256": "0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b", "x-checker-data": { "type": "anitya", "project-id": 1865, @@ -360,15 +361,11 @@ "/bin", "/sbin" ], - "config-opts": [ - "-Dgtk_doc=disabled", - "-Dsystemd=disabled" - ], "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/phodav/2.5/phodav-2.5.tar.xz", - "sha256": "71f0a9cd70afd4dd1412a0298331dbb8ac71c0377f52117afc15eb88dc6fb910", + "url": "https://download.gnome.org/sources/phodav/3.0/phodav-3.0.tar.xz", + "sha256": "392ec2d06d50300dcff1ef269a2a985304e29bce3520002fca29f2edc1d138d1", "x-checker-data": { "type": "gnome", "name": "phodav", @@ -458,14 +455,9 @@ ], "sources": [ { - "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" - } + "type": "git", + "url": "https://github.com/LibVNC/libvncserver.git", + "branch": "master" } ] }, @@ -474,30 +466,32 @@ "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=ON", + "-DCHANNEL_TSMF:BOOL=OFF", "-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.7.0", - "commit": "40ee5d3bcc70343af6c0300d71968858c1f1948f", + "tag": "2.8.0", + "commit": "e3fc97feb512053189e276b2ca79762990bb8c4c", "x-checker-data": { "type": "git", "tag-pattern": "^([\\d.]+)$" @@ -522,7 +516,8 @@ "-DWITH_GVNC:BOOL=ON", "-DWITH_CUPS:BOOL=ON", "-DWITH_PYTHON_LIBS:BOOL=ON", - "-DWITH_MANPAGES:BOOL=OFF" + "-DWITH_MANPAGES:BOOL=OFF", + "-DWITH_WWW=ON" ], "sources": [ { diff --git a/flatpak/requirements/webkit.json b/flatpak/requirements/webkit.json new file mode 100644 index 000000000..429b2dcb4 --- /dev/null +++ b/flatpak/requirements/webkit.json @@ -0,0 +1,60 @@ +/* +Shared module for building and installing webkit2gtk + +This file was written by hand. + +File based on gfeeds: +commit f3e8575d62b1701e885b0bda54222634130c6864 + +Changes applied to this version of the file: +* added this header +* reformatted +*/ +{ + "name": "webkit2gtk-5", + "buildsystem": "cmake-ninja", + "config-opts": [ + "-DPORT=GTK", + "-DCMAKE_BUILD_TYPE=Release", + "-DCMAKE_INSTALL_PREFIX=/app", + "-DCMAKE_INSTALL_LIBDIR=lib", + "-DCMAKE_INSTALL_LIBEXECDIR=lib", + "-DCMAKE_SKIP_RPATH=ON", + "-DUSE_GTK4=ON", + "-DENABLE_GAMEPAD=OFF", + "-DENABLE_GTKDOC=OFF" + ], + "modules": [ + { + "name": "bubblewrap", + "buildsystem": "meson", + "config-opts": [], + "sources": [ + { + "type": "archive", + "url": "https://github.com/containers/bubblewrap/archive/refs/tags/v0.6.1.tar.gz", + "sha256": "2b21ee6d2bead1aaf7c35742e5e53b061ec6eb1644889a4379fda662b03e8121" + } + ] + }, + { + "name": "xdg-dbus-proxy", + "buildsystem": "autotools", + "config-opts": [], + "sources": [ + { + "type": "archive", + "url": "https://github.com/flatpak/xdg-dbus-proxy/archive/refs/tags/0.1.3.tar.gz", + "sha256": "a1d57f0d478bee4cc2be67e84ac6fcfe729460345d8a4fadd6555ae83b14a789" + } + ] + } + ], + "sources": [ + { + "type": "archive", + "url": "https://webkitgtk.org/releases/webkitgtk-2.36.1.tar.xz", + "sha256": "0149ea5fb1d20f2a9981677d45c952a047330001ea24a8dc29035239f12c0c8f" + } + ] +} |