v0.4.6

2 files changed, 38 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5b044b53dc8..6d45a1c269d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,23 @@
 pkgbase = guayadeque
 	pkgdesc = Lightweight music player
-	pkgver = 0.4.5
-	pkgrel = 2
+	pkgver = 0.4.6
+	pkgrel = 1
 	url = http://guayadeque.org/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = curl
-	depends = libgpod
-	depends = taglib
 	depends = wxsqlite3
+	depends = wxgtk3
+	depends = webkit2gtk
+	depends = taglib
 	depends = gst-plugins-base
-	optdepends = gst-plugins-good: Support for PulseAudio and additional file formats
-	optdepends = gst-plugins-bad: Support for additional file formats
-	optdepends = gst-plugins-ugly: Support for additional file formats
-	optdepends = gst-libav: Support for additional file formats
-	optdepends = gvfs: Support for external devices
-	source = guayadeque-0.4.5.tar.gz::https://github.com/anonbeat/guayadeque/archive/v0.4.5.tar.gz
-	sha256sums = a0c4eb9f0eb42e701880a1d196e847d68a3b443716a6240389fbfafef3f5d19c
+	depends = gst-plugins-good
+	optdepends = gst-libav: additional codecs
+	optdepends = gst-plugins-bad: additional codecs
+	optdepends = gst-plugins-ugly: additional codecs
+	source = guayadeque-0.4.6.tar.gz::https://github.com/anonbeat/guayadeque/archive/v0.4.6.tar.gz
+	sha256sums = 3c0d782c6f4aa511c7a635a78742542d130d1a13e20648db886ccfce4e1b9d4f
 
 pkgname = guayadeque
 
diff --git a/PKGBUILD b/PKGBUILD
index ca0654cc7323..33e1d2952c4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Marcin (CTRL) Wieczorek <marcin@marcin.co>
 # Contributor: Scott Furry <scott.wl.furry@gmail.com>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Sial <sial@cpan.org>
@@ -6,43 +7,40 @@
 # Contributor: Michael Straube <straubem@gmx.de>
 
 pkgname=guayadeque
-pkgver=0.4.5
-pkgrel=2
-pkgdesc='Lightweight music player'
-arch=('i686' 'x86_64')
-url='http://guayadeque.org/'
-license=('GPL3')
-depends=('curl' 'libgpod' 'taglib' 'wxsqlite3' 'gst-plugins-base')
-makedepends=('cmake')
-optdepends=('gst-plugins-good: Support for PulseAudio and additional file formats'
-            'gst-plugins-bad: Support for additional file formats'
-            'gst-plugins-ugly: Support for additional file formats'
-            'gst-libav: Support for additional file formats'
-            'gvfs: Support for external devices')
+pkgver=0.4.6
+pkgrel=1
+pkgdesc="Lightweight music player"
+arch=(i686 x86_64)
+url="http://guayadeque.org/"
+license=(GPL3)
+depends=(wxsqlite3 wxgtk3 webkit2gtk taglib gst-plugins-base gst-plugins-good)
+makedepends=(cmake)
+optdepends=('gst-libav: additional codecs'
+            'gst-plugins-bad: additional codecs'
+            'gst-plugins-ugly: additional codecs')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/anonbeat/guayadeque/archive/v${pkgver}.tar.gz")
-sha256sums=('a0c4eb9f0eb42e701880a1d196e847d68a3b443716a6240389fbfafef3f5d19c')
+sha256sums=('3c0d782c6f4aa511c7a635a78742542d130d1a13e20648db886ccfce4e1b9d4f')
 
-_BUILDFLDR='localbuild'
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  mkdir -p build-guayadeque
+}
 
 build() {
-  cd ${pkgname}-${pkgver}
-
-  ./buildt
-  mkdir -p ${_BUILDFLDR} && cd ${_BUILDFLDR}
-
+  cd "${srcdir}/${pkgname}-${pkgver}/build-guayadeque"
   cmake .. \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
+    -DCMAKE_CXX_STANDARD=11 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -D_GUREVISION_:STRING="${pkgrel}" \
-    -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-3.0' \
-    -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3' \
-    -DwxWidgets_INCLUDE_DIRS='/usr/include/wx-3.0/'
+    -DCMAKE_EXE_LINKER_FLAGS=-lwx_gtk3u_aui-3.0 \
+    -DwxWidgets_wxrc_EXECUTABLE=/usr/bin/wxrc-3.0 \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
+    -DwxWidgets_INCLUDE_DIRS=/usr/include/wx-3.0/
   make
-
 }
 
 package() {
-  cd ${pkgname}-${pkgver}/${_BUILDFLDR}
-
+  cd "${srcdir}/${pkgname}-${pkgver}/build-guayadeque"
   make DESTDIR="${pkgdir}" install
 }