wok diff dbus/receipt @ rev 23769

linux:CONFIG_INPUT_ATLAS_BTNS=m
author Richard Dunbar <mojo@slitaz.org>
date Thu May 14 20:21:23 2020 -0400 (2020-05-14)
parents 124c3a7da04f
children 96ef6ba30769
line diff
     1.1 --- a/dbus/receipt	Fri Dec 04 02:45:17 2015 +0200
     1.2 +++ b/dbus/receipt	Thu May 14 20:21:23 2020 -0400
     1.3 @@ -1,45 +1,53 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="dbus"
     1.7 -VERSION="1.6.22"
     1.8 +VERSION="1.12.16"
     1.9  CATEGORY="x-window"
    1.10 -SHORT_DESC="D-Bus is a message bus system."
    1.11 +SHORT_DESC="A message bus system."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 +WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/"
    1.15 +
    1.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.17 -WEB_SITE="http://www.freedesktop.org/wiki/Software/dbus"
    1.18 -WGET_URL="http://dbus.freedesktop.org/releases/dbus/$TARBALL"
    1.19 +WGET_URL="https://dbus.freedesktop.org/releases/dbus/$TARBALL"
    1.20 +
    1.21 +DEPENDS="expat slitaz-base-files util-linux-uuid xorg-libICE 
    1.22 +	xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp"
    1.23 +BUILD_DEPENDS="expat-dev util-linux-uuid-dev xorg-libX11-dev"
    1.24 +
    1.25  HOST_ARCH="i486 arm"
    1.26  
    1.27 -DEPENDS="expat xorg-libX11 slitaz-base-files xorg-libICE xorg-libSM \
    1.28 -xorg-libXau xorg-libXdmcp util-linux-uuid"
    1.29 -BUILD_DEPENDS="xorg-libX11-dev expat-dev util-linux-uuid-dev"
    1.30 -
    1.31  # Rules to configure and make the package.
    1.32  compile_rules()
    1.33  {
    1.34 -	./configure \
    1.35 -		--libexecdir=/usr/lib/dbus \
    1.36 -		--sysconfdir=/etc \
    1.37 -		--localstatedir=/var \
    1.38 +	./configure				\
    1.39 +		--libexecdir=/usr/lib/dbus	\
    1.40 +		--sysconfdir=/etc		\
    1.41 +		--localstatedir=/var		\
    1.42  		$CONFIGURE_ARGS &&
    1.43 -	make && make -j 1 install
    1.44 +	make &&
    1.45 +	make install
    1.46  }
    1.47  
    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 +	mkdir -p $fs/usr/lib
    1.58 +	mkdir -p $fs/usr/share
    1.59 +
    1.60 +	cp -a $install/etc		$fs
    1.61 +	cp -a $install/var		$fs
    1.62 +	cp -a $install/usr/bin		$fs/usr
    1.63 +	cp -a $install/usr/lib/*.so*	$fs/usr/lib
    1.64 +	cp -a $install/usr/lib/dbus	$fs/usr/lib
    1.65 +	cp -a $install/usr/share/dbus*	$fs/usr/share
    1.66 +
    1.67 +	# Init script
    1.68 +	cp -a $stuff/etc $fs
    1.69 +
    1.70  	# Remove helper --> dbus-helper
    1.71  	rm $fs/usr/lib/dbus/dbus-daemon-launch-helper
    1.72 -	cp -a $install/usr/share/dbus* $fs/usr/share
    1.73 -	# Init script
    1.74 -	cp -a $stuff/etc $fs
    1.75 +
    1.76  	chown -R root.root $fs
    1.77  }
    1.78  
    1.79 @@ -47,7 +55,8 @@
    1.80  {
    1.81  	# Go for echoing on configuration files if any messagebus user
    1.82  	# was found.
    1.83 -	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    1.84 +	if ! grep -qs 'messagebus' "$1/etc/passwd"
    1.85 +	  then
    1.86  		action 'Adding user: messagebus...'
    1.87  		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd"
    1.88  		echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow"
    1.89 @@ -55,7 +64,8 @@
    1.90  		echo 'messagebus:!::' >> "$1/etc/gshadow"
    1.91  		status
    1.92  	fi
    1.93 -	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
    1.94 +	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"
    1.95 +	  then
    1.96  		action 'Configuring %s/etc/daemons.conf...' "$1"
    1.97  		cat >> "$1/etc/daemons.conf" << "EOT"
    1.98  # DBUS daemon options.
    1.99 @@ -64,12 +74,14 @@
   1.100  EOT
   1.101  		status
   1.102  	fi
   1.103 +
   1.104  	[ -d "$1/var/run" ] || mkdir -p "$1/var/run"
   1.105  }
   1.106  
   1.107  pre_remove()
   1.108  {
   1.109 -	if [ -z "$1" ]; then
   1.110 +	if [ -z "$1" ]
   1.111 +	  then
   1.112  		/etc/init.d/dbus stop 2> /dev/null
   1.113  		deluser messagebus
   1.114  	fi