upg dbus hwdata
This commit is contained in:
parent
f79e04b3b3
commit
861c353026
6 changed files with 95 additions and 60 deletions
|
|
@ -5,32 +5,34 @@
|
|||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
#pkgbase=dbus
|
||||
pkgname=(dbus) # dbus-docs)
|
||||
pkgname=dbus
|
||||
# dbus-docs you can get from arch, dbus-daemon-units is a split
|
||||
# of native systemd services if pkg is built with systemd
|
||||
#pkgname=(dbus dbus-daemon-units # dbus-docs)
|
||||
pkgver=1.14.10
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="unFreedesktop.org message bus system w/o systemd"
|
||||
url="https://wiki.freedesktop.org/www/Software/dbus/"
|
||||
depends=(expat audit)
|
||||
makedepends=(xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive automake)
|
||||
makedepends=(autoconf-archive docbook-xsl doxygen git python xmlto yelp-tools)
|
||||
depends=(expat audit libcap-ng)
|
||||
makedepends=(docbook-xsl doxygen python xmlto yelp-tools)
|
||||
#options=(debug) ## uncomment this to have the dbus-debug pkg produced
|
||||
source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
|
||||
#source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
|
||||
source=(https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz{,.asc}
|
||||
dbus.sysusers
|
||||
dbus.tmpfiles)
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
# Allow us to enable checks without them being fatal
|
||||
# # Allow us to enable checks without them being fatal
|
||||
# patch -Np2 -i ../no-fatal-warnings.patch
|
||||
# git apply -3 ../no-fatal-warnings.diff
|
||||
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
# NOCONFIGURE=1 ./autogen.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
cd $pkgname
|
||||
cd $pkgname-$pkgver
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
|
|
@ -58,44 +60,64 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
make -C dbus -j1 check
|
||||
make -C dbus-$pkgver -j1 check
|
||||
}
|
||||
|
||||
#_pick() {
|
||||
# local p="$1" f d; shift
|
||||
# for f; do
|
||||
# d="$srcdir/$p/${f#$pkgdir/}"
|
||||
# mkdir -p "$(dirname "$d")"
|
||||
# mv "$f" "$d"
|
||||
# rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
|
||||
# done
|
||||
#}
|
||||
|
||||
package() {
|
||||
depends+=(libaudit.so)
|
||||
depends+=(libaudit.so libcap-ng.so libexpat.so)
|
||||
provides=(libdbus libdbus-1.so)
|
||||
conflicts=(libdbus)
|
||||
replaces=(libdbus)
|
||||
|
||||
DESTDIR="$pkgdir" make -C dbus install
|
||||
cd dbus-$pkgver
|
||||
DESTDIR="$pkgdir" make install
|
||||
|
||||
rm -r "$pkgdir"/{etc,var}
|
||||
|
||||
# Since it is built without systemd there is nothing to "pick"
|
||||
# _pick unit "$pkgdir"/usr/lib/systemd/{system,user}/dbus.service
|
||||
# _pick docs "$pkgdir"/usr/share/doc
|
||||
|
||||
# # We have a pre-assigned uid (81)
|
||||
# echo 'u dbus 81 "System Message Bus"' |
|
||||
# install -D -m0644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
||||
install -D -m0644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
||||
install -D -m0644 "$srcdir/dbus.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/dbus.conf"
|
||||
|
||||
# install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
|
||||
|
||||
# Split docs
|
||||
mkdir -p doc/usr/share
|
||||
mv {"$pkgdir",doc}/usr/share/doc
|
||||
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
|
||||
# install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
||||
# install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
|
||||
install -Dm644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
||||
install -Dm644 "$srcdir/dbus.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/dbus.conf"
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
|
||||
}
|
||||
|
||||
#package_dbus-daemon-units() {
|
||||
# pkgdesc+=" - Service units"
|
||||
# depends=(dbus)
|
||||
# provides=(dbus-units)
|
||||
# conflicts=(dbus-broker-units)
|
||||
#
|
||||
# mv unit/* "$pkgdir"
|
||||
# }
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(GPL custom)
|
||||
license=("AFL-2.1 OR GPL-2.0-or-later")
|
||||
|
||||
validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
|
||||
|
||||
sha256sums=(SKIP
|
||||
9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8 # dbus.sysusers
|
||||
sha256sums=(ba1f21d2bd9d339da2d4aa8780c09df32fea87998b73da24f49ab9df1e36a50f # dbus-1.14.10.tar.xz
|
||||
5f292cd0603c3d736026ed3f4d1c1937847981669c1f0a389083518f013e1081 # dbus-1.14.10.tar.xz.asc
|
||||
9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8 # dbus.sysusers
|
||||
965cef20cce35819e89c65f06a931a38bea2119b0ae9c259b5d7f9cfc3edd6d7) # dbus.tmpfiles
|
||||
|
||||
## 31531503ec68e03cc0cb46a1d3a821ea6692d2eb19811c7a5193548a5a1c5ef9 dbus-1.14.10-01-x86_64.pkg.tar.lz
|
||||
## fa4e0b01c7db3f9937bd03741fb29e834cd07a197fdda3fbb70f574280e9206e dbus-1.14.10-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,45 +6,42 @@
|
|||
pkgbase=dbus
|
||||
pkgname=(
|
||||
dbus
|
||||
dbus-daemon-units
|
||||
dbus-docs
|
||||
)
|
||||
pkgver=1.14.10
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Freedesktop.org message bus system"
|
||||
url="https://wiki.freedesktop.org/www/Software/dbus/"
|
||||
arch=(x86_64)
|
||||
license=(
|
||||
GPL
|
||||
custom
|
||||
)
|
||||
license=("AFL-2.1 OR GPL-2.0-or-later")
|
||||
depends=(
|
||||
audit
|
||||
libcap-ng
|
||||
expat
|
||||
systemd-libs
|
||||
)
|
||||
makedepends=(
|
||||
autoconf-archive
|
||||
docbook-xsl
|
||||
doxygen
|
||||
git
|
||||
python
|
||||
systemd
|
||||
xmlto
|
||||
yelp-tools
|
||||
)
|
||||
source=(
|
||||
"git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
|
||||
https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz{,.asc}
|
||||
dbus-reload.hook
|
||||
)
|
||||
b2sums=('SKIP'
|
||||
b2sums=('f605b0810dcde6a0753384927131e7f4675be737ad7506a51261717c2622e74b99ac33cc2c199b98e5aa6b9d7c68ef692b8ee9f684f6fdab8d06c6fa861a6f6b'
|
||||
'SKIP'
|
||||
'05ab81bf72e7cf45ad943f5b84eaecef4f06bed94979c579a3e23134cbabd7ea6f65fa9ac252f8b43ceb4a3295e0d2325f06560a044fe7ddf125fc30dfc2b7e2')
|
||||
validpgpkeys=(
|
||||
DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90 # Simon McVittie <simon.mcvittie@collabora.co.uk>
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd dbus
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
cd dbus-$pkgver
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -70,18 +67,30 @@ build() {
|
|||
--without-x
|
||||
)
|
||||
|
||||
cd dbus
|
||||
cd dbus-$pkgver
|
||||
./configure "${configure_options[@]}"
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
make -C dbus -j1 check
|
||||
make -C dbus-$pkgver -j1 check
|
||||
}
|
||||
|
||||
_pick() {
|
||||
local p="$1" f d; shift
|
||||
for f; do
|
||||
d="$srcdir/$p/${f#$pkgdir/}"
|
||||
mkdir -p "$(dirname "$d")"
|
||||
mv "$f" "$d"
|
||||
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
|
||||
done
|
||||
}
|
||||
|
||||
package_dbus() {
|
||||
depends+=(
|
||||
libaudit.so
|
||||
libcap-ng.so
|
||||
libexpat.so
|
||||
libsystemd.so
|
||||
)
|
||||
provides=(
|
||||
|
|
@ -91,30 +100,37 @@ package_dbus() {
|
|||
conflicts=(libdbus)
|
||||
replaces=(libdbus)
|
||||
|
||||
DESTDIR="$pkgdir" make -C dbus install
|
||||
cd dbus-$pkgver
|
||||
DESTDIR="$pkgdir" make install
|
||||
|
||||
rm -r "$pkgdir"/{etc,var}
|
||||
|
||||
_pick unit "$pkgdir"/usr/lib/systemd/{system,user}/dbus.service
|
||||
_pick docs "$pkgdir"/usr/share/doc
|
||||
|
||||
# We have a pre-assigned uid (81)
|
||||
echo 'u dbus 81 "System Message Bus"' |
|
||||
install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
||||
|
||||
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
|
||||
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 ../*.hook
|
||||
|
||||
# Split docs
|
||||
mkdir -p doc/usr/share
|
||||
mv {"$pkgdir",doc}/usr/share/doc
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
|
||||
}
|
||||
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
|
||||
package_dbus-daemon-units() {
|
||||
pkgdesc+=" - Service units"
|
||||
depends=(dbus)
|
||||
provides=(dbus-units)
|
||||
conflicts=(dbus-broker-units)
|
||||
|
||||
mv unit/* "$pkgdir"
|
||||
}
|
||||
|
||||
package_dbus-docs() {
|
||||
pkgdesc+=" - Documentation"
|
||||
depends=()
|
||||
|
||||
mv doc/* "$pkgdir"
|
||||
|
||||
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
|
||||
mv docs/* "$pkgdir"
|
||||
}
|
||||
|
||||
# vim:set sw=2 sts=-1 et:
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
rm -rf {src,pkg,dbus}
|
||||
rm -rf {src,pkg,dbus*.tar.xz*}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,5 @@ docbook-xsl
|
|||
python
|
||||
yelp-tools
|
||||
doxygen
|
||||
git
|
||||
autoconf-archive
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=hwdata
|
||||
pkgver=0.377
|
||||
pkgver=0.378
|
||||
pkgrel=01
|
||||
pkgdesc="hardware identification databases"
|
||||
makedepends=('git')
|
||||
replaces=('hwids')
|
||||
conflicts=(hwids)
|
||||
url=https://github.com/vcrhonek/hwdata
|
||||
source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}-2?signed")
|
||||
source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}?signed")
|
||||
|
||||
build() {
|
||||
cd ${pkgname}
|
||||
|
|
@ -37,5 +37,5 @@ validpgpkeys=('3C40194FB79138CE0F78FD4919C2F062574F5403') # Vitezslav Crhonek
|
|||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
## 44620ee19bb1106cc4fa70561970d8af1de92c3c69360930ef55c5e7e10b9a13 hwdata-0.377-01-x86_64.pkg.tar.lz
|
||||
## 8f727be5d1f60276657766a1222e72ba50d47f4f751c0db3950b1371f35ce71a hwdata-0.378-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
pkgname=hwdata
|
||||
pkgver=0.377
|
||||
pkgver=0.378
|
||||
pkgrel=1
|
||||
pkgdesc="hardware identification databases"
|
||||
makedepends=('git')
|
||||
|
|
@ -8,7 +8,7 @@ replaces=('hwids')
|
|||
url=https://github.com/vcrhonek/hwdata
|
||||
license=('GPL-2.0-or-later')
|
||||
arch=('any')
|
||||
source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}-2?signed")
|
||||
source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}?signed")
|
||||
validpgpkeys=('3C40194FB79138CE0F78FD4919C2F062574F5403') # Vitezslav Crhonek
|
||||
sha256sums=('SKIP')
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue