community/fractal: upgrade to 4.4.2

5 files changed, 62 insertions, 277 deletions

diff --git a/community/fractal/APKBUILD b/community/fractal/APKBUILD
index 0a01c3b1146..71ed1702550 100644
--- a/community/fractal/APKBUILD
+++ b/community/fractal/APKBUILD
@@ -1,22 +1,37 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=fractal
-pkgver=4.4.0
-pkgrel=3
+pkgver=4.4.2
+pkgrel=0
 pkgdesc="Matrix group messaging app"
 url="https://wiki.gnome.org/Apps/Fractal"
 arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by Rust
 license="GPL-3.0-or-later"
-depends="dbus:org.freedesktop.Secrets xdg-utils"
-makedepends="meson gtk+3.0-dev dbus-dev openssl-dev>3 gspell-dev libhandy-dev
-	gtksourceview4-dev gstreamer-dev gst-plugins-base-dev gst-plugins-bad-dev
-	gst-editing-services-dev glib-dev cargo gmp-dev gst-plugins-good-gtk"
+depends="
+	dbus:org.freedesktop.Secrets
+	gst-plugins-good-gtk
+	xdg-utils
+	"
+makedepends="
+	cargo
+	dbus-dev
+	glib-dev
+	gmp-dev
+	gspell-dev
+	gst-editing-services-dev
+	gst-plugins-bad-dev
+	gst-plugins-base-dev
+	gstreamer-dev
+	gtk+3.0-dev
+	gtksourceview4-dev
+	libhandy-dev
+	meson
+	openssl-dev
+	"
 options="!check" # no tests
 subpackages="$pkgname-lang"
-source="$pkgname-$pkgver-2.tar.gz::https://gitlab.gnome.org/GNOME/fractal/-/archive/$pkgver/fractal-$pkgver.tar.gz
-	meson-0.60.patch
-	openssl3.patch
-	socket2.patch
+source="$pkgname-$pkgver.tar.gz::https://gitlab.gnome.org/GNOME/fractal/-/archive/$pkgver/fractal-$pkgver.tar.gz
+	cargo-home.patch
 	"
 
 case "$CARCH" in
@@ -35,8 +50,6 @@ package() {
 }
 
 sha512sums="
-9cc8bf78c68ce6e5a902a2d9977fd03ade7071439d46f95257dd70732f42bf5e16be8b37e152d5e10d7f4d83b615e9c37710b9ff1e3a31010d2c068ab5a91303  fractal-4.4.0-2.tar.gz
-852a04feb051d641085c7e84d81e4f3eb8fb917e779569547bedfdd6445181f9faf9f33a21235c467da9a02b2f043b00cbc7ffe63f899a0778d81c5d116ddbde  meson-0.60.patch
-ed4048c91d034af9110c572a7ffa271f587d67d943861fc3bb62620815d03b2837ce51d8132345a7bb43f5fc9ad0b1d63a90255700ca08c9bd6d1701d447af61  openssl3.patch
-6c75a1cd01198f3c72860db35a403599d5d364c27d12ce78134caa5a3fa64a4d8ede35f8c84a4eccf0602f577d711cf453cd5bbaf1e090eb0d6acfcf9512b608  socket2.patch
+a1574af97596f0edba8356f73eb1dbfbf6d871032a7cba95e4d72d3c7f0a725bbf82ef99e59848d9a7a2c80966c0dcb3a910e0faa431d164c37be6a081176098  fractal-4.4.2.tar.gz
+41f2c2f04a459da5a9d79fbf05e5fdc37f6fd199136fd2e691b384bb51c91819b5df4432ee4c9378be9e6fcf74e91fb4fcaef56d7fd663da19b33192f6e012b8  cargo-home.patch
 "
