Remove patches, extra compiler flag and dconf dependency. Update source URL.

2 files changed, 6 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a22369226ef..9019031dbc95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vocal-git
 	pkgdesc = Podcast Client for the Modern Desktop
-	pkgver = 2.0.19.r182.18487dd
+	pkgver = 2.1.5.r239.cab7185
 	pkgrel = 1
 	url = http://www.vocalproject.net
 	arch = i686
@@ -11,7 +11,6 @@ pkgbase = vocal-git
 	makedepends = vala
 	depends = clutter-gst
 	depends = clutter-gtk
-	depends = dconf
 	depends = desktop-file-utils
 	depends = granite
 	depends = gstreamer
@@ -23,7 +22,7 @@ pkgbase = vocal-git
 	depends = webkit2gtk
 	provides = vocal
 	conflicts = vocal
-	source = vocal::git://github.com/vocalapp/vocal.git
+	source = vocal::git://github.com/needle-and-thread/vocal.git
 	md5sums = SKIP
 
 pkgname = vocal-git
diff --git a/PKGBUILD b/PKGBUILD
index 7b1e0f82992c..5e40a7076d9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,17 @@
 
 _pkgname=vocal
 pkgname=$_pkgname-git
-pkgver=2.0.19.r182.18487dd
+pkgver=2.1.5.r239.cab7185
 pkgrel=1
 pkgdesc="Podcast Client for the Modern Desktop"
 arch=('i686' 'x86_64')
 url="http://www.vocalproject.net"
 license=('GPL3')
-depends=('clutter-gst' 'clutter-gtk' 'dconf' 'desktop-file-utils' 'granite' 'gstreamer' 'gtk-update-icon-cache' 'gtk3' 'libnotify' 'libxml2' 'sqlite' 'webkit2gtk')
+depends=('clutter-gst' 'clutter-gtk' 'desktop-file-utils' 'granite' 'gstreamer' 'gtk-update-icon-cache' 'gtk3' 'libnotify' 'libxml2' 'sqlite' 'webkit2gtk')
 makedepends=('cmake' 'git' 'vala')
 provides=($_pkgname)
 conflicts=($_pkgname)
-#source=($_pkgname::git://github.com/needle-and-thread/vocal.git)
-source=($_pkgname::git://github.com/vocalapp/vocal.git)
+source=($_pkgname::git://github.com/needle-and-thread/vocal.git)
 md5sums=('SKIP')
 
 pkgver() {
@@ -25,28 +24,17 @@ pkgver() {
   printf "%s.r%s.%s" "$(git tag --sort=-version:refname | head -1)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  cd $_pkgname
-
-  # Use newer version of webkit2gtk
-  sed -i 's/webkit2gtk-3.0/webkit2gtk-4.0/g' CMakeLists.txt
-}
-
 build() {
   cd $_pkgname
   rm -rf build
   mkdir build
 
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DGSETTINGS_COMPILE=0   # -DGSETTINGS_LOCALINSTALL=1
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr   # -DGSETTINGS_COMPILE=0 -DGSETTINGS_LOCALINSTALL=1
   make
 }
 
 package() {
-  # Patch
-  mv $_pkgname/build/com.github.needle-and-thread.vocal.desktop{.in,}
-  mv $_pkgname/data/com.github.needle-and-thread.vocal.appdata.xml.in $_pkgname/build/com.github.needle-and-thread.vocal.appdata.xml
-
   cd $_pkgname/build
   make DESTDIR="$pkgdir/" install
 }