diff options
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 25 |
3 files changed, 24 insertions, 16 deletions
@@ -1,15 +1,16 @@ # Generated by mksrcinfo v8 -# Tue Dec 6 19:29:43 UTC 2016 +# Sun Feb 19 22:47:07 UTC 2017 pkgbase = mingw-w64-dbus pkgdesc = Freedesktop.org message bus system (mingw-w64) - pkgver = 1.10.14 + pkgver = 1.10.16 pkgrel = 1 - url = http://www.freedesktop.org/wiki/Software/dbus + url = https://wiki.freedesktop.org/www/Software/dbus/ arch = any license = custom license = GPL makedepends = mingw-w64-configure makedepends = docbook-xsl + makedepends = git depends = mingw-w64-expat provides = mingw-w64-libdbus conflicts = mingw-w64-libdbus @@ -18,10 +19,8 @@ pkgbase = mingw-w64-dbus options = !buildflags options = staticlibs options = !emptydirs - source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.14.tar.gz - source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.14.tar.gz.asc - md5sums = 3f7b013ce8f641cd4c897acda0ef3467 - md5sums = SKIP + source = git+https://anongit.freedesktop.org/git/dbus/dbus#commit=8b582cb10d7cf00af7a70496aec48af24edc542b + sha256sums = SKIP pkgname = mingw-w64-dbus diff --git a/.gitignore b/.gitignore index 7f8bc6c44c91..273c53f09b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ +dbus/ pkg/ src/ *.asc *.gz +*.log *.tar *.xz @@ -1,32 +1,39 @@ # Contributor: Filip Brcic <brcha@gna.org> pkgname=mingw-w64-dbus -pkgver=1.10.14 +pkgver=1.10.16 pkgrel=1 +_commit=8b582cb10d7cf00af7a70496aec48af24edc542b arch=(any) pkgdesc="Freedesktop.org message bus system (mingw-w64)" depends=(mingw-w64-expat) -makedepends=(mingw-w64-configure docbook-xsl) +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") -url="http://www.freedesktop.org/wiki/Software/dbus" -source=("http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz"{,.asc}) -md5sums=('3f7b013ce8f641cd4c897acda0ef3467' - 'SKIP') +url="https://wiki.freedesktop.org/www/Software/dbus/" +source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit") +sha256sums=('SKIP') validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie@collabora.co.uk> '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk> _architectures="i686-w64-mingw32 x86_64-w64-mingw32" +pkgver() { + cd "${srcdir}/dbus" + git describe --tags | sed 's/^dbus-//;s/-/+/g' +} + prepare() { - cd "${srcdir}/dbus-${pkgver}" + cd "${srcdir}/dbus" + git cherry-pick -n 09cb6d7b467f6d1c6685ee9ccc171f4dddbe1f42 + NOCONFIGURE=1 ./autogen.sh sed -i 's,THREAD_LIBS="$THREAD_LIBS -lrt",THREAD_LIBS="$THREAD_LIBS",' configure } build() { - cd "${srcdir}/dbus-${pkgver}" + cd "${srcdir}/dbus" unset LDFLAGS for _arch in ${_architectures}; do mkdir -p build-${_arch} && pushd build-${_arch} @@ -48,7 +55,7 @@ build() { package() { for _arch in ${_architectures}; do - cd "${srcdir}/dbus-${pkgver}/build-${_arch}" + 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 {} \; |