Sync with arch

2 files changed, 27 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 112228121c24..c1ba2c6b682e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,10 @@
 pkgbase = gnome-music-git
 	pkgdesc = Music player and management application
-	pkgver = 3.36.0.r85.g4976f447
+	pkgver = 3.38.0+39+g95f7bf58
 	pkgrel = 1
+	epoch = 1
 	url = https://wiki.gnome.org/Apps/Music
-	arch = i686
 	arch = x86_64
-	arch = armv7h
-	arch = aarch64
-	groups = gnome
 	license = GPL
 	makedepends = gobject-introspection
 	makedepends = git
@@ -16,9 +13,10 @@ pkgbase = gnome-music-git
 	makedepends = appstream-glib
 	depends = grilo
 	depends = grilo-plugins
-	depends = tracker-miners
+	depends = tracker3-miners
 	depends = libdmapsharing
 	depends = libmediaart
+	depends = gtk3
 	depends = gvfs
 	depends = python-gobject
 	depends = python-cairo
@@ -34,9 +32,8 @@ pkgbase = gnome-music-git
 	source = git+https://gitlab.gnome.org/GNOME/gnome-music.git
 	source = git+https://gitlab.gnome.org/GNOME/libgd.git
 	source = git+https://gitlab.gnome.org/mschraal/gfm.git
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = SKIP
 
 pkgname = gnome-music-git
-
diff --git a/PKGBUILD b/PKGBUILD
index ceb9fb476d0f..1b11bfc4940b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,36 @@
-# Maintainer: Philip Goto <philip.goto@gmail.com>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Yosef Or Boczko <yoseforb@gnome.org>
-# Contributor: emersion <contact@emersion.fr>
-
 pkgname=gnome-music-git
-pkgver=3.36.0.r85.g4976f447
+_pkgname=gnome-music
+pkgver=3.38.0+39+g95f7bf58
 pkgrel=1
+epoch=1
 pkgdesc="Music player and management application"
 url="https://wiki.gnome.org/Apps/Music"
-arch=(i686 x86_64 armv7h aarch64)
+arch=(x86_64)
 license=(GPL)
-depends=(grilo grilo-plugins tracker-miners libdmapsharing libmediaart gvfs
-         python-gobject python-cairo gst-plugins-base python-requests libdazzle)
-makedepends=(gobject-introspection git meson yelp-tools appstream-glib)
+depends=('grilo' 'grilo-plugins' 'tracker3-miners' 'libdmapsharing' 'libmediaart' 'gtk3'
+         'gvfs' 'python-gobject' 'python-cairo' 'gst-plugins-base' 'python-requests'
+         'libdazzle')
+makedepends=('gobject-introspection' 'git' 'meson' 'yelp-tools' 'appstream-glib')
 optdepends=('gst-plugins-good: Extra media codecs'
             'gst-plugins-ugly: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'
             'gst-libav: Extra media codecs')
-conflicts=(gnome-music)
-provides=(gnome-music)
-groups=(gnome)
+provides=('gnome-music')
+conflicts=('gnome-music')
 source=("git+https://gitlab.gnome.org/GNOME/gnome-music.git"
         "git+https://gitlab.gnome.org/GNOME/libgd.git"
         "git+https://gitlab.gnome.org/mschraal/gfm.git")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
+b2sums=('SKIP'
+        'SKIP'
+        'SKIP')
 
 pkgver() {
-  cd gnome-music
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd $_pkgname
+  git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd gnome-music
+  cd $_pkgname
 
   git submodule init
   git submodule set-url subprojects/libgd "$srcdir/libgd"
@@ -43,16 +39,16 @@ prepare() {
 }
 
 build() {
-  arch-meson gnome-music build
-  ninja -C build
+  arch-meson $_pkgname build
+  meson compile -C build
 }
 
 check() {
-  ninja -C build test
+  meson test -C build --print-errorlogs
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" meson install -C build
 
   python -m compileall -d /usr/lib "$pkgdir/usr/lib"
   python -O -m compileall -d /usr/lib "$pkgdir/usr/lib"