From owner-dev-commits-ports-main@freebsd.org Wed Sep 1 13:41:50 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 29EC466B55B; Wed, 1 Sep 2021 13:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H04wY60kkz3lGR; Wed, 1 Sep 2021 13:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA6FC25EF8; Wed, 1 Sep 2021 13:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 181Dfnjr072792; Wed, 1 Sep 2021 13:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 181DfnA4072791; Wed, 1 Sep 2021 13:41:49 GMT (envelope-from git) Date: Wed, 1 Sep 2021 13:41:49 GMT Message-Id: <202109011341.181DfnA4072791@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 186efc7b844a - main - deskutils/solanum: unbreak with libadwaita >= 2021-05-20 snapshot MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 186efc7b844a643f9eb6d9b6a965ab23f44123eb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Sep 2021 13:41:50 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=186efc7b844a643f9eb6d9b6a965ab23f44123eb commit 186efc7b844a643f9eb6d9b6a965ab23f44123eb Author: Jan Beich AuthorDate: 2021-02-08 23:38:19 +0000 Commit: Jan Beich 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@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, + pub padding: [gpointer; 4], + }