wok-next diff dbus/receipt @ rev 21651

updated fftw (3.3.6-pl2 -> 3.3.8)
author Hans-G?nter Theisgen
date Fri Jun 26 20:55:50 2020 +0100 (2020-06-26)
parents e19ff076dc63
children
line diff
     1.1 --- a/dbus/receipt	Mon Dec 31 17:23:40 2018 +0200
     1.2 +++ b/dbus/receipt	Fri Jun 26 20:55:50 2020 +0100
     1.3 @@ -1,22 +1,22 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="dbus"
     1.7 -VERSION="1.12.12"
     1.8 +VERSION="1.12.18"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="D-Bus, a message bus system"
    1.11 -MAINTAINER="devel@slitaz.org"
    1.12 +MAINTAINER="maintainer@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14  WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/"
    1.15  LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/dbus.html"
    1.16  
    1.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.18  WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
    1.19 -TARBALL_SHA1="ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa"
    1.20 +# 1.12.12 TARBALL_SHA1="ff61dc5bb7e3b4dd86444f4a72fb54378edc54fa"
    1.21  
    1.22  COOKOPTS="force-arch" # different .h
    1.23  
    1.24 -BUILD_DEPENDS="expat-dev libx11-dev glib-dev libice-dev \
    1.25 -libsm-dev libxslt xmlto libxml2-tools" # docbook-xsl
    1.26 +BUILD_DEPENDS="expat-dev glib-dev libice-dev libsm-dev libx11-dev
    1.27 +	libxslt libxml2-tools xmlto" # docbook-xsl
    1.28  SPLIT="$PACKAGE-helper $PACKAGE-introspect $PACKAGE $PACKAGE-dev"
    1.29  
    1.30  COPY_helper="dbus-daemon-launch-helper"
    1.31 @@ -31,40 +31,44 @@
    1.32  
    1.33  CONFIG_FILES_std="/etc/dbus-1/session.conf /etc/dbus-1/system.conf /etc/dbus-1/system.d/"
    1.34  
    1.35 -compile_rules() {
    1.36 +compile_rules()
    1.37 +{
    1.38  	# temporarily: --disable-xml-docs
    1.39 -	./configure \
    1.40 -		--disable-doxygen-docs \
    1.41 -		--disable-xml-docs \
    1.42 -		--disable-static \
    1.43 -		--with-console-auth-dir=/run/console/ \
    1.44 -		--with-system-pid-file=/run/dbus/pid \
    1.45 -		--with-system-socket=/run/dbus/system_bus_socket \
    1.46 -		--disable-systemd \
    1.47 -		--without-systemdsystemunitdir \
    1.48 +	./configure						\
    1.49 +		--disable-doxygen-docs				\
    1.50 +		--disable-xml-docs				\
    1.51 +		--disable-static					\
    1.52 +		--with-console-auth-dir=/run/console/		\
    1.53 +		--with-system-pid-file=/run/dbus/pid		\
    1.54 +		--with-system-socket=/run/dbus/system_bus_socket	\
    1.55 +		--disable-systemd				\
    1.56 +		--without-systemdsystemunitdir			\
    1.57  		$CONFIGURE_ARGS &&
    1.58  	fix libtool &&
    1.59  	make &&
    1.60  	make -j1 install || return 1
    1.61  
    1.62  	# Init script
    1.63 -	cp -a $stuff/etc $install
    1.64 -	chown -R root.root $install/etc
    1.65 +	cp -a $stuff/etc		$install
    1.66 +	chown -R root.root	$install/etc
    1.67  
    1.68  	# docbook stuff
    1.69  	mkdir -p $install/usr/share/xml/docbook/stylesheet/dbus
    1.70 -	cp doc/introspect.* $install/usr/share/xml/docbook/stylesheet/dbus
    1.71 +	cp doc/introspect.*	$install/usr/share/xml/docbook/stylesheet/dbus
    1.72  }
    1.73  
    1.74 -pre_install_dbus() {
    1.75 +pre_install_dbus()
    1.76 +{
    1.77  	# Go for echoing on configuration files if any messagebus user
    1.78  	# was found.
    1.79 -	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    1.80 +	if ! grep -qs 'messagebus' "$1/etc/passwd"
    1.81 +	  then
    1.82  		chroot "$1/" addgroup -g25 -S messagebus
    1.83  		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G messagebus \
    1.84  			-g"D-Bus Message Daemon User" messagebus
    1.85  	fi
    1.86 -	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
    1.87 +	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"
    1.88 +	  then
    1.89  		action 'Configuring %s/etc/daemons.conf...' "$1"
    1.90  		cat >> "$1/etc/daemons.conf" <<EOT
    1.91  # DBUS daemon options.
    1.92 @@ -84,21 +88,25 @@
    1.93  #	[ -z "$1" ] || umount "$1/dev"
    1.94  #}
    1.95  
    1.96 -pre_remove_dbus() {
    1.97 -	if [ -z "$1" ]; then
    1.98 +pre_remove_dbus()
    1.99 +{
   1.100 +	if [ -z "$1" ]
   1.101 +	  then
   1.102  		/etc/init.d/dbus stop
   1.103  	fi 2>/dev/null
   1.104  	chroot "$1/" deluser  messagebus
   1.105  	chroot "$1/" delgroup messagebus
   1.106  }
   1.107  
   1.108 -post_install_dbus_helper() {
   1.109 +post_install_dbus_helper()
   1.110 +{
   1.111  	local i="$1/usr/libexec/dbus-daemon-launch-helper"
   1.112  	chown root:messagebus $i
   1.113  	chmod 4750 $i
   1.114  }
   1.115  
   1.116 -post_install_dbus_introspect() {
   1.117 +post_install_dbus_introspect()
   1.118 +{
   1.119  	U="http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
   1.120  	F="file:///usr/share/xml/docbook/stylesheet/dbus/introspect.dtd"
   1.121