This commit is contained in:
joborun linux 2023-03-02 17:55:46 +02:00
parent be9b4adc84
commit a23e84d3c2
3 changed files with 82 additions and 67 deletions

View File

@ -5,34 +5,32 @@
# Website : https://pozol.eu # Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |--------------------------------------- #-----------------------------------------| DESCRIPTION |---------------------------------------
pkgbase=dbus #pkgbase=dbus
pkgname=(dbus) # dbus-docs) pkgname=(dbus) # dbus-docs)
pkgver=1.14.6 pkgver=1.14.6
pkgrel=01 pkgrel=02
pkgdesc="Freedesktop.org message bus system" pkgdesc="unFreedesktop.org message bus system w/o systemd"
url="https://wiki.freedesktop.org/www/Software/dbus/" url="https://wiki.freedesktop.org/www/Software/dbus/"
arch=(x86_64)
depends=(expat audit) depends=(expat audit)
makedepends=(xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive automake) makedepends=(xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive automake)
makedepends=(autoconf-archive docbook-xsl doxygen git python xmlto yelp-tools)
#options=(debug) ## uncomment this to have the dbus-debug pkg produced #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"
# no-fatal-warnings.patch
no-fatal-warnings.diff
dbus.sysusers dbus.sysusers
dbus.tmpfiles) dbus.tmpfiles)
prepare() { prepare() {
cd $pkgbase cd $pkgname
# 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 # patch -Np2 -i ../no-fatal-warnings.patch
git apply -3 ../no-fatal-warnings.diff # git apply -3 ../no-fatal-warnings.diff
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
build() { build() {
cd dbus cd $pkgname
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
@ -43,14 +41,14 @@ build() {
--with-dbus-user=dbus \ --with-dbus-user=dbus \
--with-system-pid-file=/run/dbus/pid \ --with-system-pid-file=/run/dbus/pid \
--with-system-socket=/run/dbus/system_bus_socket \ --with-system-socket=/run/dbus/system_bus_socket \
--without-systemdsystemunitdir \ --with-systemdsystemunitdir=no \
--enable-inotify \ --enable-inotify \
--enable-libaudit \ --enable-libaudit \
--disable-systemd \ --disable-systemd \
--disable-user-session \ --disable-user-session \
--enable-xml-docs \ --disable-xml-docs \
--enable-doxygen-docs \ --disable-doxygen-docs \
--enable-ducktype-docs \ --disable-ducktype-docs \
--disable-static \ --disable-static \
--disable-asserts \ --disable-asserts \
--disable-x11-autolaunch \ --disable-x11-autolaunch \
@ -63,7 +61,7 @@ check() {
make -C dbus -j1 check make -C dbus -j1 check
} }
package_dbus() { package() {
depends+=(libaudit.so) depends+=(libaudit.so)
provides=(libdbus libdbus-1.so) provides=(libdbus libdbus-1.so)
conflicts=(libdbus) conflicts=(libdbus)
@ -88,27 +86,18 @@ package_dbus() {
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
} }
# Uncomment the following section to have dbus-docs produced, otherwise #---- arch license gpg-key & sha256sums ----
# get the one from Arch and disregard anything about systemd functionality
#
#package_dbus-docs() {
# pkgdesc+=" (documentation)"
# depends=()
#
# mv doc/* "$pkgdir"
#
# install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
#}
#
#---- license gpg-key sha256sums ---- arch=(x86_64)
license=(GPL custom) license=(GPL custom)
validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk> validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
sha256sums=(SKIP sha256sums=(SKIP
c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478 # no-fatal-warnings.diff
9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8 # dbus.sysusers 9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8 # dbus.sysusers
965cef20cce35819e89c65f06a931a38bea2119b0ae9c259b5d7f9cfc3edd6d7) # dbus.tmpfiles 965cef20cce35819e89c65f06a931a38bea2119b0ae9c259b5d7f9cfc3edd6d7) # dbus.tmpfiles
## 26b4167d607b6584a92b79eaf71a430fca98e8eb9a0ae8de613eace9f7b89295 dbus-1.14.6-02-x86_64.pkg.tar.lz

View File

@ -4,53 +4,73 @@
# Contributor: Link Dupont <link@subpop.net> # Contributor: Link Dupont <link@subpop.net>
pkgbase=dbus pkgbase=dbus
pkgname=(dbus dbus-docs) pkgname=(
dbus
dbus-docs
)
pkgver=1.14.6 pkgver=1.14.6
pkgrel=1 pkgrel=2
pkgdesc="Freedesktop.org message bus system" pkgdesc="Freedesktop.org message bus system"
url="https://wiki.freedesktop.org/www/Software/dbus/" url="https://wiki.freedesktop.org/www/Software/dbus/"
arch=(x86_64) arch=(x86_64)
license=(GPL custom) license=(
depends=(systemd-libs expat audit) GPL
makedepends=(systemd xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive) custom
source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver" )
dbus-reload.hook no-fatal-warnings.diff) depends=(
sha256sums=('SKIP' audit
'd636205622d0ee3b0734360225739ef0c7ad2468a09489e6ef773d88252960f3' expat
'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478') 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"
dbus-reload.hook
)
b2sums=('SKIP'
'05ab81bf72e7cf45ad943f5b84eaecef4f06bed94979c579a3e23134cbabd7ea6f65fa9ac252f8b43ceb4a3295e0d2325f06560a044fe7ddf125fc30dfc2b7e2')
validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk> validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
prepare() { prepare() {
cd dbus cd dbus
# Allow us to enable checks without them being fatal
git apply -3 ../no-fatal-warnings.diff
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }
build() { build() {
cd dbus local configure_options=(
./configure \ --prefix=/usr
--prefix=/usr \ --sysconfdir=/etc
--sysconfdir=/etc \ --localstatedir=/var
--localstatedir=/var \ --libexecdir=/usr/lib/dbus-1.0
--libexecdir=/usr/lib/dbus-1.0 \ --runstatedir=/run
--runstatedir=/run \ --with-console-auth-dir=/run/console/
--with-console-auth-dir=/run/console/ \ --with-dbus-user=dbus
--with-dbus-user=dbus \ --with-system-pid-file=/run/dbus/pid
--with-system-pid-file=/run/dbus/pid \ --with-system-socket=/run/dbus/system_bus_socket
--with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=/usr/lib/systemd/system
--with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-inotify
--enable-inotify \ --enable-libaudit
--enable-libaudit \ --enable-systemd
--enable-systemd \ --enable-user-session
--enable-user-session \ --enable-xml-docs
--enable-xml-docs \ --enable-doxygen-docs
--enable-doxygen-docs \ --enable-ducktype-docs
--enable-ducktype-docs \ --disable-static
--disable-static \
--without-x --without-x
)
cd dbus
./configure "${configure_options[@]}"
make make
} }
@ -59,8 +79,14 @@ check() {
} }
package_dbus() { package_dbus() {
depends+=(libsystemd.so libaudit.so) depends+=(
provides=(libdbus libdbus-1.so) libaudit.so
libsystemd.so
)
provides=(
libdbus
libdbus-1.so
)
conflicts=(libdbus) conflicts=(libdbus)
replaces=(libdbus) replaces=(libdbus)
@ -82,7 +108,7 @@ package_dbus() {
} }
package_dbus-docs() { package_dbus-docs() {
pkgdesc+=" (documentation)" pkgdesc+=" - Documentation"
depends=() depends=()
mv doc/* "$pkgdir" mv doc/* "$pkgdir"

View File

@ -1,6 +1,6 @@
real 1m23.901s real 2m2.980s
user 1m11.422s user 1m18.705s
sys 0m10.355s sys 0m11.720s