From 5268341bfc759a8d1e5f4a5136b7a80935cfe9fc Mon Sep 17 00:00:00 2001
From: Christian Schendel <doppelhelix@gmail.com>
Date: Sun, 7 Sep 2025 16:18:31 +0200
Subject: [PATCH] upgpkg: euphonica-0.97.0_beta-1: new upstream release

---
 .SRCINFO                                      | 12 ++---
 ...92b20144e0fb3a705e77e3de9b64480b5086.patch | 46 -------------------
 PKGBUILD                                      | 18 +++-----
 3 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 3fb892b20144e0fb3a705e77e3de9b64480b5086.patch

diff --git a/.SRCINFO b/.SRCINFO
index 452cb5f..434a19f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = euphonica
 	pkgdesc = Libadwaita MPD client with visualiser, wikis and synced lyrics
-	pkgver = 0.96.3_beta
+	pkgver = 0.97.0_beta
 	pkgrel = 1
 	url = https://github.com/htkhiem/euphonica
 	arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = euphonica
 	makedepends = cargo
 	makedepends = clang
 	depends = cairo
-	depends = dbus
 	depends = dconf
 	depends = gcc-libs
 	depends = gdk-pixbuf2
@@ -21,14 +20,13 @@ pkgbase = euphonica
 	depends = hicolor-icon-theme
 	depends = libadwaita
 	depends = libpipewire
+	depends = libsecret
+	depends = org.freedesktop.secrets
 	depends = openssl
 	depends = pango
 	depends = sqlite
-	depends = xdg-desktop-portal-gtk
 	options = !lto
-	source = euphonica-0.96.3_beta::git+https://github.com/htkhiem/euphonica.git#tag=v0.96.3-beta
-	source = rust-mpd::git+https://github.com/htkhiem/rust-mpd.git
-	b2sums = bcf2c916b74021af3b943f181aefeeb0d2cde0c5b6b80a8a556f727b00cec82082a883290b5651090ea4ed8a6374c1ad067ff5af3f88b063baf05358aba96415
-	b2sums = SKIP
+	source = euphonica-0.97.0_beta::git+https://github.com/htkhiem/euphonica.git#tag=v0.97.0-beta
+	b2sums = e8b6cc00051f9abacb42a0cd4d184a2723bec24cccf5a4bb589fd618e6fb1d80c862474e54483d5c4e8541c7b04d2e0a72bebd91ab7ec249e504dd6a28ed2a67
 
 pkgname = euphonica
diff --git a/3fb892b20144e0fb3a705e77e3de9b64480b5086.patch b/3fb892b20144e0fb3a705e77e3de9b64480b5086.patch
deleted file mode 100644
index 4c46421..0000000
--- a/3fb892b20144e0fb3a705e77e3de9b64480b5086.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3fb892b20144e0fb3a705e77e3de9b64480b5086 Mon Sep 17 00:00:00 2001
-From: htkhiem <42716602+htkhiem@users.noreply.github.com>
-Date: Sat, 23 Aug 2025 09:42:42 +0700
-Subject: [PATCH] Replace submodule with git crate dependency
-
----
- .gitmodules | 3 ---
- Cargo.lock  | 1 +
- Cargo.toml  | 2 +-
- rust-mpd    | 1 -
- 4 files changed, 2 insertions(+), 5 deletions(-)
- delete mode 160000 rust-mpd
-
-diff --git a/.gitmodules b/.gitmodules
-index 8ede99a..e69de29 100644
---- a/.gitmodules
-+++ b/.gitmodules
-@@ -1,3 +0,0 @@
--[submodule "rust-mpd"]
--	path = rust-mpd
--	url = https://github.com/htkhiem/rust-mpd.git
-diff --git a/Cargo.lock b/Cargo.lock
-index 0dbb023..c4cdb1e 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2716,6 +2716,7 @@ dependencies = [
- [[package]]
- name = "mpd"
- version = "0.1.0"
-+source = "git+https://github.com/htkhiem/rust-mpd.git#037d9a213b4a8dc2ead74b3f44d53351ddff67a2"
- dependencies = [
-  "bufstream",
-  "fxhash",
-diff --git a/Cargo.toml b/Cargo.toml
-index f91295a..baaf056 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -15,7 +15,7 @@ futures = "0.3.30"
- gettext-rs = { version = "0.7", features = ["gettext-system"] }
- image = "0.25.1"
- librsvg = "2.58.1"
--mpd = { path = "./rust-mpd" }
-+mpd = { git = "https://github.com/htkhiem/rust-mpd.git" }
- once_cell = "1.19.0"
- time = { version = "0.3.36", features = ["formatting"] }
- reqwest = { version = "0.12.5", features = ["blocking", "json"] }
diff --git a/PKGBUILD b/PKGBUILD
index fb437f5..842c717 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christian Schendel <doppelhelix@gmail.com>
 # Contributor: Huynh Thien Khiem <my_github_name 2000 at gmail dot com>
 pkgname=euphonica
-pkgver=0.96.3_beta
+pkgver=0.97.0_beta
 pkgrel=1
 pkgdesc="Libadwaita MPD client with visualiser, wikis and synced lyrics"
 arch=(
@@ -13,7 +13,7 @@ license=(
 )
 depends=(
     cairo
-    dbus
+    #dbus
     dconf
     gcc-libs
     gdk-pixbuf2
@@ -24,10 +24,12 @@ depends=(
     hicolor-icon-theme
     libadwaita
     libpipewire
+    libsecret
+    org.freedesktop.secrets
     openssl
     pango
     sqlite
-    xdg-desktop-portal-gtk
+    #xdg-desktop-portal-gtk
 )
 makedepends=(
     git
@@ -38,16 +40,8 @@ makedepends=(
 options=(!lto)
 source=(
     "$pkgname-$pkgver::git+$url.git#tag=v${pkgver//_/-}"
-    "3fb892b20144e0fb3a705e77e3de9b64480b5086.patch"
 )
-b2sums=('bcf2c916b74021af3b943f181aefeeb0d2cde0c5b6b80a8a556f727b00cec82082a883290b5651090ea4ed8a6374c1ad067ff5af3f88b063baf05358aba96415'
-        'SKIP')
-
-prepare() {
-    export RUSTUP_TOOLCHAIN=stable
-    cd "$pkgname-$pkgver"
-    patch -Np1 -i ../3fb892b20144e0fb3a705e77e3de9b64480b5086.patch
-}
+b2sums=('e8b6cc00051f9abacb42a0cd4d184a2723bec24cccf5a4bb589fd618e6fb1d80c862474e54483d5c4e8541c7b04d2e0a72bebd91ab7ec249e504dd6a28ed2a67')
 
 build() {
     export RUSTUP_TOOLCHAIN=stable