Date: Wed, 1 Sep 2021 13:41:48 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2e2f171642cd - main - audio/shortwave: unbreak with libadwaita >= 2021-05-20 snapshot Message-ID: <202109011341.181DfmSU072767@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e2f171642cd5d96595786aaf7e77c53dbf6467e commit 2e2f171642cd5d96595786aaf7e77c53dbf6467e Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-09-01 13:06:25 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-09-01 13:39:50 +0000 audio/shortwave: unbreak with libadwaita >= 2021-05-20 snapshot $ shortwave (de.haeckerfelix.Shortwave:1234): GLib-GObject-WARNING **: specified class size for type 'SwSongRow' is smaller than the parent type's 'AdwActionRow' class size (de.haeckerfelix.Shortwave:1234): GLib-GObject-WARNING **: cannot add private field to invalid (non-instantiatable) type '<invalid>' thread 'main' panicked at 'assertion failed: type_.is_valid()', src/ui/song_row.rs:49:5 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace --- audio/shortwave/Makefile | 2 +- audio/shortwave/files/patch-libadwaita | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/audio/shortwave/Makefile b/audio/shortwave/Makefile index 07f8066f330a..edee88c32c08 100644 --- a/audio/shortwave/Makefile +++ b/audio/shortwave/Makefile @@ -1,6 +1,6 @@ PORTNAME= shortwave DISTVERSION= 2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MAINTAINER= jbeich@FreeBSD.org diff --git a/audio/shortwave/files/patch-libadwaita b/audio/shortwave/files/patch-libadwaita new file mode 100644 index 000000000000..6aaf999cd5ae --- /dev/null +++ b/audio/shortwave/files/patch-libadwaita @@ -0,0 +1,36 @@ +https://gitlab.gnome.org/GNOME/libadwaita/-/commit/0509755b80d8 +https://gitlab.gnome.org/World/Rust/libadwaita-rs/-/commit/986f12d5170d + +$ RUST_BACKTRACE=1 shortwave +(de.haeckerfelix.Shortwave:1234): GLib-GObject-WARNING **: specified class size for type 'SwSongRow' is smaller than the parent type's 'AdwActionRow' class size +(de.haeckerfelix.Shortwave:1234): GLib-GObject-WARNING **: cannot add private field to invalid (non-instantiatable) type '<invalid>' +thread 'main' panicked at 'assertion failed: type_.is_valid()', src/ui/song_row.rs:49:5 +stack backtrace: + 0: rust_begin_unwind + 1: core::panicking::panic_fmt + 2: core::panicking::panic + 3: glib::object::Object::new + 4: shortwave::ui::song_row::SwSongRow::new + 5: shortwave::ui::song_listbox::SongListBox::add_song + 6: shortwave::audio::backend::song_backend::SongBackend::add_song + 7: shortwave::audio::player::Player::process_gst_message + 8: glib::main_context_channel::dispatch + 9: g_main_context_dispatch + 10: g_main_context_iterate + 11: g_main_context_iteration + 12: g_application_run + 13: shortwave::app::SwApplication::run + 14: shortwave::main +note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace. + +--- ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/src/lib.rs.orig 2021-04-20 20:15:58 UTC ++++ ../libadwaita-rs-2d09b6b566bc0fa2497612768cf0c41f582acdd7/libadwaita/sys/src/lib.rs +@@ -69,7 +69,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], + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109011341.181DfmSU072767>