Update to upstream 0.17

4 files changed, 46 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88543090736b..9a7472d75858 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ymuse
 	pkgdesc = Easy, functional, and snappy client for Music Player Daemon
-	pkgver = 0.16
+	pkgver = 0.17
 	pkgrel = 1
 	url = https://yktoo.com/en/software/ymuse/
 	arch = x86_64
@@ -8,10 +8,12 @@ pkgbase = ymuse
 	makedepends = go
 	depends = gtk3
 	optdepends = mpd
-	source = ymuse-0.16.tar.gz::https://github.com/yktoo/ymuse/archive/v0.16.tar.gz
+	source = ymuse-0.17.tar.gz::https://github.com/yktoo/ymuse/archive/v0.17.tar.gz
 	source = ymuse.desktop
-	sha512sums = 25e3233641fe23001b08e49f37765d091c71564c43284c10faacbba77fe327322daf56d58fffec0f0324a50e096f76b0cc0591fa01e3428f6af7e59cb6a8003f
+	source = gotk3.patch
+	sha512sums = 3beefe0582df71f06c1da9e27d9daf3c8abc259c7d153ec645f571e89eef4339d114317eafc7f0cbf302053355347c0865e50d02df684180704d4cfa8789b8e8
 	sha512sums = dbf124b2be06036faecb0a5af76b6b44bfdfcd7461c69807a6fcfb3008131072412387e888d9c6777ef9549aa2ae1fafb296d904a9b525dff4b09cc36400a6ff
+	sha512sums = 10aeae92246376ea4e90ba0180e4c677b32dfd831d54722bf8fa9a7ed4c6d54882f87befda3973482dcf9af081e6a5ec9d0d50167c171d14f2b4ab64326a75ca
 
 pkgname = ymuse
 
diff --git a/.gitignore b/.gitignore
index a2498ab9397b..645483aef774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 !PKGBUILD
 !.SRCINFO
 !ymuse.desktop
+!*.patch
diff --git a/PKGBUILD b/PKGBUILD
index c61124f37fa8..1c0d40e0a664 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Georg Graßnick <dev.grassnick at mailbox dot org>
 
 pkgname=ymuse
-pkgver=0.16
+pkgver=0.17
 pkgrel=1
 pkgdesc="Easy, functional, and snappy client for Music Player Daemon"
 arch=(x86_64)
@@ -13,12 +13,24 @@ makedepends=("go")
 source=(
 	"${pkgname}-${pkgver}.tar.gz::https://github.com/yktoo/${pkgname}/archive/v${pkgver}.tar.gz"
 	"ymuse.desktop"
+	"gotk3.patch"
 )
 sha512sums=(
-	"25e3233641fe23001b08e49f37765d091c71564c43284c10faacbba77fe327322daf56d58fffec0f0324a50e096f76b0cc0591fa01e3428f6af7e59cb6a8003f"
+	"3beefe0582df71f06c1da9e27d9daf3c8abc259c7d153ec645f571e89eef4339d114317eafc7f0cbf302053355347c0865e50d02df684180704d4cfa8789b8e8"
 	"dbf124b2be06036faecb0a5af76b6b44bfdfcd7461c69807a6fcfb3008131072412387e888d9c6777ef9549aa2ae1fafb296d904a9b525dff4b09cc36400a6ff"
+	"10aeae92246376ea4e90ba0180e4c677b32dfd831d54722bf8fa9a7ed4c6d54882f87befda3973482dcf9af081e6a5ec9d0d50167c171d14f2b4ab64326a75ca"
 )
 
+prepare() {
+	cd "${pkgname}-${pkgver}"
+
+	# Use newer version
+	# The included gotk3 version does does not support recent go releases
+	# See https://github.com/gotk3/gotk3/issues/726
+	patch -p1 < ../gotk3.patch
+}
+
+
 build() {
 	cd "${pkgname}-${pkgver}"
 	go generate
diff --git a/gotk3.patch b/gotk3.patch
new file mode 100644
index 000000000000..43152555028b
--- /dev/null
+++ b/gotk3.patch
@@ -0,0 +1,26 @@
+diff --git a/go.mod b/go.mod
+index af05b46..4549af4 100644
+--- a/go.mod
++++ b/go.mod
+@@ -4,7 +4,7 @@ go 1.15
+ 
+ require (
+ 	github.com/fhs/gompd/v2 v2.2.0
+-	github.com/gotk3/gotk3 v0.5.2
++	github.com/gotk3/gotk3 v0.5.3-0.20210223154815-289cfb6dbf32
+ 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
+ 	github.com/pkg/errors v0.9.1
+ )
+diff --git a/go.sum b/go.sum
+index d14d5e9..4626b80 100644
+--- a/go.sum
++++ b/go.sum
+@@ -6,6 +6,8 @@ github.com/gotk3/gotk3 v0.4.1-0.20200810205902-010a4368f09d h1:s1/OUhVETY6vdmsSh
+ github.com/gotk3/gotk3 v0.4.1-0.20200810205902-010a4368f09d/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+ github.com/gotk3/gotk3 v0.5.2 h1:jbSFvUNMfo3ImM6BWBAkNUxY5piqP3eTc1YFbYy9ecU=
+ github.com/gotk3/gotk3 v0.5.2/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
++github.com/gotk3/gotk3 v0.5.3-0.20210223154815-289cfb6dbf32 h1:wE6C/HgLUBHi8YhHlCEulrmQMntVl4PFdh3kA0sWyAY=
++github.com/gotk3/gotk3 v0.5.3-0.20210223154815-289cfb6dbf32/go.mod h1:/hqFpkNa9T3JgNAE2fLvCdov7c5bw//FHNZrZ3Uv9/Q=
+ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
+ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=