Patches attached. The first patch could be applied now. Jeremy
From 751f693fcd4a10f79a0fea962ce89e94b04389f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bi...@canonical.com> Date: Fri, 23 Aug 2024 17:49:35 -0400 Subject: [PATCH 2/3] Add patch to build with rust-libadwaita 0.7
Closes: #1079498 --- debian/patches/1001_update-gtk.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 25 insertions(+) create mode 100644 debian/patches/1001_update-gtk.patch diff --git a/debian/patches/1001_update-gtk.patch b/debian/patches/1001_update-gtk.patch new file mode 100644 index 0000000..6af6cdf --- /dev/null +++ b/debian/patches/1001_update-gtk.patch @@ -0,0 +1,24 @@ +From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bi...@canonical.com> +Date: Fri, 23 Aug 2024 17:48:21 -0400 +Subject: Update to latest gtk-rs crates + +Forwarded: https://gitlab.freedesktop.org/pipewire/helvum/-/merge_requests/68 +--- + Cargo.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index f839bfc..32fcf6f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -15,8 +15,8 @@ categories = ["gui", "multimedia"] + + [dependencies] + pipewire = "0.8.0" +-adw = { version = "0.6", package = "libadwaita", features = ["v1_4"] } +-glib = { version = "0.19", features = ["log"] } ++adw = { version = "0.7", package = "libadwaita", features = ["v1_4"] } ++glib = { version = "0.20", features = ["log"] } + async-channel = "2.2" + + log = "0.4.11" diff --git a/debian/patches/series b/debian/patches/series index e69de29..74c0776 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +1001_update-gtk.patch -- 2.45.2
From ed7b90663cfa5f00c4a84d4ea51e75bb1a053a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bi...@canonical.com> Date: Fri, 23 Aug 2024 17:50:16 -0400 Subject: [PATCH 3/3] Update Build-Depends --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index ed983c9..f7d69f8 100644 --- a/debian/control +++ b/debian/control @@ -9,10 +9,10 @@ Build-Depends: dh-sequence-rust, libgtk-4-bin, librust-async-channel-dev (<< 3), - librust-glib-0.19+default-dev, - librust-glib-0.19+log-dev, - librust-libadwaita-0.6+default-dev, - librust-libadwaita-0.6+v1-4-dev, + librust-glib-0.20+default-dev, + librust-glib-0.20+log-dev, + librust-libadwaita-0.7+default-dev, + librust-libadwaita-0.7+v1-4-dev, librust-libc-0.2+default-dev, librust-log-0.4+default-dev, librust-once-cell-1+default-dev, -- 2.45.2
From e248558a82eafe85b1c855e9b7389802bef46492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <jeremy.bi...@canonical.com> Date: Fri, 23 Aug 2024 17:47:24 -0400 Subject: [PATCH 1/3] Drop async-channel patch: obsolete --- debian/patches/2001_async-channel.patch | 17 ----------------- debian/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 debian/patches/2001_async-channel.patch diff --git a/debian/patches/2001_async-channel.patch b/debian/patches/2001_async-channel.patch deleted file mode 100644 index ccbcfbe..0000000 --- a/debian/patches/2001_async-channel.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: accept older branch of crate async-channel -Author: Jonas Smedegaard <d...@jones.dk> -Forwarded: not-needed -Last-Update: 2024-04-20 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -17,7 +17,7 @@ - pipewire = "0.8.0" - adw = { version = "0.6", package = "libadwaita", features = ["v1_4"] } - glib = { version = "0.19", features = ["log"] } --async-channel = "2.2" -+async-channel = ">= 1.9.0, <= 2" - - log = "0.4.11" - diff --git a/debian/patches/series b/debian/patches/series index 888345b..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -2001_async-channel.patch -- 2.45.2
