wok diff openbox/receipt @ rev 12467

Up: openbox (3.5.0) Incon in menu and a bunch of changes
author Christophe Lincoln <pankso@slitaz.org>
date Sun Apr 22 19:49:37 2012 +0200 (2012-04-22)
parents 3a1d935572e1
children 73641efed1cc
line diff
     1.1 --- a/openbox/receipt	Fri Dec 09 12:30:24 2011 +0100
     1.2 +++ b/openbox/receipt	Sun Apr 22 19:49:37 2012 +0200
     1.3 @@ -1,21 +1,20 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="openbox"
     1.7 -VERSION="3.4.11.1"
     1.8 +VERSION="3.5.0"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Small-footprint and standard compliant Window Manager."
    1.11  SUGGESTED="obconf pcmanfm hsetroot slitaz-configs"
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14 -WEB_SITE="http://icculus.org/openbox/"
    1.15 -WGET_URL="http://offload2.icculus.org:9090/openbox/releases/$TARBALL"
    1.16 +WEB_SITE="http://openbox.org/"
    1.17 +WGET_URL="http://openbox.org/dist/openbox/$TARBALL"
    1.18  TAGS="window-manager wm"
    1.19  
    1.20  DEPENDS="startup-notification pango glib xorg-libX11 fontconfig freetype \
    1.21 -xorg-libXrandr xorg-libXft"
    1.22 +xorg-libXrandr xorg-libXft libxml2 imlib2 slitaz-configs"
    1.23  BUILD_DEPENDS="xorg-dev pango-dev glib-dev startup-notification-dev \
    1.24 -xorg-libXft-dev util-linux-ng-uuid-dev"
    1.25 -
    1.26 +xorg-libXft-dev util-linux-ng-uuid-dev libxml2-dev imlib2-dev"
    1.27  
    1.28  # Rules to configure and make the package.
    1.29  compile_rules()
    1.30 @@ -25,42 +24,42 @@
    1.31  	./configure \
    1.32  		--prefix=/usr \
    1.33  		--sysconfdir=/etc \
    1.34 -		--infodir=/usr/share/info \
    1.35 -		--mandir=/usr/share/man \
    1.36 +		--libexecdir=/usr/lib/openbox \
    1.37  		$CONFIGURE_ARGS &&
    1.38  	sed -i 's/^mkdir_p = .*/mkdir_p = mkdir -p/' po/Makefile &&
    1.39  	make &&
    1.40 -	make -j1 DESTDIR=$PWD/_pkg install
    1.41 +	make -j1 DESTDIR=$DESTDIR install &&
    1.42 +	rm -rf $install/usr/share/applications
    1.43  }
    1.44  
    1.45  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.46  genpkg_rules()
    1.47  {
    1.48 -	mkdir -p $fs/usr/lib/openbox $fs/usr/share
    1.49 -	cp -a $_pkg/usr/bin $fs/usr
    1.50 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.51 -	cp -a $_pkg/usr/share/themes $fs/usr/share
    1.52 +	mkdir -p $fs/usr/lib/openbox $fs/usr/share/themes
    1.53 +	cp -a $install/usr/bin $fs/usr
    1.54 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.55 +	cp -a $install/usr/lib/openbox $fs/usr/lib
    1.56  	
    1.57  	# We dont have GNOME or KDE
    1.58  	rm $fs/usr/bin/openbox-gnome-session
    1.59  	rm $fs/usr/bin/openbox-kde-session
    1.60  	rm $fs/usr/bin/gnome-panel-control
    1.61 +	rm $fs/usr/bin/gdm-control
    1.62  	chmod 0755 $fs/usr/bin/openbox-session
    1.63  	
    1.64 +	# Python XDG script --> openbox-python
    1.65 +	rm -f $fs/usr/lib/openbox/openbox-xdg-autostart
    1.66 +	patch -p1 $fs/usr/lib/openbox/openbox-autostart \
    1.67 +		-i $stuff/openbox-autostart.patch || exit 1
    1.68 +	
    1.69 +	# Just Onyx Themes --> openbox-themes
    1.70 +	cp -a $install/usr/share/themes/Onyx* $fs/usr/share/themes
    1.71 +	
    1.72 +	# Xsessions
    1.73 +	cp -a $stuff/xsessions $fs/usr/share
    1.74 +	
    1.75  	# Pipe menu.
    1.76 -	cp stuff/open-folder-menu.sh $fs/usr/lib/openbox
    1.77 -	
    1.78 -	# Fix an error in openbox-session (version 3.4.11.1)
    1.79 -	sed 's#exec /usr/bin/openbox "$@"#exec /usr/bin/openbox#' \
    1.80 -		-i $fs/usr/bin/openbox-session
    1.81 -
    1.82 -	# Locale
    1.83 -	for i in $LOCALE
    1.84 -	do
    1.85 -		mkdir -p $fs/usr/share/locale/$i/LC_MESSAGES
    1.86 -		cp $src/po/$i.gmo \
    1.87 -			$fs/usr/share/locale/$i/LC_MESSAGES/openbox.mo
    1.88 -	done
    1.89 +	cp $stuff/open-folder-menu.sh $fs/usr/lib/openbox
    1.90  
    1.91  	# Set perms.
    1.92  	chown -R root.root $fs