Minor fix

3 files changed, 52 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f668dac0851c..1213a207f8a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,15 +8,13 @@ pkgbase = mingw-w64-dbus
 	license = GPL
 	makedepends = mingw-w64-configure
 	makedepends = docbook-xsl
+	makedepends = autoconf-archive
 	makedepends = git
 	depends = mingw-w64-expat
 	provides = mingw-w64-libdbus
-	conflicts = mingw-w64-libdbus
-	replaces = mingw-w64-libdbus
 	options = !strip
-	options = !buildflags
 	options = staticlibs
-	options = !emptydirs
+	options = !buildflags
 	source = git+https://anongit.freedesktop.org/git/dbus/dbus#commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8
 	sha256sums = SKIP
 
diff --git a/.gitignore b/.gitignore
index 273c53f09b4e..97589fb4de69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
-dbus/
-pkg/
-src/
-*.asc
-*.gz
-*.log
-*.tar
-*.xz
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!*.install
+!*.patch
+!*.diff
diff --git a/PKGBUILD b/PKGBUILD
index 6540b4cbebc0..6a91ea026689 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,61 +1,65 @@
+# Maintainer: pingplug <pingplug@foxmail.com>
+# Contributor: Schala Zeal <schalaalexiazeal@gmail.com>
 # Contributor: Filip Brcic <brcha@gna.org>
+
+_commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8  # tags/dbus-1.12.6^0
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
 pkgname=mingw-w64-dbus
 pkgver=1.12.6
 pkgrel=1
-_commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8  # tags/dbus-1.12.6^0
-arch=(any)
 pkgdesc="Freedesktop.org message bus system (mingw-w64)"
-depends=(mingw-w64-expat)
-makedepends=(mingw-w64-configure docbook-xsl git)
-options=(!strip !buildflags staticlibs !emptydirs)
-conflicts=(mingw-w64-libdbus)
-provides=(mingw-w64-libdbus)
-replaces=(mingw-w64-libdbus)
-license=("custom" "GPL")
+arch=('any')
 url="https://wiki.freedesktop.org/www/Software/dbus/"
-source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit")
+license=('custom' 'GPL')
+depends=('mingw-w64-expat')
+makedepends=('mingw-w64-configure'
+             'docbook-xsl'
+             'autoconf-archive'
+             'git')
+provides=('mingw-w64-libdbus')
+options=('!strip' 'staticlibs' '!buildflags')
+source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=${_commit}")
 sha256sums=('SKIP')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
 pkgver() {
   cd "${srcdir}/dbus"
   git describe --tags | sed 's/^dbus-//;s/-/+/g'
 }
 
 prepare() {
-	cd "${srcdir}/dbus"
-	NOCONFIGURE=1 ./autogen.sh
+  cd "${srcdir}/dbus"
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-	cd "${srcdir}/dbus"
-	unset LDFLAGS
-	for _arch in ${_architectures}; do
-		mkdir -p build-${_arch} && pushd build-${_arch}
-		${_arch}-configure \
-			--target=${_arch} \
-			--with-xml=expat \
-			--disable-systemd \
-			--disable-tests \
-			--disable-Werror \
-			--disable-asserts \
-			--disable-verbose-mode \
-			--disable-xml-docs \
-			--disable-doxygen-docs \
-			--disable-ducktype-docs
-		make
-		popd
-	done
+  cd "${srcdir}/dbus"
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-configure \
+      --target=${_arch} \
+      --with-xml=expat \
+      --disable-systemd \
+      --disable-tests \
+      --disable-Werror \
+      --disable-asserts \
+      --disable-verbose-mode \
+      --disable-xml-docs \
+      --disable-doxygen-docs \
+      --disable-ducktype-docs
+    make
+    popd
+  done
 }
 
 package() {
-	for _arch in ${_architectures}; do
-		cd "${srcdir}/dbus/build-${_arch}"
-		make DESTDIR="${pkgdir}" install
-		find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip {} \;
-		find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
-		find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs ${_arch}-strip -g
-	done
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/dbus/build-${_arch}"
+    make DESTDIR="${pkgdir}" install
+    find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec ${_arch}-strip {} \;
+    find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
+    find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs ${_arch}-strip -g
+  done
 }
 
+# vim:set ts=2 sw=2 et: