uppkg -> 1.14.6-1

.SRCINFO

@@ -1,49 +1,47 @@
 pkgbase = dbus-xdg
 	pkgdesc = Freedesktop.org message bus system - but do not create a ~/.dbus directory (for non-systemd systems)
-	pkgver = 1.14.4
+	pkgver = 1.14.6
 	pkgrel = 1
 	url = https://wiki.freedesktop.org/www/Software/dbus/
 	arch = x86_64
 	license = GPL
 	license = custom
-	makedepends = elogind
-	makedepends = xmlto
+	makedepends = autoconf-archive
 	makedepends = docbook-xsl
-	makedepends = python
-	makedepends = yelp-tools
 	makedepends = doxygen
 	makedepends = git
-	makedepends = autoconf-archive
-	depends = libx11
-	depends = libelogind
-	depends = expat
+	makedepends = python
+	makedepends = elogind
+	makedepends = xmlto
+	makedepends = yelp-tools
 	depends = audit
+	depends = expat
+	depends = libelogind
 	provides = dbus
 	provides = dbus-docs
 	conflicts = dbus
 	conflicts = dbus-docs
-	source = git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-1.14.4
+	source = git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-1.14.6
 	source = dbus-enable-elogind.patch
 	source = no-fatal-warnings.diff
 	source = dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch
 	validpgpkeys = DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90
-	sha256sums = SKIP
-	sha256sums = faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0
-	sha256sums = c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478
-	sha256sums = 691a84ca6543ac8d1cd19e915fee7dc967dae106e72200d58b682748265501fc
+	b2sums = SKIP
+	b2sums = c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a
+	b2sums = 1f14c134f0511b7bd8e2dc71f665a6e6e23f0addd944888c6f956d4f29c7caa962aa05fdbe9a10d500a28751ba635168248ae7609c269e03e00366b85d5d488f
+	b2sums = 1e956a19a10198c2c1588577cbdb1cb770abacc1766d3973623c327d55f6d3f43a7560370b523023c94e9b8af82090a4e8f270f97db748465ed7d004a8b01c22
 
 pkgname = dbus-xdg-elogind
-	depends = libx11
-	depends = libelogind
-	depends = expat
 	depends = audit
-	depends = libelogind.so
+	depends = expat
+	depends = libelogind
 	depends = libaudit.so
+	depends = libelogind.so
 	provides = libdbus
 	provides = libdbus-1.so
 	conflicts = libdbus
 	replaces = libdbus
 
 pkgname = dbus-xdg-docs
-	pkgdesc = Freedesktop.org message bus system - but do not create a ~/.dbus directory (for non-systemd systems) (documentation)
+	pkgdesc = Freedesktop.org message bus system - but do not create a ~/.dbus directory (for non-systemd systems) - Documentation
 	depends = 

PKGBUILD

@@ -5,23 +5,44 @@
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgbase=dbus-xdg
-pkgname=(dbus-xdg-elogind dbus-xdg-docs)
-pkgver=1.14.4
+pkgname=(
+  dbus-xdg-elogind
+  dbus-xdg-docs
+)
+pkgver=1.14.6
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system - but do not create a ~/.dbus directory (for non-systemd systems)"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
-license=(GPL custom)
-depends=(libx11 libelogind expat audit)
-makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive)
-source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
-        dbus-enable-elogind.patch
-        no-fatal-warnings.diff
-        dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch)
-sha256sums=('SKIP'
-            'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0'
-            'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478'
-            '691a84ca6543ac8d1cd19e915fee7dc967dae106e72200d58b682748265501fc')
+license=(
+  GPL
+  custom
+)
+depends=(
+  audit
+  expat
+  libelogind
+)
+makedepends=(
+autoconf-archive
+  docbook-xsl
+  doxygen
+  git
+  python
+  elogind
+  xmlto
+  yelp-tools
+)
+source=(
+  "git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
+  dbus-enable-elogind.patch
+  no-fatal-warnings.diff
+  dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch
+)
+b2sums=('SKIP'
+        'c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a'
+        '1f14c134f0511b7bd8e2dc71f665a6e6e23f0addd944888c6f956d4f29c7caa962aa05fdbe9a10d500a28751ba635168248ae7609c269e03e00366b85d5d488f'
+        '1e956a19a10198c2c1588577cbdb1cb770abacc1766d3973623c327d55f6d3f43a7560370b523023c94e9b8af82090a4e8f270f97db748465ed7d004a8b01c22')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 provides=('dbus' 'dbus-docs')
@@ -31,15 +52,14 @@ prepare() {
   cd dbus
   patch -Np 1 -i ../dbus-enable-elogind.patch
   # Allow us to enable checks without them being fatal
-  patch -Np1 -i ../no-fatal-warnings.diff
+  git apply -3 ../no-fatal-warnings.diff
   patch -p1 -i ../dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch
 
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd dbus
-  ./configure \
+  local configure_options=(
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -60,7 +80,10 @@ build() {
     --disable-static \
     --enable-elogind \
     --enable-x11-autolaunch
-  make
+  )
+
+  cd dbus
+  ./configure "${configure_options[@]}"
 }
 
 # check() {
@@ -68,11 +91,19 @@ build() {
 # }
 
 package_dbus-xdg-elogind() {
-  depends+=(libelogind.so libaudit.so)
-  provides=(libdbus libdbus-1.so)
+  depends+=(
+    libaudit.so
+    libelogind.so
+  )
+  provides=(
+    libdbus
+    libdbus-1.so
+  )
   conflicts=(libdbus)
   replaces=(libdbus)
 
+
+
   DESTDIR="$pkgdir" make -C dbus install
 
   rm -r "$pkgdir"/{etc,var}
@@ -89,7 +120,7 @@ package_dbus-xdg-elogind() {
 }
 
 package_dbus-xdg-docs() {
-  pkgdesc+=" (documentation)"
+  pkgdesc+=" - Documentation"
   depends=()
 
   mv doc/* "$pkgdir"