# HG changeset patch # User Christophe Lincoln # Date 1335116977 -7200 # Node ID db9d08c745b40d7c1532ce7ff7774a32877d312f # Parent 7fed8c0a235d52d7bd2a02907d4d4f9679dd8654 Up: openbox (3.5.0) Incon in menu and a bunch of changes diff -r 7fed8c0a235d -r db9d08c745b4 openbox-dev/receipt --- a/openbox-dev/receipt Sun Apr 22 19:04:04 2012 +0200 +++ b/openbox-dev/receipt Sun Apr 22 19:49:37 2012 +0200 @@ -1,12 +1,12 @@ # SliTaz package receipt. PACKAGE="openbox-dev" -VERSION="3.4.11.1" +VERSION="3.5.0" CATEGORY="development" SHORT_DESC="Ob devel files." MAINTAINER="pankso@slitaz.org" WANTED="openbox" -WEB_SITE="http://icculus.org/openbox/" +WEB_SITE="http://openbox.org/" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() diff -r 7fed8c0a235d -r db9d08c745b4 openbox-python/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/openbox-python/receipt Sun Apr 22 19:49:37 2012 +0200 @@ -0,0 +1,18 @@ +# SliTaz package receipt. + +PACKAGE="openbox-python" +VERSION="3.5.0" +CATEGORY="development" +SHORT_DESC="Openbox Python script (XDG auto start standard support)." +MAINTAINER="pankso@slitaz.org" +WANTED="openbox" +WEB_SITE="http://openbox.org/" + +DEPENDS="openbox python python-xdg" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib/openbox + cp -a $install/usr/lib/openbox/*-xdg-* $fs/usr/lib/openbox +} diff -r 7fed8c0a235d -r db9d08c745b4 openbox-themes/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/openbox-themes/receipt Sun Apr 22 19:49:37 2012 +0200 @@ -0,0 +1,19 @@ +# SliTaz package receipt. + +PACKAGE="openbox-themes" +VERSION="3.5.0" +CATEGORY="development" +SHORT_DESC="Openbox official themes set." +MAINTAINER="pankso@slitaz.org" +WANTED="openbox" +WEB_SITE="http://openbox.org/" + +DEPENDS="openbox" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/share + cp -a $install/usr/share/themes $fs/usr/share + rm -rf $fs/usr/share/themes/Onyx* +} diff -r 7fed8c0a235d -r db9d08c745b4 openbox/receipt --- a/openbox/receipt Sun Apr 22 19:04:04 2012 +0200 +++ b/openbox/receipt Sun Apr 22 19:49:37 2012 +0200 @@ -1,21 +1,20 @@ # SliTaz package receipt. PACKAGE="openbox" -VERSION="3.4.11.1" +VERSION="3.5.0" CATEGORY="x-window" SHORT_DESC="Small-footprint and standard compliant Window Manager." SUGGESTED="obconf pcmanfm hsetroot slitaz-configs" MAINTAINER="pankso@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://icculus.org/openbox/" -WGET_URL="http://offload2.icculus.org:9090/openbox/releases/$TARBALL" +WEB_SITE="http://openbox.org/" +WGET_URL="http://openbox.org/dist/openbox/$TARBALL" TAGS="window-manager wm" DEPENDS="startup-notification pango glib xorg-libX11 fontconfig freetype \ -xorg-libXrandr xorg-libXft" +xorg-libXrandr xorg-libXft libxml2 imlib2 slitaz-configs" BUILD_DEPENDS="xorg-dev pango-dev glib-dev startup-notification-dev \ -xorg-libXft-dev util-linux-ng-uuid-dev" - +xorg-libXft-dev util-linux-ng-uuid-dev libxml2-dev imlib2-dev" # Rules to configure and make the package. compile_rules() @@ -25,42 +24,42 @@ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ + --libexecdir=/usr/lib/openbox \ $CONFIGURE_ARGS && sed -i 's/^mkdir_p = .*/mkdir_p = mkdir -p/' po/Makefile && make && - make -j1 DESTDIR=$PWD/_pkg install + make -j1 DESTDIR=$DESTDIR install && + rm -rf $install/usr/share/applications } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/openbox $fs/usr/share - cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib - cp -a $_pkg/usr/share/themes $fs/usr/share + mkdir -p $fs/usr/lib/openbox $fs/usr/share/themes + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/lib/*.so* $fs/usr/lib + cp -a $install/usr/lib/openbox $fs/usr/lib # We dont have GNOME or KDE rm $fs/usr/bin/openbox-gnome-session rm $fs/usr/bin/openbox-kde-session rm $fs/usr/bin/gnome-panel-control + rm $fs/usr/bin/gdm-control chmod 0755 $fs/usr/bin/openbox-session + # Python XDG script --> openbox-python + rm -f $fs/usr/lib/openbox/openbox-xdg-autostart + patch -p1 $fs/usr/lib/openbox/openbox-autostart \ + -i $stuff/openbox-autostart.patch || exit 1 + + # Just Onyx Themes --> openbox-themes + cp -a $install/usr/share/themes/Onyx* $fs/usr/share/themes + + # Xsessions + cp -a $stuff/xsessions $fs/usr/share + # Pipe menu. - cp stuff/open-folder-menu.sh $fs/usr/lib/openbox - - # Fix an error in openbox-session (version 3.4.11.1) - sed 's#exec /usr/bin/openbox "$@"#exec /usr/bin/openbox#' \ - -i $fs/usr/bin/openbox-session - - # Locale - for i in $LOCALE - do - mkdir -p $fs/usr/share/locale/$i/LC_MESSAGES - cp $src/po/$i.gmo \ - $fs/usr/share/locale/$i/LC_MESSAGES/openbox.mo - done + cp $stuff/open-folder-menu.sh $fs/usr/lib/openbox # Set perms. chown -R root.root $fs diff -r 7fed8c0a235d -r db9d08c745b4 openbox/stuff/openbox-autostart.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/openbox/stuff/openbox-autostart.patch Sun Apr 22 19:49:37 2012 +0200 @@ -0,0 +1,8 @@ +--- openbox-autostart.org ++++ openbox-autostart +@@ -31,4 +31,4 @@ + # Run the XDG autostart stuff. These are found in /etc/xdg/autostart and + # in $HOME/.config/autostart. This requires PyXDG to be installed. + # See openbox-xdg-autostart --help for more details. +-/usr/lib/openbox/openbox-xdg-autostart "$@" ++/usr/lib/openbox/openbox-xdg-autostart "$@" || continue diff -r 7fed8c0a235d -r db9d08c745b4 openbox/stuff/xsessions/openbox.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/openbox/stuff/xsessions/openbox.desktop Sun Apr 22 19:49:37 2012 +0200 @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=XSession +Name=OpenBox Session +Icon=openbox +Exec=openbox-session