Update to 1:2.0.0-1

3 files changed, 12 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 918bb832f1f8..681e0993e7f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,23 @@
 pkgbase = shortwave
 	pkgdesc = Find and listen to internet radio stations.
-	pkgver = 1.1.1
-	pkgrel = 8
+	pkgver = 2.0.0
+	pkgrel = 1
 	epoch = 1
 	url = https://gitlab.gnome.org/World/Shortwave
 	arch = x86_64
 	arch = aarch64
 	license = GPL3
-	makedepends = cargo
+	makedepends = cmake
 	makedepends = git
-	makedepends = gobject-introspection
 	makedepends = gst-plugins-base-libs
-	makedepends = libdazzle
 	makedepends = meson
 	makedepends = rust
 	depends = gst-plugins-bad
-	depends = libhandy0
+	depends = libadwaita
 	depends = libsoup
-	depends = gtk3
 	options = !emptydirs
-	source = Shortwave-1.1.1.tar.gz::https://gitlab.gnome.org/World/Shortwave/-/archive/1.1.1/Shortwave-1.1.1.tar.gz
-	source = handy.patch
-	sha256sums = b391b4d10658e9ba180442ca2d769173a278f19beb498c7251a6b4a62b7c678b
-	sha256sums = 01bbac29d6aacf6bedbfc49632db24f05c7df9e52aecd2143a42e41df9f097d9
+	source = Shortwave-2.0.0.tar.gz::https://gitlab.gnome.org/World/Shortwave/-/archive/2.0.0/Shortwave-2.0.0.tar.gz
+	sha256sums = 0c8e197d05238606b8f26992cc7c6adb0f0600c7def10e9a42a1fbc5ecdaf75d
 
 pkgname = shortwave
 
diff --git a/PKGBUILD b/PKGBUILD
index bf52c87e3fa0..1e57c168f3d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,18 @@
 #
 _pkgname="Shortwave"
 pkgname="shortwave"
-pkgver="1.1.1"
-pkgrel="8"
+pkgver="2.0.0"
+pkgrel="1"
 epoch="1"
 pkgdesc="Find and listen to internet radio stations."
 arch=('x86_64' 'aarch64')
 url="https://gitlab.gnome.org/World/${_pkgname}"
 license=('GPL3')
-depends=('gst-plugins-bad' 'libhandy0' 'libsoup' 'gtk3')
-makedepends=('cargo' 'git' 'gobject-introspection' 'gst-plugins-base-libs' 'libdazzle' 'meson' 'rust')
+depends=('gst-plugins-bad' 'libadwaita' 'libsoup')
+makedepends=('cmake' 'git' 'gst-plugins-base-libs' 'meson' 'rust')
 options=('!emptydirs')
-source=("${_pkgname}-${pkgver}.tar.gz::${url}/-/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
-        "handy.patch"
-)
-sha256sums=('b391b4d10658e9ba180442ca2d769173a278f19beb498c7251a6b4a62b7c678b'
-            '01bbac29d6aacf6bedbfc49632db24f05c7df9e52aecd2143a42e41df9f097d9')
-
-prepare() {
-    cd "${_pkgname}-${pkgver}"
-    patch -Np1 -i ../handy.patch
-}
+source=("${_pkgname}-${pkgver}.tar.gz::${url}/-/archive/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('0c8e197d05238606b8f26992cc7c6adb0f0600c7def10e9a42a1fbc5ecdaf75d')
 
 build() {
     cd "${_pkgname}-${pkgver}"
diff --git a/handy.patch b/handy.patch
deleted file mode 100644
index 2157a6dcb168..000000000000
--- a/handy.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 562ee21..39f6725 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -917,7 +917,7 @@ dependencies = [
- [[package]]
- name = "libhandy"
- version = "0.5.0"
--source = "git+https://gitlab.gnome.org/haecker-felix/libhandy-rs.git?branch=update_cargo_version#62e7abf44d419cf3fe83da64285f2905da4e333e"
-+source = "git+https://gitlab.gnome.org/haecker-felix/libhandy-rs.git#62e7abf44d419cf3fe83da64285f2905da4e333e"
- dependencies = [
-  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -931,14 +931,14 @@ dependencies = [
-  "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libhandy-sys 0.5.0 (git+https://gitlab.gnome.org/haecker-felix/libhandy-rs.git?branch=update_cargo_version)",
-+ "libhandy-sys 0.5.0 (git+https://gitlab.gnome.org/haecker-felix/libhandy-rs.git)",
-  "pango 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
- name = "libhandy-sys"
- version = "0.5.0"
--source = "git+https://gitlab.gnome.org/haecker-felix/libhandy-rs.git?branch=update_cargo_version#62e7abf44d419cf3fe83da64285f2905da4e333e"
-+source = "git+https://gitlab.gnome.org/haecker-felix/libhandy-rs.git#62e7abf44d419cf3fe83da64285f2905da4e333e"
- dependencies = [
-  "gdk 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-diff --git a/Cargo.toml b/Cargo.toml
-index d55d84a..b08e12f 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -42,7 +42,7 @@ gtk = { version = "0.8.0", features = ["v3_22"] }
- gio = { version = "0.8.0", features = ["v2_46"] }
- gdk-pixbuf = { version = "0.8.0", features = ["v2_36"] }
- gettext-rs = { version = "0.4.4", features = ["gettext-system"] }
--libhandy = { git="https://gitlab.gnome.org/haecker-felix/libhandy-rs.git", branch = "update_cargo_version", features = ["v0_0_12"] }
-+libhandy = { git="https://gitlab.gnome.org/haecker-felix/libhandy-rs.git", features = ["v0_0_12"] }
- gtk-macros = "0.2.0"
- 
- [target.'cfg(unix)'.dependencies]