wok-next diff dbus/receipt @ rev 19647

Forgotten changes: libdrm-*, dbus, fontconfig, harfbuzz, libdrm, pixman, xorg-glproto.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Feb 23 00:58:26 2017 +0200 (2017-02-23)
parents 124c3a7da04f
children eb23a9b0f828
line diff
     1.1 --- a/dbus/receipt	Fri Dec 04 02:45:17 2015 +0200
     1.2 +++ b/dbus/receipt	Thu Feb 23 00:58:26 2017 +0200
     1.3 @@ -1,27 +1,34 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dbus"
     1.7 -VERSION="1.6.22"
     1.8 +VERSION="1.10.14"
     1.9  CATEGORY="x-window"
    1.10 -SHORT_DESC="D-Bus is a message bus system."
    1.11 +SHORT_DESC="D-Bus, a message bus system"
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.15 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus"
    1.16 -WGET_URL="http://dbus.freedesktop.org/releases/dbus/$TARBALL"
    1.17 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/"
    1.18  HOST_ARCH="i486 arm"
    1.19  
    1.20 -DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
    1.21 -xorg-libXau xorg-libXdmcp util-linux-uuid"
    1.22 -BUILD_DEPENDS="xorg-libX11-dev expat-dev util-linux-uuid-dev"
    1.23 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.24 +WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
    1.25 +
    1.26 +DEPENDS="expat xorg-libX11 slitaz-base-files"
    1.27 +BUILD_DEPENDS="expat-dev xorg-libX11-dev"
    1.28 +SPLIT="dbus-helper"
    1.29  
    1.30  # Rules to configure and make the package.
    1.31  compile_rules()
    1.32  {
    1.33  	./configure \
    1.34 -		--libexecdir=/usr/lib/dbus \
    1.35  		--sysconfdir=/etc \
    1.36  		--localstatedir=/var \
    1.37 +		--disable-doxygen-docs \
    1.38 +		--disable-xml-docs \
    1.39 +		--disable-static \
    1.40 +		--disable-systemd \
    1.41 +		--without-systemdsystemunitdir \
    1.42 +		--with-console-auth-dir=/run/console/ \
    1.43 +		--docdir=/usr/share/doc/dbus-$VERSION \
    1.44  		$CONFIGURE_ARGS &&
    1.45  	make && make -j 1 install
    1.46  }
    1.47 @@ -29,17 +36,12 @@
    1.48  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.49  genpkg_rules()
    1.50  {
    1.51 -	mkdir -p $fs/usr/lib $fs/usr/share
    1.52 -	cp -a $install/etc $fs
    1.53 -	cp -a $install/var $fs
    1.54 -	cp -a $install/usr/bin $fs/usr
    1.55 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.56 -	cp -a $install/usr/lib/dbus $fs/usr/lib
    1.57 -	# Remove helper --> dbus-helper
    1.58 -	rm $fs/usr/lib/dbus/dbus-daemon-launch-helper
    1.59 -	cp -a $install/usr/share/dbus* $fs/usr/share
    1.60 +	cook_copy_folders var bin dbus-1
    1.61 +	cook_copy_files *.so*
    1.62 +
    1.63  	# Init script
    1.64  	cp -a $stuff/etc $fs
    1.65 +
    1.66  	chown -R root.root $fs
    1.67  }
    1.68  
    1.69 @@ -49,15 +51,15 @@
    1.70  	# was found.
    1.71  	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    1.72  		action 'Adding user: messagebus...'
    1.73 -		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd"
    1.74 +		echo 'messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false' >> "$1/etc/passwd"
    1.75  		echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow"
    1.76 -		echo 'messagebus:x:25:' >> "$1/etc/group"
    1.77 +		echo 'messagebus:x:18:' >> "$1/etc/group"
    1.78  		echo 'messagebus:!::' >> "$1/etc/gshadow"
    1.79  		status
    1.80  	fi
    1.81  	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
    1.82  		action 'Configuring %s/etc/daemons.conf...' "$1"
    1.83 -		cat >> "$1/etc/daemons.conf" << "EOT"
    1.84 +		cat >> "$1/etc/daemons.conf" <<EOT
    1.85  # DBUS daemon options.
    1.86  DBUS_OPTIONS="--system"
    1.87  
    1.88 @@ -70,7 +72,7 @@
    1.89  pre_remove()
    1.90  {
    1.91  	if [ -z "$1" ]; then
    1.92 -		/etc/init.d/dbus stop 2> /dev/null
    1.93 +		/etc/init.d/dbus stop 2>/dev/null
    1.94  		deluser messagebus
    1.95  	fi
    1.96  }