diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 7e9617e..a8ada96 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -1,36 +1,35 @@ # Maintainer: Bruno Pagani pkgname=fractal -pkgver=4.4.0 -pkgrel=3 +pkgver=4.4.1 +pkgrel=1 pkgdesc="GTK+ client for Matrix written in Rust" arch=(x86_64) url="https://wiki.gnome.org/Apps/Fractal" license=(GPL3) -depends=(gtk3 gst-plugins-base-libs gst-plugin-gtk gst-plugins-bad gst-editing-services gtksourceview4 gspell libhandy0) +depends=(gtk3 gst-plugins-base-libs gst-plugin-gtk gst-plugins-bad gst-editing-services gtksourceview4 gspell libhandy) optdepends=('org.freedesktop.secrets: password storage') -makedepends=(meson rust) -_md5=d4168ac40fd681240964705e000dd353 +makedepends=(meson rust cmake) +_md5=46141d42ea313ecce83c8843f96d2c42 source=("https://gitlab.gnome.org/GNOME/fractal/uploads/${_md5}/${pkgname}-${pkgver}.tar.xz" - fractal-4.4.0-i18n-meson-fix.patch::https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch - fractal-4.4.0-socket2-crates-update.patch - fractal-4.4.0-openssl-crates-update.patch) -sha256sums=('65af7912f3d04bd6b2386b023415fef26afc48d256af205256f86396a1415825' + fractal-4.4.1-i18n-meson-fix.patch::https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch + fractal-4.4.1-openssl-crates-update.patch) +sha256sums=('a072c1680aadfedc069755e9f634a6c963268118cd3ac60c3886eb51eeb9e04e' 'd417d6fef72d83ac790b22f6264ce36135aa45aea338db1ae6b6a771bf03c550' - '3a5ae5c93a86385b6a90fe31f0de0e0630715afd99726006df660022c9c84914' - '48ef0eb97bb9b1ebbfe178a8a0e7e1c8eca13816ba50a599245abb9f771a4d52') + '5263a27e2b1cb296f4a93bcecf05f447a6c912af4609f8c1e19db843f9fe764a') prepare() { cd ${pkgname}-${pkgver} - patch -p1 -i ../fractal-4.4.0-i18n-meson-fix.patch - patch -p1 -i ../fractal-4.4.0-socket2-crates-update.patch - patch -p1 -i ../fractal-4.4.0-openssl-crates-update.patch + sed -i 's/deny/allow/' fractal-gtk/src/main.rs # Do not treat linting issues as fatal + patch -Np1 -i ../fractal-4.4.1-i18n-meson-fix.patch + patch -Np1 -i ../fractal-4.4.1-openssl-crates-update.patch rm .cargo/config # remove config enabling vendoring so updated crates will be downloaded } build() { cd ${pkgname}-${pkgver} CFLAGS+=' -ffat-lto-objects' + CXXFLAGS+=' -ffat-lto-objects' arch-meson . _build meson compile -C _build } diff --git a/trunk/fractal-4.4.1-i18n-meson-fix.patch b/trunk/fractal-4.4.1-i18n-meson-fix.patch new file mode 100644 index 0000000..655dcb3 --- /dev/null +++ b/trunk/fractal-4.4.1-i18n-meson-fix.patch @@ -0,0 +1,35 @@ +From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001 +From: Jonas Platte +Date: Sun, 31 Oct 2021 15:23:31 +0100 +Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file + +See https://github.com/mesonbuild/meson/issues/9441 +--- + fractal-gtk/res/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build +index 7a7a7d656..a176787c0 100644 +--- a/fractal-gtk/res/meson.build ++++ b/fractal-gtk/res/meson.build +@@ -2,7 +2,7 @@ subdir('icons') + + desktop_conf = configuration_data() + desktop_conf.set('icon', application_id) +-desktop_file = i18n.merge_file ('desktop-file', ++desktop_file = i18n.merge_file ( + type: 'desktop', + input: configure_file( + input: files('org.gnome.Fractal.desktop.in.in'), +@@ -28,7 +28,7 @@ endif + + metainfo_conf = configuration_data() + metainfo_conf.set('appid', application_id) +-metainfo_file = i18n.merge_file ('metainfo-file', ++metainfo_file = i18n.merge_file ( + input: configure_file( + input: files('org.gnome.Fractal.metainfo.xml.in.in'), + output: 'org.gnome.Fractal.metainfo.xml.in', +-- +GitLab + diff --git a/trunk/fractal-4.4.1-openssl-crates-update.patch b/trunk/fractal-4.4.1-openssl-crates-update.patch new file mode 100644 index 0000000..ffd32bb --- /dev/null +++ b/trunk/fractal-4.4.1-openssl-crates-update.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 6dbb6ba..389e200 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2204,9 +2204,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + + [[package]] + name = "openssl" +-version = "0.10.33" ++version = "0.10.38" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" ++checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" + dependencies = [ + "bitflags", + "cfg-if 1.0.0", +@@ -2224,9 +2224,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-sys" +-version = "0.9.61" ++version = "0.9.72" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" ++checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" + dependencies = [ + "autocfg", + "cc",