git: 186efc7b844a - main - deskutils/solanum: unbreak with libadwaita >= 2021-05-20 snapshot

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=186efc7b844a643f9eb6d9b6a965ab23f44123eb

commit 186efc7b844a643f9eb6d9b6a965ab23f44123eb
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-02-08 23:38:19 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-09-01 13:39:50 +0000

    deskutils/solanum: unbreak with libadwaita >= 2021-05-20 snapshot
    
    For consistency with other libadwaita-rs consumers. AdwActionRow isn't
    used by Solanum.
---
 deskutils/solanum/Makefile               |  2 +-
 deskutils/solanum/files/patch-libadwaita | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/deskutils/solanum/Makefile b/deskutils/solanum/Makefile
index 1b91d50093d5..e11ccd6c21f8 100644
--- a/deskutils/solanum/Makefile
+++ b/deskutils/solanum/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	solanum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 
 MAINTAINER=	jbeich at FreeBSD.org
diff --git a/deskutils/solanum/files/patch-libadwaita b/deskutils/solanum/files/patch-libadwaita
new file mode 100644
index 000000000000..171110ccaa2b
--- /dev/null
+++ b/deskutils/solanum/files/patch-libadwaita
@@ -0,0 +1,14 @@
+https://gitlab.gnome.org/GNOME/libadwaita/-/commit/0509755b80d8
+https://gitlab.gnome.org/World/Rust/libadwaita-rs/-/commit/986f12d5170d
+
+--- ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/sys/src/lib.rs.orig	2021-01-15 00:37:53 UTC
++++ ../libadwaita-rs-b898c11fb6776fc7a9a6b920222fa3173216a80c/libadwaita/sys/src/lib.rs
+@@ -73,7 +73,7 @@ pub type AdwAvatarImageLoadFunc =
+ #[repr(C)]
+ #[derive(Copy, Clone)]
+ pub struct AdwActionRowClass {
+-    pub parent_class: gtk::GtkListBoxRowClass,
++    pub parent_class: AdwPreferencesRowClass,
+     pub activate: Option<unsafe extern "C" fn(*mut AdwActionRow)>,
+     pub padding: [gpointer; 4],
+ }