formatting changes

2 files changed, 53 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c49ef0f0c3ab..4980dc6c7b1b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,31 +6,31 @@ pkgbase = xdg-desktop-portal-git
 	url = https://github.com/flatpak/xdg-desktop-portal
 	arch = x86_64
 	license = LGPL2.1
-	makedepends = python
-	makedepends = xmlto
 	makedepends = docbook-xsl
 	makedepends = git
 	makedepends = flatpak
 	makedepends = libportal
-	depends = glib2
-	depends = pipewire
+	makedepends = python
+	makedepends = xmlto
 	depends = fuse3
 	depends = gdk-pixbuf2
 	depends = geoclue
+	depends = glib2
 	depends = json-glib
+	depends = pipewire
 	depends = systemd
-	provides = xdg-desktop-portal
+	provides = xdg-desktop-portal=1.14.1.r15.gdfd9539
 	conflicts = xdg-desktop-portal
 	source = git+https://github.com/flatpak/xdg-desktop-portal
-	sha512sums = SKIP
+	b2sums = SKIP
 
 pkgname = xdg-desktop-portal-git
-	depends = glib2
-	depends = pipewire
 	depends = fuse3
 	depends = gdk-pixbuf2
 	depends = geoclue
+	depends = glib2
 	depends = json-glib
+	depends = pipewire
 	depends = systemd
-	depends = xdg-desktop-portal-impl
 	depends = rtkit
+	depends = xdg-desktop-portal-impl
diff --git a/PKGBUILD b/PKGBUILD
index 9a47fb859e63..0763a35448ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,45 @@
 # Maintainer:  Marcell Meszaros < marcell.meszaros AT runbox.eu >
 # Contributor: Kevin Majewski < kevin.majewski02 AT gmail.com >
 
-pkgname=xdg-desktop-portal-git
-_pkgname=xdg-desktop-portal
+pkgname='xdg-desktop-portal-git'
+_pkgname="${pkgname%-git}"
 pkgver=1.14.1.r15.gdfd9539
 pkgrel=2
 epoch=1
-pkgdesc="Desktop integration portals for sandboxed apps"
-url="https://github.com/flatpak/xdg-desktop-portal"
-arch=(x86_64)
-license=(LGPL2.1)
-depends=('glib2' 'pipewire' 'fuse3' 'gdk-pixbuf2' 'geoclue' 'json-glib' 'systemd')
-makedepends=('python' 'xmlto' 'docbook-xsl' 'git' 'flatpak' 'libportal')
-# checkdepends=('epiphany' 'gedit' 'gvfs') # disable if not used in check()
-provides=($_pkgname)
-conflicts=($_pkgname)
-source=("git+https://github.com/flatpak/xdg-desktop-portal")
-sha512sums=('SKIP')
+pkgdesc='Desktop integration portals for sandboxed apps'
+url="https://github.com/flatpak/${_pkgname}"
+arch=('x86_64')
+license=('LGPL2.1')
+depends=(
+  'fuse3'
+  'gdk-pixbuf2'
+  'geoclue'
+  'glib2'
+  'json-glib'
+  'pipewire'
+  'systemd'
+)
+makedepends=(
+  'docbook-xsl'
+  'git'
+  'flatpak'
+  'libportal'
+  'python'
+  'xmlto'
+)
+# checkdepends=(
+#   'epiphany'
+#   'gedit'
+#   'gvfs'
+# ) # disable if not used in check()
+provides=("${_pkgname}=${pkgver}")
+conflicts=("${_pkgname}")
+source=("git+https://github.com/flatpak/${_pkgname}")
+b2sums=('SKIP')
 
 pkgver() {
-  cd $_pkgname
+  cd "${_pkgname}"
+
   # Generate git tag based version. Count only proper (v)#.#* [#=number] tags.
   local _gitversion=$(git describe --long --tags --match '[v0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') 
 
@@ -31,18 +51,21 @@ pkgver() {
 }
 
 prepare() {
-  cd $_pkgname
+  cd "${_pkgname}"
   NOCONFIGURE=1 ./autogen.sh
+  ./configure --prefix='/usr' --libexecdir='/usr/lib'
 }
 
 build() {
-  cd $_pkgname
-  ./configure --prefix=/usr --libexecdir=/usr/lib
-  make 
+  cd "${_pkgname}"
+  make
 }
 
 package() {
-  depends+=('xdg-desktop-portal-impl' 'rtkit')
-  cd $_pkgname
-  make DESTDIR="$pkgdir" install
+  depends+=(
+    'rtkit'
+    'xdg-desktop-portal-impl' 
+  )
+  cd "${_pkgname}"
+  make DESTDIR="${pkgdir}" install
 }