update to latest revision and fix build

2 files changed, 47 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f1f82342f3c..14bb87eff7a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
-# Generated by mksrcinfo v8
-# Sun Oct  8 22:34:10 UTC 2017
 pkgbase = rhythmbox-git
 	pkgdesc = Music playback and management application
-	pkgver = 3.4.2
+	pkgver = 3.4.3+106+g4859c2d5e
 	pkgrel = 1
-	url = http://www.rhythmbox.org
+	url = https://wiki.gnome.org/Apps/Rhythmbox
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	license = GPL
+	checkdepends = check
+	checkdepends = xorg-server-xvfb
 	makedepends = itstool
 	makedepends = intltool
 	makedepends = brasero
@@ -20,8 +20,8 @@ pkgbase = rhythmbox-git
 	makedepends = libmtp
 	makedepends = gtk-doc
 	makedepends = yelp-tools
+	makedepends = git
 	depends = dconf
-	depends = desktop-file-utils
 	depends = gst-plugins-base
 	depends = gst-plugins-good
 	depends = libsoup
@@ -31,8 +31,9 @@ pkgbase = rhythmbox-git
 	depends = media-player-info
 	depends = totem-plparser
 	depends = tdb
-	depends = webkit2gtk
+	depends = python-gobject
 	depends = libgudev
+	depends = grilo
 	optdepends = gst-plugins-ugly: Extra media codecs
 	optdepends = gst-plugins-bad: Extra media codecs
 	optdepends = gst-libav: Extra media codecs
@@ -42,11 +43,11 @@ pkgbase = rhythmbox-git
 	optdepends = lirc: LIRC plugin
 	optdepends = libgpod: Portable Players - iPod plugin
 	optdepends = libmtp: Portable Players - MTP plugin
-	optdepends = python-mako: Context pane plugin
-	provides = rhythmbox=3.4.2
+	optdepends = gvfs-mtp: Portable Players - Android plugin
+	provides = rhythmbox=3.4.3+106+g4859c2d5e
 	conflicts = rhythmbox
 	options = !emptydirs
-	source = rhythmbox-git::git+https://git.gnome.org/browse/rhythmbox
+	source = rhythmbox-git::git+https://gitlab.gnome.org/GNOME/rhythmbox
 	sha256sums = SKIP
 
 pkgname = rhythmbox-git
diff --git a/PKGBUILD b/PKGBUILD
index 77601f533b2f..1ed128e11d63 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
-# Maintainer: Adria Arrufat <adria.arrufat+AUR@protonmail.ch>
-# Contributor: Limao Luo <luolimao+AUR@gmail.com>
-# Contributor: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer Adria Arrufat <swiftscythe@gmail.com>
+# Contributor Limao Luo <luolimao+AUR@gmail.com>
+# Contributor Thomas Dziedzic <gostrc@gmail.com>
+# Contributor Jan de Groot <jgc@archlinux.org>
+# Contributor Giovanni Scafora <giovanni@archlinux.org>
 
 _pkgname=rhythmbox
 pkgname=$_pkgname-git
-pkgver=3.4.2
+pkgver=3.4.3+106+g4859c2d5e
 pkgrel=1
 pkgdesc="Music playback and management application"
 arch=(i686 x86_64)
-license=(GPL2)
-url=http://www.rhythmbox.org
-depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkit2gtk libgudev)
-makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc libgpod libmtp gtk-doc yelp-tools)
+license=(GPL)
+url="https://wiki.gnome.org/Apps/Rhythmbox"
+depends=(dconf gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas
+         media-player-info totem-plparser tdb python-gobject libgudev grilo)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc libgpod
+             libmtp gtk-doc yelp-tools git)
+checkdepends=(check xorg-server-xvfb)
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'
             'gst-libav: Extra media codecs'
@@ -23,16 +26,16 @@ optdepends=('gst-plugins-ugly: Extra media codecs'
             'lirc: LIRC plugin'
             'libgpod: Portable Players - iPod plugin'
             'libmtp: Portable Players - MTP plugin'
-            'python-mako: Context pane plugin')
+            'gvfs-mtp: Portable Players - Android plugin')
+options=('!emptydirs')
 provides=($_pkgname=$pkgver)
 conflicts=($_pkgname)
-options=(!emptydirs)
-source=($pkgname::git+https://git.gnome.org/browse/$_pkgname)
+source=($pkgname::git+https://gitlab.gnome.org/GNOME/$_pkgname)
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$pkgname"
-    git describe --always | sed 's|-|+|g;s|v||'
+    cd $pkgname
+    git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
 prepare() {
@@ -46,18 +49,28 @@ prepare() {
 }
 
 build() {
-    cd "$srcdir/$pkgname"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/rhythmbox \
-	MOZILLA_PLUGINDIR=/usr/lib/epiphany/plugins \
-        --localstatedir=/var --disable-static \
-        --enable-daap --enable-python --enable-vala \
-	--enable-gtk-doc --disable-werror
+    cd $pkgname
+    ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib/rhythmbox \
+    --disable-browser-plugin \
+    --disable-static \
+    --disable-more-warnings \
+    --enable-daap \
+    --enable-gtk-doc \
+    --enable-python \
+    --enable-vala \
+
+    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname"
+    cd $pkgname
     make DESTDIR="$pkgdir" install
     rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
     rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"