git: 641cbf15e997 - main - multimedia/kooha: update to 2.0.0

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=641cbf15e997affca4de78d4617ba70df0165b24

commit 641cbf15e997affca4de78d4617ba70df0165b24
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-09-23 07:50:54 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-09-23 12:55:28 +0000

    multimedia/kooha: update to 2.0.0
    
    Changes:        https://github.com/SeaDve/Kooha/compare/e535867...v2.0.0
---
 multimedia/kooha/Makefile           |  3 +--
 multimedia/kooha/distinfo           |  6 +++---
 multimedia/kooha/files/patch-revert | 27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/multimedia/kooha/Makefile b/multimedia/kooha/Makefile
index 433be295d9bc..9d3e72e79130 100644
--- a/multimedia/kooha/Makefile
+++ b/multimedia/kooha/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	kooha
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.1-680
-DISTVERSIONSUFFIX=	-ge535867
+DISTVERSION=	2.0.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich at FreeBSD.org
diff --git a/multimedia/kooha/distinfo b/multimedia/kooha/distinfo
index f8f843212fee..1ea192ca013e 100644
--- a/multimedia/kooha/distinfo
+++ b/multimedia/kooha/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1632146361
+TIMESTAMP = 1632383454
 SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
 SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
 SHA256 (rust/crates/anyhow-1.0.43.crate) = 28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf
@@ -371,5 +371,5 @@ SHA256 (rust/crates/zvariant-2.8.0.crate) = fa4b785b8b32b0f8433b4474e6bb4ea77b37
 SIZE (rust/crates/zvariant-2.8.0.crate) = 60913
 SHA256 (rust/crates/zvariant_derive-2.8.0.crate) = b42af4ee88fb928781391216c34be77ec7cdb3546042b2947ce38d86aa5f37dd
 SIZE (rust/crates/zvariant_derive-2.8.0.crate) = 8771
-SHA256 (SeaDve-Kooha-v1.2.1-680-ge535867_GH0.tar.gz) = 3bebbe9d5884c842387509df1784784abb9bb3335e8629b6484ac3e8d8591ed5
-SIZE (SeaDve-Kooha-v1.2.1-680-ge535867_GH0.tar.gz) = 253210
+SHA256 (SeaDve-Kooha-v2.0.0_GH0.tar.gz) = bd56477d35b21cfb1fb5c7ccff539f6abc7f67c0809d4faaf453c99a1fcc7824
+SIZE (SeaDve-Kooha-v2.0.0_GH0.tar.gz) = 251562
diff --git a/multimedia/kooha/files/patch-revert b/multimedia/kooha/files/patch-revert
new file mode 100644
index 000000000000..6cdad474575b
--- /dev/null
+++ b/multimedia/kooha/files/patch-revert
@@ -0,0 +1,27 @@
+Revert https://github.com/SeaDve/Kooha/commit/10e314e1c41a
+until x11-toolkits/libadwaita is updated to newer ABI
+
+--- Cargo.toml.orig	2021-09-23 07:50:54 UTC
++++ Cargo.toml
+@@ -15,8 +15,8 @@ pretty_env_logger = "0.4"
+ once_cell = "1.5"
+ gettext-rs = { version = "0.7", features = ["gettext-system"] }
+ ashpd = { version = "0.2.0-alpha-3", features = ["feature_gtk4"] }
+-gtk = { package = "gtk4", version = "0.3" }
+-adw = { package = "libadwaita", version = "0.1.0-alpha-4" }
++gtk = { package = "gtk4", version = "0.2" }
++adw = { package = "libadwaita", version = "0.1.0-alpha-3" }
+ gst = { package = "gstreamer", version = "0.17" }
+ gst-plugin-gif = "0.7.0"
+ futures = "0.3.16"
+--- src/backend/screencast_portal.rs.orig	2021-09-23 07:50:54 UTC
++++ src/backend/screencast_portal.rs
+@@ -88,7 +88,7 @@ impl ScreencastPortal {
+                 ScreencastPortalResponse::Success(streams, fd)
+             }
+             Err(error) => match error {
+-                ashpd::Error::Response(ResponseError::Cancelled) => {
++                ashpd::Error::Portal(ResponseError::Cancelled) => {
+                     log::info!("Select sources cancelled");
+                     ScreencastPortalResponse::Cancelled
+                 }