general update

3 files changed, 37 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 842240615330..c74d5e25d7e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,30 @@
 pkgbase = baobab-git
 	pkgdesc = A graphical directory tree analyzer
-	pkgver = 3.16.1.2.ga28ca81
+	pkgver = 3.29.1.r0.g3dfacf3
 	pkgrel = 1
-	url = http://gnome.org
-	install = baobab.install
-	arch = i686
+	url = https://wiki.gnome.org/Apps/DiskUsageAnalyzer
 	arch = x86_64
-	groups = gnome-extra
+	arch = i686
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
+	groups = gnome
 	license = GPL2
 	makedepends = intltool
 	makedepends = itstool
-	makedepends = vala>=0.25.1
+	makedepends = vala
 	makedepends = gobject-introspection
-	depends = glib2
+	makedepends = yelp-tools
+	makedepends = appstream-glib
+	makedepends = git
+	makedepends = meson
 	depends = dconf
-	depends = gtk3>=3.13.2
+	depends = gtk3
 	depends = gsettings-desktop-schemas
-	depends = hicolor-icon-theme
-	depends = desktop-file-utils
-	provides = baobab=3.16.1
+	depends = librsvg
+	provides = baobab
 	conflicts = baobab
-	source = git://git.gnome.org/baobab
+	source = baobab-git::git+https://gitlab.gnome.org/GNOME/baobab
 	sha256sums = SKIP
 
 pkgname = baobab-git
diff --git a/PKGBUILD b/PKGBUILD
index 1fe336d56b64..3b778beeda0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,34 @@
-# Maintainer: Yosef Or Boczko <yoseforb@gnome.org>
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Yosef Or Boczko <yoseforb@gnome.org>
 
-_pkgname=baobab
-pkgname=$_pkgname-git
-pkgver=3.16.1.2.ga28ca81
-_realver=3.16.1
+pkgname=baobab-git
+pkgver=3.29.1.r0.g3dfacf3
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=("glib2" 'dconf' "gtk3>=3.13.2" 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'itstool' "vala>=0.25.1" 'gobject-introspection')
-groups=('gnome-extra')
-provides=("${_pkgname}=${_realver}")
-conflicts=("${_pkgname}")
-replace=("${_pkgname}")
-install=$_pkgname.install
-source=('git://git.gnome.org/baobab')
+arch=(x86_64 i686 armv6h armv7h aarch64)
+url="https://wiki.gnome.org/Apps/DiskUsageAnalyzer"
+license=(GPL2)
+depends=(dconf gtk3 gsettings-desktop-schemas librsvg)
+makedepends=(intltool itstool vala gobject-introspection yelp-tools appstream-glib git meson)
+groups=(gnome)
+provides=(baobab)
+conflicts=(baobab)
+source=("${pkgname}::git+https://gitlab.gnome.org/GNOME/baobab")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$_pkgname"
-  git describe | sed 's/^v//;s/-/./g;s/_/./g;'
-}
-
-prepare() {
-  cd "$srcdir/$_pkgname"
+  cd "$srcdir/$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  ./autogen.sh --prefix=/usr
-  make
+  arch-meson $pkgname build
+  ninja -C build
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C build install
+
+  # https://bugs.archlinux.org/task/31861
+  sed -i '/MimeType/d' "$pkgdir/usr/share/applications/org.gnome.baobab.desktop"
 }
diff --git a/baobab.install b/baobab.install
deleted file mode 100644
index 7f9d829020d1..000000000000
--- a/baobab.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}