Adopt and update dependencies

2 files changed, 36 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index faadbc4d25ed..e14c937665d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,12 @@
 pkgbase = tumbler-git
 	pkgdesc = Thumbnail generator for Thunar GIO branches - git checkout
-	pkgver = 0.2.3.15.g1d9718f
+	pkgver = 0.2.8+19+g232b3d6
 	pkgrel = 1
-	url = http://git.xfce.org/xfce/tumbler/tree/README
+	url = https://gitlab.xfce.org/xfce/tumbler/-/blob/master/README
 	arch = i686
 	arch = x86_64
+	arch = aarch64
+	arch = armv7h
 	groups = xfce4-git
 	license = GPL2
 	makedepends = ffmpegthumbnailer
@@ -13,19 +15,17 @@ pkgbase = tumbler-git
 	makedepends = libgsf
 	makedepends = libopenraw
 	makedepends = poppler-glib
-	makedepends = xfce4-dev-tools-git
-	depends = dbus-glib
+	makedepends = xfce4-dev-tools
 	depends = gdk-pixbuf2
 	optdepends = ffmpegthumbnailer: for video thumbnails
 	optdepends = poppler-glib: for PDF thumbnails
 	optdepends = libgsf: for ODF thumbnails
 	optdepends = libopenraw: for RAW thumbnails
 	optdepends = freetype2: for font thumbnails
-	provides = tumbler=0.2.3.15.g1d9718f
+	provides = tumbler=0.2.8+19+g232b3d6
 	conflicts = tumbler
-	source = tumbler-git::git://git.xfce.org/xfce/tumbler
+	source = tumbler::git+https://gitlab.xfce.org/xfce/tumbler.git
 	sha256sums = SKIP
-	sha512sums = SKIP
 
 pkgname = tumbler-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9816b7fd8ceb..d6ef6588d596 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,45 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
+# Maintainer:  twa022 <twa022 at gmail dot com>
+# Contributor: Frederic Bezies <fredbezies at gmail dot com>
 # Contributor:Limao Luo <luolimao+AUR@gmail.com>
-#
-# (Added from tumbler package)
-# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan Jezek <honzin.jezek@gmail.com>
 
-pkgname=tumbler-git
-pkgver=0.2.3.15.g1d9718f
+_pkgname=tumbler
+pkgname=${_pkgname}-git
+pkgver=0.2.8+19+g232b3d6
 pkgrel=1
 pkgdesc="Thumbnail generator for Thunar GIO branches - git checkout"
-arch=(i686 x86_64)
-url=http://git.xfce.org/xfce/${pkgname%-*}/tree/README
+arch=('i686' 'x86_64' 'aarch64' 'armv7h')
+url='https://gitlab.xfce.org/xfce/tumbler/-/blob/master/README'
 license=(GPL2)
-groups=(xfce4-git)
-depends=(dbus-glib gdk-pixbuf2)
-makedepends=(ffmpegthumbnailer freetype2 git libgsf libopenraw poppler-glib xfce4-dev-tools-git)
+groups=('xfce4-git')
+depends=('gdk-pixbuf2')
+makedepends=('ffmpegthumbnailer' 'freetype2' 'git' 'libgsf' 'libopenraw' 'poppler-glib' 'xfce4-dev-tools')
 optdepends=('ffmpegthumbnailer: for video thumbnails'
-    'poppler-glib: for PDF thumbnails'
-    'libgsf: for ODF thumbnails'
-    'libopenraw: for RAW thumbnails'
-    'freetype2: for font thumbnails')
-provides=(${pkgname%-*}=$pkgver)
-conflicts=(${pkgname%-*})
-source=($pkgname::git://git.xfce.org/xfce/${pkgname%-*})
+            'poppler-glib: for PDF thumbnails'
+            'libgsf: for ODF thumbnails'
+            'libopenraw: for RAW thumbnails'
+            'freetype2: for font thumbnails')
+provides=(${_pkgname}=$pkgver)
+conflicts=(${_pkgname})
+source=(${_pkgname}::git+https://gitlab.xfce.org/xfce/tumbler.git)
 sha256sums=('SKIP')
-sha512sums=('SKIP')
 
 pkgver() {
-    cd $pkgname/
-    git describe | sed 's/^tumbler-//;s/-/./g'
+  cd "${_pkgname}"
+  git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/^xfce-//;s/-/+/g"
 }
 
 build() {
-    cd $pkgname/
-    ./autogen.sh \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --libexecdir=/usr/lib/xfce4 \
-        --disable-static \
-        --disable-debug
-    make
+  cd "${_pkgname}"
+  ./autogen.sh \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --disable-static \
+    --disable-debug
+  make
 }
 
 package() {
-    make -C $pkgname DESTDIR="$pkgdir" install
+  cd "${_pkgname}"
+  make DESTDIR="${pkgdir}" install
 }