diff --git a/community/fractal/cargo-home.patch b/community/fractal/cargo-home.patch
new file mode 100644
index 00000000000..ce39a792491
--- /dev/null
+++ b/community/fractal/cargo-home.patch
@@ -0,0 +1,35 @@
+diff --git a/scripts/cargo-doc.sh b/scripts/cargo-doc.sh
+index 06df3ac..b88cb99 100755
+--- a/scripts/cargo-doc.sh
++++ b/scripts/cargo-doc.sh
+@@ -2,7 +2,6 @@
+ 
+ export OUTPUT="$2"
+ export CARGO_TARGET_DIR="$3"/target
+-export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
+ export FRACTAL_PROFILE="$4"
+ 
+ echo "GENERATING DOCUMENTATION"
+diff --git a/scripts/cargo.sh b/scripts/cargo.sh
+index a8c7763..bebdc48 100755
+--- a/scripts/cargo.sh
++++ b/scripts/cargo.sh
+@@ -2,7 +2,6 @@
+ 
+ export OUTPUT="$2"
+ export CARGO_TARGET_DIR="$3"/target
+-export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home
+ export FRACTAL_PROFILE="$4"
+ 
+ if [ "$FRACTAL_PROFILE" = "Devel" ]
+diff --git a/scripts/test.sh b/scripts/test.sh
+index 35ed241..4ba4e35 100755
+--- a/scripts/test.sh
++++ b/scripts/test.sh
+@@ -4,6 +4,5 @@ set -o errexit
+ set -o pipefail
+ 
+ export CARGO_TARGET_DIR="$1/target/"
+-export CARGO_HOME="$CARGO_TARGET_DIR/cargo-home"
+ 
+ cargo test -j 1 -- --test-threads=1 --nocapture
diff --git a/community/fractal/meson-0.60.patch b/community/fractal/meson-0.60.patch
deleted file mode 100644
index 9708b609f05..00000000000
--- a/community/fractal/meson-0.60.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/fractal-gtk/res/meson.build
-+++ b/fractal-gtk/res/meson.build
-@@ -2,7 +2,7 @@
- 
- 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 @@
- 
- 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',
diff --git a/community/fractal/openssl3.patch b/community/fractal/openssl3.patch
deleted file mode 100644
index 1b87df76311..00000000000
--- a/community/fractal/openssl3.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index c0b5e5e..d064f35 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1,5 +1,7 @@
- # This file is automatically @generated by Cargo.
- # It is not intended for manual editing.
-+version = 3
-+
- [[package]]
- name = "addr2line"
- version = "0.13.0"
-@@ -169,7 +171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293"
- dependencies = [
-  "addr2line",
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "libc",
-  "miniz_oxide",
-  "object",
-@@ -326,6 +328,12 @@ version = "0.1.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
- 
-+[[package]]
-+name = "cfg-if"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-+
- [[package]]
- name = "chrono"
- version = "0.4.13"
-@@ -407,7 +415,7 @@ version = "1.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
- ]
- 
- [[package]]
-@@ -417,7 +425,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
- dependencies = [
-  "autocfg 1.0.0",
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "lazy_static",
- ]
- 
-@@ -455,7 +463,7 @@ version = "2.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "dirs-sys",
- ]
- 
-@@ -465,7 +473,7 @@ version = "2.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "dirs-sys",
- ]
- 
-@@ -506,7 +514,7 @@ version = "0.8.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
- ]
- 
- [[package]]
-@@ -549,7 +557,7 @@ version = "1.0.16"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "68c90b0fc46cf89d227cc78b40e494ff81287a92dd07631e5af0d06fe3cf885e"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "crc32fast",
-  "libc",
-  "miniz_oxide",
-@@ -842,7 +850,7 @@ version = "0.1.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "libc",
-  "wasi",
- ]
-@@ -979,7 +987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163"
- dependencies = [
-  "bitflags",
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "futures-channel",
-  "futures-core",
-  "futures-util",
-@@ -1543,7 +1551,7 @@ version = "0.4.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
- ]
- 
- [[package]]
-@@ -1648,7 +1656,7 @@ version = "0.6.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "fuchsia-zircon",
-  "fuchsia-zircon-sys",
-  "iovec",
-@@ -1703,7 +1711,7 @@ version = "0.2.34"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "libc",
-  "winapi 0.3.9",
- ]
-@@ -1809,9 +1817,9 @@ checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5"
- 
- [[package]]
- name = "once_cell"
--version = "1.4.0"
-+version = "1.12.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d"
-+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
- 
- [[package]]
- name = "opaque-debug"
-@@ -1821,15 +1829,15 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
- 
- [[package]]
- name = "openssl"
--version = "0.10.30"
-+version = "0.10.38"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
-+checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
- dependencies = [
-  "bitflags",
-- "cfg-if",
-+ "cfg-if 1.0.0",
-  "foreign-types",
-- "lazy_static",
-  "libc",
-+ "once_cell",
-  "openssl-sys",
- ]
- 
-@@ -1841,9 +1849,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
- 
- [[package]]
- name = "openssl-sys"
--version = "0.9.58"
-+version = "0.9.72"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
-+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
- dependencies = [
-  "autocfg 1.0.0",
-  "cc",
-@@ -2527,7 +2535,7 @@ version = "0.3.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "libc",
-  "redox_syscall",
-  "winapi 0.3.9",
-@@ -2678,7 +2686,7 @@ version = "3.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "libc",
-  "rand 0.7.3",
-  "redox_syscall",
-@@ -2818,7 +2826,7 @@ version = "0.1.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f0aae59226cf195d8e74d4b34beae1859257efb4e5fed3f147d2dc2c7d372178"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "log",
-  "tracing-core",
- ]
-@@ -2998,7 +3006,7 @@ version = "0.2.67"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "serde",
-  "serde_json",
-  "wasm-bindgen-macro",
-@@ -3025,7 +3033,7 @@ version = "0.4.17"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
- dependencies = [
-- "cfg-if",
-+ "cfg-if 0.1.10",
-  "js-sys",
-  "wasm-bindgen",
-  "web-sys",
diff --git a/community/fractal/socket2.patch b/community/fractal/socket2.patch
deleted file mode 100644
index ea6ba11e820..00000000000
--- a/community/fractal/socket2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index d064f35..68e473f 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2531,13 +2531,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
- 
- [[package]]
- name = "socket2"
--version = "0.3.12"
-+version = "0.3.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
-+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
- dependencies = [
-- "cfg-if 0.1.10",
-+ "cfg-if 1.0.0",
-  "libc",
-- "redox_syscall",
-  "winapi 0.3.9",
- ]
-