Update for v5.1

2 files changed, 31 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9638834455ae..e2d8d1c0a0ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = aaru-git
 	pkgdesc = Disc image management and creation tool for disks, tapes, optical and solid state media
-	pkgver = v4.5.1.1692.r811.g16849ea2
-	pkgrel = 2
+	pkgver = v5.1.0.3214.r3.g011ec1e3
+	pkgrel = 1
 	url = http://www.aaru.app
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
 	license = GPL
-	makedepends = dotnet-sdk>=2.0.0
+	makedepends = dotnet-sdk>=3.1.0
 	makedepends = git
 	depends = icu
 	depends = krb5
@@ -24,6 +24,3 @@ pkgbase = aaru-git
 
 pkgname = aaru-git
 
-pkgname = aaru-gtk-git
-	depends = gtk3
-
diff --git a/PKGBUILD b/PKGBUILD
index 6e3772511067..5266b5477241 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 #@IgnoreInspection BashAddShebang
 # Maintainer: Natalia Portillo <claunia@claunia.com>
-_netcoretarget='netcoreapp2.0'
-_aarubase=aaru
+_netcoretarget='netcoreapp3.1'
+_aarubase='Aaru'
 packager='Natalia Portillo <claunia@claunia.com>'
 pkgbase='aaru-git'
-pkgname=('aaru-git' 'aaru-gtk-git')
-pkgver=v4.5.1.1692.r811.g16849ea2
-pkgrel=2
+pkgname=('aaru-git')
+pkgver=v5.1.0.3214.r3.g011ec1e3
+pkgrel=1
 pkgdesc='Disc image management and creation tool for disks, tapes, optical and solid state media'
 arch=('x86_64' 'armv7h' 'aarch64')
 url='http://www.aaru.app'
 license=('GPL')
 source=('git://github.com/aaru-dps/Aaru')
-makedepends=('dotnet-sdk>=2.0.0' 'git')
+makedepends=('dotnet-sdk>=3.1.0' 'git')
 options=('!strip' 'staticlibs')
 sha256sums=('SKIP')
 provides=('aaru')
@@ -28,8 +28,8 @@ else
 fi
 
 pkgver() {
-  cd "${srcdir}"/"${_aarubase}"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$SRCDEST"/"${_aarubase}"
+  git describe --tags --match "v5*" --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
@@ -38,29 +38,28 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}"/"${_aarubase}"
-    dotnet restore Aaru.sln
-    dotnet build -f ${_netcoretarget} -c Debug Aaru.sln
-    dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid} Aaru.sln
-    dotnet restore Aaru.Gtk.sln
-    dotnet build -f ${_netcoretarget} -c Debug Aaru.Gtk.sln
-    dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid} Aaru.Gtk.sln
+    cd "${srcdir}"/"${_aarubase}"/Aaru
+    dotnet publish -f ${_netcoretarget} -c Debug --self-contained -r ${dotnet_rid}
 }
 
-package_aaru-git() {
+package() {
+    # Install MIME database file
+    cd "${srcdir}"/"${_aarubase}"/Aaru
+    install -d -m0755 -g 0 "${pkgdir}"/usr/share/mime/packages
+    install -m0755 -g 0 -t "${pkgdir}"/usr/share/mime/packages aaruformat.xml
+
     cd "${srcdir}"/"${_aarubase}"/Aaru/bin/Debug/${_netcoretarget}/${dotnet_rid}/publish
 
     # Create destination directory
     install -d -m0755 -g 0 "${pkgdir}"/opt/Aaru
 
     # Copy Linux binary
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru Aaru
+    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru aaru
 
     # Copy Linux dependencies
     install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.so
     install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.a
     install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru createdump
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru sosdocsunix.txt
 
     # Copy .NET dependencies
     install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru *.dll
@@ -77,41 +76,19 @@ package_aaru-git() {
 
     # Link executable
     install -d -m0755 -g 0 "${pkgdir}"/usr/bin
-    ln -sf /opt/Aaru/Aaru "${pkgdir}"/usr/bin/aaru
+    ln -sf /opt/Aaru/aaru "${pkgdir}"/usr/bin/aaru
 }
 
-# TODO: Can optimize so no need to install separately with a depend?
-package_aaru-gtk-git() {
-    depends=('gtk3')
-
-    cd "${srcdir}"/"${_aarubase}"/Aaru.Gtk/bin/Debug/${_netcoretarget}/${dotnet_rid}/publish
-
-    # Create destination directory
-    install -d -m0755 -g 0 "${pkgdir}"/opt/Aaru.Gtk
-
-    # Copy Linux binary
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk AaruGui
-
-    # Copy Linux dependencies
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk *.so
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk *.a
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk createdump
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk sosdocsunix.txt
-
-    # Copy .NET dependencies
-    install -m0755 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk *.dll
-
-    # Copy .NET configuration files
-    install -m0644 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk *.json
-
-    # Copy documentation files
-    install -m0644 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk *.md
-    install -m0644 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk LICENSE*
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+  update-mime-database usr/share/mime &>/dev/null
+  update-desktop-database -q
+}
 
-    # Copy .NET debug files
-    install -m0644 -g 0 -t "${pkgdir}"/opt/Aaru.Gtk *.pdb
+post_upgrade() {
+  post_install "$1"
+}
 
-    # Link executable
-    install -d -m0755 -g 0 "${pkgdir}"/usr/bin
-    ln -sf /opt/Aaru/AaruGui "${pkgdir}"/usr/bin/aaru-gtk
+post_remove() {
+  post_install "$1"
 }