wok-next rev 20199

Up firmware (fix some multiline or empty descriptions), gettext, gtk-theme-blackbird, libmpd, libmpdclient, openbox & openbox-max (keep default Clearlooks theme), xfce4-icon-theme, xfce4-taskmanager, xfmpc. terminal -> xfce4-terminal, xfce4-ristretto -> ristretto (weird, but we agreed to call packages according to sources tarballs).
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Nov 03 16:28:49 2017 +0200 (2017-11-03)
parents 937f2ed1d5c8
children 54b77cd1523c
files firmware/receipt gettext/receipt gtk-theme-blackbird/receipt gtk-theme-blackbird/stuff/define-sizes.patch gtk-theme-blackbird/stuff/patches/define-sizes.patch gtk-theme-blackbird/stuff/patches/series libmpd-dev/receipt libmpd/receipt libmpd/stuff/patches/0001-fix-return-value.patch libmpd/stuff/patches/0002-include-config.h.patch libmpd/stuff/patches/0003-fix-comparison.patch libmpd/stuff/patches/series libmpdclient-dev/receipt libmpdclient/receipt openbox-max/receipt openbox/receipt terminal/receipt xfce4-icon-theme/receipt xfce4-ristretto/receipt xfce4-taskmanager/receipt xfce4-taskmanager/stuff/xfce4-taskmanager.desktop xfce4-terminal/receipt xfmpc/receipt
line diff
     1.1 --- a/firmware/receipt	Fri Nov 03 15:13:54 2017 +0100
     1.2 +++ b/firmware/receipt	Fri Nov 03 16:28:49 2017 +0200
     1.3 @@ -206,8 +206,8 @@
     1.4  			# TODO: copy licenses
     1.5  			DEPENDS=" "
     1.6  
     1.7 -			desc=$(modinfo -Fdescription $path)
     1.8 -			CAT="kernel|$desc"
     1.9 +			desc=$(modinfo -Fdescription $path | head -n1)
    1.10 +			CAT="kernel|${desc:-$module}"
    1.11  
    1.12  			# copy the whole folder
    1.13  			case $module in
     2.1 --- a/gettext/receipt	Fri Nov 03 15:13:54 2017 +0100
     2.2 +++ b/gettext/receipt	Fri Nov 03 16:28:49 2017 +0200
     2.3 @@ -14,7 +14,7 @@
     2.4  
     2.5  BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev"
     2.6  BUILD_DEPENDS_arm="attr-dev ncurses-dev libxml2-tools libxml2-dev"
     2.7 -SPLIT="gettext-base gettext-tools"
     2.8 +SPLIT="gettext-base gettext-tools gettext"
     2.9  
    2.10  # Handle cross compilation. Glibc-locale are installed in cross chroot.
    2.11  case "$ARCH" in
    2.12 @@ -42,18 +42,6 @@
    2.13  genpkg_rules()
    2.14  {
    2.15  	case $PACKAGE in
    2.16 -		gettext)
    2.17 -			copy @std @dev
    2.18 -			# Remove "gettext-base" and "gettext-tools" files.
    2.19 -			for i in gettext gettext.sh envsubst ngettext \
    2.20 -				msgcat msgfmt msgmerge xgettext \
    2.21 -				libgettextlib*.so* libgettextsrc*.so*; do
    2.22 -				find $fs -name "$i" -delete
    2.23 -			done
    2.24 -			# Runtime depends, then dev-depends
    2.25 -			DEPENDS="gettext-base gettext-tools libcroco liblzma libxml2 \
    2.26 -			acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4"
    2.27 -			;;
    2.28  		gettext-base)
    2.29  			copy gettext gettext.sh envsubst ngettext
    2.30  			CAT="base-system|base tools"
    2.31 @@ -65,5 +53,11 @@
    2.32  			CAT="libs|tools"
    2.33  			DEPENDS="acl attr glib libcroco libgomp liblzma libxml2 pcre zlib"
    2.34  			;;
    2.35 +		gettext)
    2.36 +			copy @std @dev @rm
    2.37 +			# Runtime depends, then dev-depends
    2.38 +			DEPENDS="gettext-base gettext-tools libcroco liblzma libxml2 \
    2.39 +			acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4"
    2.40 +			;;
    2.41  	esac
    2.42  }
     3.1 --- a/gtk-theme-blackbird/receipt	Fri Nov 03 15:13:54 2017 +0100
     3.2 +++ b/gtk-theme-blackbird/receipt	Fri Nov 03 16:28:49 2017 +0200
     3.3 @@ -1,4 +1,4 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="gtk-theme-blackbird"
     3.8  VERSION="0.4"
     3.9 @@ -6,27 +6,19 @@
    3.10  SHORT_DESC="Blackbird is GTK+2 and GTK+3 theme from the Shimmer Project"
    3.11  MAINTAINER="al.bobylev@gmail.com"
    3.12  LICENSE="GPL2 CC-BY-SA-3"
    3.13 -WEB_SITE="http://shimmerproject.org/"
    3.14 +WEB_SITE="https://shimmerproject.org/"
    3.15 +HOST_ARCH="any"
    3.16 +
    3.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.18  WGET_URL="https://github.com/shimmerproject/Blackbird/archive/v$VERSION.tar.gz"
    3.19 -HOST_ARCH="any"
    3.20  
    3.21 -DEPENDS="gtk2-engine-murrine"
    3.22 -
    3.23 -# Rules to configure and make the package
    3.24 -compile_rules()
    3.25 -{
    3.26 -	patch -p1 -i $stuff/define-sizes.patch
    3.27 +compile_rules() {
    3.28 +	T="$install/usr/share/themes/Blackbird"
    3.29 +	mkdir -p $T
    3.30 +	cp -r gtk-2.0 gtk-3.0 metacity-1 xfce-notify-4.0 xfwm4 $T
    3.31  }
    3.32  
    3.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
    3.34 -genpkg_rules()
    3.35 -{
    3.36 -	T='/usr/share/themes/Blackbird'
    3.37 -	mkdir -p $fs/$T
    3.38 -	cp -a \
    3.39 -		$src/gtk-2.0 \
    3.40 -		$src/gtk-3.0 \
    3.41 -		$src/xfce-notify-4.0 \
    3.42 -		$fs/$T
    3.43 +genpkg_rules() {
    3.44 +	copy @std
    3.45 +	DEPENDS="gtk2-engine-murrine"
    3.46  }
     4.1 --- a/gtk-theme-blackbird/stuff/define-sizes.patch	Fri Nov 03 15:13:54 2017 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,11 +0,0 @@
     4.4 ---- a/gtk-2.0/gtkrc
     4.5 -+++ b/gtk-2.0/gtkrc
     4.6 -@@ -2,7 +2,7 @@
     4.7 - 
     4.8 - gtk_color_scheme = "base_color:#333333\nbg_color:#383838\ntooltip_bg_color:#333333\nselected_bg_color:#5588ee\ntext_color:#eeeeee\nfg_color:#dedede\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#333333\nmenubar_fg_color:#dedede\ntoolbar_bg_color:#333333\ntoolbar_fg_color:#dedede\nmenu_bg_color:#333333\nmenu_fg_color:#dedede\npanel_bg_color:#333333\npanel_fg_color:#dedede\nlink_color:#5588ee"
     4.9 - 
    4.10 --gtk-icon-sizes = "panel=16,16:gtk-button=16,16" # Icon sizes
    4.11 -+gtk-icon-sizes = "gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-button=16,16:gtk-dialog=48,48:panel-menu=16,16:panel=16,16:gtk-menu=16,16:gtk-dnd=48,48"
    4.12 - gtk-button-images = 0 # Disables icons in buttons
    4.13 - gtk-toolbar-style = 1 # Enables text in toolbar
    4.14 - gtk-auto-mnemonics = 1 # Disables ugly lines under menu items
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/gtk-theme-blackbird/stuff/patches/define-sizes.patch	Fri Nov 03 16:28:49 2017 +0200
     5.3 @@ -0,0 +1,11 @@
     5.4 +--- a/gtk-2.0/gtkrc
     5.5 ++++ b/gtk-2.0/gtkrc
     5.6 +@@ -2,7 +2,7 @@
     5.7 + 
     5.8 + gtk_color_scheme = "base_color:#333333\nbg_color:#383838\ntooltip_bg_color:#333333\nselected_bg_color:#5588ee\ntext_color:#eeeeee\nfg_color:#dedede\ntooltip_fg_color:#dedede\nselected_fg_color:#f9f9f9\nmenubar_bg_color:#333333\nmenubar_fg_color:#dedede\ntoolbar_bg_color:#333333\ntoolbar_fg_color:#dedede\nmenu_bg_color:#333333\nmenu_fg_color:#dedede\npanel_bg_color:#333333\npanel_fg_color:#dedede\nlink_color:#5588ee"
     5.9 + 
    5.10 +-gtk-icon-sizes = "panel=16,16:gtk-button=16,16" # Icon sizes
    5.11 ++gtk-icon-sizes = "gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-button=16,16:gtk-dialog=48,48:panel-menu=16,16:panel=16,16:gtk-menu=16,16:gtk-dnd=48,48"
    5.12 + gtk-button-images = 0 # Disables icons in buttons
    5.13 + gtk-toolbar-style = 1 # Enables text in toolbar
    5.14 + gtk-auto-mnemonics = 1 # Disables ugly lines under menu items
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/gtk-theme-blackbird/stuff/patches/series	Fri Nov 03 16:28:49 2017 +0200
     6.3 @@ -0,0 +1,1 @@
     6.4 +define-sizes.patch
     7.1 --- a/libmpd-dev/receipt	Fri Nov 03 15:13:54 2017 +0100
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,21 +0,0 @@
     7.4 -# SliTaz package receipt.
     7.5 -
     7.6 -PACKAGE="libmpd-dev"
     7.7 -VERSION="11.8.17"
     7.8 -CATEGORY="development"
     7.9 -MAINTAINER="jozee@slitaz.org"
    7.10 -LICENSE="GPL2"
    7.11 -SHORT_DESC="libmpd devel library."
    7.12 -WANTED="libmpd"
    7.13 -WEB_SITE="http://gmpclient.org/"
    7.14 -HOST_ARCH="i486 arm"
    7.15 -
    7.16 -DEPENDS="pkg-config"
    7.17 -
    7.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
    7.19 -genpkg_rules()
    7.20 -{
    7.21 -	mkdir -p $fs/usr/lib 
    7.22 -	cp -a $install/usr/include $fs/usr
    7.23 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib	
    7.24 -}
     8.1 --- a/libmpd/receipt	Fri Nov 03 15:13:54 2017 +0100
     8.2 +++ b/libmpd/receipt	Fri Nov 03 16:28:49 2017 +0200
     8.3 @@ -1,31 +1,33 @@
     8.4 -# SliTaz package receipt.
     8.5 +# SliTaz package receipt v2.
     8.6  
     8.7  PACKAGE="libmpd"
     8.8  VERSION="11.8.17"
     8.9  CATEGORY="multimedia"
    8.10 +SHORT_DESC="Signal based wrapper around libmpdclient"
    8.11  MAINTAINER="jozee@slitaz.org"
    8.12  LICENSE="GPL2"
    8.13 -SHORT_DESC="Signal based wrapper around libmpdclient"
    8.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.15 -WEB_SITE="http://gmpclient.org/"
    8.16 -WGET_URL="http://download.sarine.nl/Programs/gmpc/${VERSION%.*}/$TARBALL"
    8.17 +WEB_SITE="https://gmpclient.org/"
    8.18  HOST_ARCH="i486 arm"
    8.19  
    8.20 -DEPENDS="glib"
    8.21 -BUILD_DEPENDS="pkg-config glib-dev"
    8.22 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    8.23 +WGET_URL="http://download.sarine.nl/Programs/gmpc/${VERSION%.*}/$TARBALL"
    8.24  
    8.25 -# Rules to configure and make the package.
    8.26 +BUILD_DEPENDS="glib-dev"
    8.27 +SPLIT="libmpd-dev"
    8.28  
    8.29  compile_rules() {
    8.30 -  cd $src
    8.31 -  ./configure --prefix=/usr $CONFIGURE_ARGS &&
    8.32 -  make &&
    8.33 -  make DESTDIR=$DESTDIR install
    8.34 +	./configure $CONFIGURE_ARGS && make && make install
    8.35  }
    8.36 -	
    8.37 -# Rules to gen a SliTaz package suitable for Tazpkg.
    8.38 -genpkg_rules()
    8.39 -{
    8.40 -	mkdir -p $fs/usr/lib
    8.41 -	cp -a $install/usr/lib/*so* $fs/usr/lib/
    8.42 +
    8.43 +genpkg_rules() {
    8.44 +	case $PACKAGE in
    8.45 +		libmpd)
    8.46 +			copy @std
    8.47 +			DEPENDS="glib"
    8.48 +			;;
    8.49 +		*-dev)
    8.50 +			copy @dev
    8.51 +			DEPENDS="libmpd glib-dev pcre-dev"
    8.52 +			;;
    8.53 +	esac
    8.54  }
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/libmpd/stuff/patches/0001-fix-return-value.patch	Fri Nov 03 16:28:49 2017 +0200
     9.3 @@ -0,0 +1,21 @@
     9.4 +From 91001f43970e3faa0a97ccc3fced03b86be47d27 Mon Sep 17 00:00:00 2001
     9.5 +From: Christian Hesse <mail@eworm.de>
     9.6 +Date: Wed, 19 Jul 2017 14:22:48 +0200
     9.7 +Subject: [PATCH 1/3] fix return makes integer from pointer without a cast
     9.8 +---
     9.9 + src/libmpd-playlist.c | 2 +-
    9.10 + 1 file changed, 1 insertion(+), 1 deletion(-)
    9.11 +
    9.12 +diff --git a/src/libmpd-playlist.c b/src/libmpd-playlist.c
    9.13 +index c3c30ec..64c64ea 100644
    9.14 +--- a/src/libmpd-playlist.c
    9.15 ++++ b/src/libmpd-playlist.c
    9.16 +@@ -780,7 +780,7 @@ int mpd_playlist_load(MpdObj *mi, const char *path)
    9.17 + 	if(mpd_lock_conn(mi))
    9.18 + 	{
    9.19 + 		debug_printf(DEBUG_ERROR,"lock failed\n");
    9.20 +-		return NULL;
    9.21 ++		return MPD_LOCK_FAILED;
    9.22 + 	}
    9.23 +     mpd_sendLoadCommand(mi->connection,path);
    9.24 + 	mpd_finishCommand(mi->connection);
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/libmpd/stuff/patches/0002-include-config.h.patch	Fri Nov 03 16:28:49 2017 +0200
    10.3 @@ -0,0 +1,20 @@
    10.4 +From fba7e03c4466f54424a196f646f865909ceb5fc2 Mon Sep 17 00:00:00 2001
    10.5 +From: Christian Hesse <mail@eworm.de>
    10.6 +Date: Wed, 19 Jul 2017 14:38:43 +0200
    10.7 +Subject: [PATCH 2/3] include config.h
    10.8 +---
    10.9 + src/libmpd-strfsong.c | 1 +
   10.10 + 1 file changed, 1 insertion(+)
   10.11 +
   10.12 +diff --git a/src/libmpd-strfsong.c b/src/libmpd-strfsong.c
   10.13 +index 7d47bed..76fa3ff 100644
   10.14 +--- a/src/libmpd-strfsong.c
   10.15 ++++ b/src/libmpd-strfsong.c
   10.16 +@@ -28,6 +28,7 @@
   10.17 + #include <unistd.h>
   10.18 + #include <string.h>
   10.19 + #include <glib.h>
   10.20 ++#include <config.h>
   10.21 + #include "libmpd.h"
   10.22 + #include "libmpd-internal.h"
   10.23 + 
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/libmpd/stuff/patches/0003-fix-comparison.patch	Fri Nov 03 16:28:49 2017 +0200
    11.3 @@ -0,0 +1,21 @@
    11.4 +From f33d4946c9349909d6ddc816d3c7eb81dd342b57 Mon Sep 17 00:00:00 2001
    11.5 +From: Christian Hesse <mail@eworm.de>
    11.6 +Date: Wed, 19 Jul 2017 14:40:00 +0200
    11.7 +Subject: [PATCH 3/3] fix comparison between pointer and zero character constant
    11.8 +---
    11.9 + src/libmpd-database.c | 2 +-
   11.10 + 1 file changed, 1 insertion(+), 1 deletion(-)
   11.11 +
   11.12 +diff --git a/src/libmpd-database.c b/src/libmpd-database.c
   11.13 +index 2480d5e..edafc0a 100644
   11.14 +--- a/src/libmpd-database.c
   11.15 ++++ b/src/libmpd-database.c
   11.16 +@@ -961,7 +961,7 @@ MpdData * mpd_database_get_directory_recursive(MpdObj *mi, const char *path)
   11.17 + 		debug_printf(DEBUG_WARNING,"not connected\n");
   11.18 + 		return NULL;
   11.19 + 	}
   11.20 +-	if(path == '\0' || path[0] == '\0')
   11.21 ++	if(path == NULL || path[0] == '\0')
   11.22 + 	{
   11.23 + 		debug_printf(DEBUG_ERROR, "argumant invalid\n");
   11.24 + 		return NULL;
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/libmpd/stuff/patches/series	Fri Nov 03 16:28:49 2017 +0200
    12.3 @@ -0,0 +1,4 @@
    12.4 +# from https://www.archlinux.org/packages/extra/i686/libmpd/
    12.5 +0001-fix-return-value.patch
    12.6 +0002-include-config.h.patch
    12.7 +0003-fix-comparison.patch
    13.1 --- a/libmpdclient-dev/receipt	Fri Nov 03 15:13:54 2017 +0100
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,24 +0,0 @@
    13.4 -# SliTaz package receipt.
    13.5 -
    13.6 -PACKAGE="libmpdclient-dev"
    13.7 -VERSION="2.6"
    13.8 -CATEGORY="development"
    13.9 -SHORT_DESC="libmpdclient dev files."
   13.10 -MAINTAINER="erjo@slitaz.org"
   13.11 -LICENSE="BSD"
   13.12 -WEB_SITE="http://mpd.wikia.com/wiki/ClientLib:libmpdclient"
   13.13 -WANTED="libmpdclient"
   13.14 -HOST_ARCH="i486 arm"
   13.15 -
   13.16 -DEPENDS="libmpdclient pkg-config"
   13.17 -
   13.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   13.19 -genpkg_rules()
   13.20 -{
   13.21 -	mkdir -p $fs/usr/lib
   13.22 -	
   13.23 -	cp -a $install/usr/include $fs/usr
   13.24 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
   13.25 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   13.26 -	
   13.27 -}
    14.1 --- a/libmpdclient/receipt	Fri Nov 03 15:13:54 2017 +0100
    14.2 +++ b/libmpdclient/receipt	Fri Nov 03 16:28:49 2017 +0200
    14.3 @@ -1,31 +1,31 @@
    14.4 -# SliTaz package receipt.
    14.5 +# SliTaz package receipt v2.
    14.6  
    14.7  PACKAGE="libmpdclient"
    14.8 -VERSION="2.6"
    14.9 +VERSION="2.11"
   14.10  CATEGORY="system-tools"
   14.11 -SHORT_DESC="C & C++ API library for MPD."
   14.12 +SHORT_DESC="Library for interfacing Music Player Daemon (MPD)"
   14.13  MAINTAINER="erjo@slitaz.org"
   14.14  LICENSE="BSD"
   14.15 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
   14.16 -WEB_SITE="http://mpd.wikia.com/wiki/ClientLib:libmpdclient"
   14.17 -WGET_URL="http://www.musicpd.org/download/$PACKAGE/2/$TARBALL"
   14.18 +WEB_SITE="https://www.musicpd.org/libs/libmpdclient/"
   14.19  HOST_ARCH="i486 arm"
   14.20  
   14.21 -DEPENDS=""
   14.22 +TARBALL="$PACKAGE-$VERSION.tar.xz"
   14.23 +WGET_URL="https://www.musicpd.org/download/$PACKAGE/${VERSION%.*}/$TARBALL"
   14.24  
   14.25 -# Rules to configure and make the package.
   14.26 -compile_rules()
   14.27 -{
   14.28 -	cd $src
   14.29 -	./configure \
   14.30 -		$CONFIGURE_ARGS &&
   14.31 -	make && make install
   14.32 +BUILD_DEPENDS="doxygen"
   14.33 +SPLIT="libmpdclient-dev"
   14.34 +
   14.35 +compile_rules() {
   14.36 +	./configure $CONFIGURE_ARGS && make && make install
   14.37  }
   14.38  
   14.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
   14.40 -genpkg_rules()
   14.41 -{
   14.42 -	mkdir -p $fs/usr/lib
   14.43 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
   14.44 +genpkg_rules() {
   14.45 +	case $PACKAGE in
   14.46 +		libmpdclient)
   14.47 +			copy @std
   14.48 +			;;
   14.49 +		*-dev)
   14.50 +			copy @dev
   14.51 +			;;
   14.52 +	esac
   14.53  }
   14.54 -
    15.1 --- a/openbox-max/receipt	Fri Nov 03 15:13:54 2017 +0100
    15.2 +++ b/openbox-max/receipt	Fri Nov 03 16:28:49 2017 +0200
    15.3 @@ -40,7 +40,7 @@
    15.4  genpkg_rules()
    15.5  {
    15.6  	copy obxprop openbox openbox-session *.so* openbox-autostart \
    15.7 -	pixmaps/ Onyx*/ xsessions/openbox.desktop open-folder-menu.sh
    15.8 +	pixmaps/ Clearlooks/ Onyx*/ xsessions/openbox.desktop open-folder-menu.sh
    15.9  	# SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package
   15.10  	TAGS="window-manager"
   15.11  	PROVIDE="openbox openbox-imlib2"
   15.12 @@ -49,7 +49,7 @@
   15.13  	xorg-libXcursor xorg-libXi xorg-libXinerama xorg-libXrandr slitaz-configs"
   15.14  }
   15.15  
   15.16 -pre_install() {
   15.17 -	[ ! -d "$1/var/lib/tazpkg/installed/openbox" ] ||
   15.18 -		tazpkg -r openbox --root="$1/"
   15.19 -}
   15.20 +#pre_install() {
   15.21 +#	[ ! -d "$1/var/lib/tazpkg/installed/openbox" ] ||
   15.22 +#		tazpkg -r openbox --root="$1/"
   15.23 +#}
    16.1 --- a/openbox/receipt	Fri Nov 03 15:13:54 2017 +0100
    16.2 +++ b/openbox/receipt	Fri Nov 03 16:28:49 2017 +0200
    16.3 @@ -46,7 +46,8 @@
    16.4  	case $PACKAGE in
    16.5  		openbox)
    16.6  			copy obxprop openbox openbox-session *.so* openbox-autostart \
    16.7 -			pixmaps/ Onyx*/ xsessions/openbox.desktop open-folder-menu.sh
    16.8 +			pixmaps/ Clearlooks/ Onyx*/ xsessions/openbox.desktop \
    16.9 +			open-folder-menu.sh
   16.10  			# SliTaz /etc/xdg/openbox/* files are in 'slitaz-configs' package
   16.11  			TAGS="window-manager"
   16.12  			SUGGESTED="obconf spacefm pcmanfm hsetroot wbar2 conky"
   16.13 @@ -64,8 +65,7 @@
   16.14  			DEPENDS="openbox python python-xdg"
   16.15  			;;
   16.16  		openbox-themes)
   16.17 -			copy themes/
   16.18 -			remove_already_packed
   16.19 +			copy themes/ @rm
   16.20  			CAT="customiz|official themes set"
   16.21  			;;
   16.22  		openbox-dev)
    17.1 --- a/terminal/receipt	Fri Nov 03 15:13:54 2017 +0100
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,38 +0,0 @@
    17.4 -# SliTaz package receipt.
    17.5 -
    17.6 -PACKAGE="terminal"
    17.7 -VERSION="0.6.3"
    17.8 -CATEGORY="x-window"
    17.9 -SHORT_DESC="Terminal emunaltor for Xfce Desktop Environment"
   17.10 -MAINTAINER="erjo@slitaz.org"
   17.11 -LICENSE="GPL2"
   17.12 -SOURCE="xfce4-terminal"
   17.13 -TARBALL="$SOURCE-$VERSION.tar.bz2"
   17.14 -WEB_SITE="http://www.xfce.org/"
   17.15 -WGET_URL="http://archive.xfce.org/src/apps/$SOURCE/${VERSION%.*}/$TARBALL"
   17.16 -TAGS="terminal"
   17.17 -PROVIDE="$SOURCE"
   17.18 -
   17.19 -DEPENDS="libexo vte startup-notification dbus libxfce4ui"
   17.20 -BUILD_DEPENDS="libexo-dev gtk+-dev vte-dev dbus-dev startup-notification-dev \
   17.21 -intltool pkg-config util-linux-uuid-dev libxfce4ui-dev"
   17.22 -
   17.23 -# Rules to configure and make the package.
   17.24 -compile_rules()
   17.25 -{
   17.26 -	./configure --prefix=/usr --infodir=/usr/share/info \
   17.27 -	--mandir=/usr/share/man --libexecdir=/usr/lib/xfce4 \
   17.28 -	--disable-static $CONFIGURE_ARGS && \
   17.29 -	make && make DESTDIR=$DESTDIR install
   17.30 -}
   17.31 -
   17.32 -# Rules to gen a SliTaz package suitable for Tazpkg.
   17.33 -genpkg_rules()
   17.34 -{
   17.35 -	mkdir -p $fs/usr/share/locale
   17.36 -	
   17.37 -	cp -a $install/usr/bin $fs/usr
   17.38 -	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
   17.39 -	cp -a $install/usr/share/applications $fs/usr/share
   17.40 -	cp -a $install/usr/share/xfce4 $fs/usr/share
   17.41 -}
    18.1 --- a/xfce4-icon-theme/receipt	Fri Nov 03 15:13:54 2017 +0100
    18.2 +++ b/xfce4-icon-theme/receipt	Fri Nov 03 16:28:49 2017 +0200
    18.3 @@ -1,4 +1,4 @@
    18.4 -# SliTaz package receipt.
    18.5 +# SliTaz package receipt v2.
    18.6  
    18.7  PACKAGE="xfce4-icon-theme"
    18.8  VERSION="4.4.3"
    18.9 @@ -6,28 +6,32 @@
   18.10  SHORT_DESC="Icon theme for Xfce Desktop Environment"
   18.11  MAINTAINER="erjo@slitaz.org"
   18.12  LICENSE="GPL2"
   18.13 +WEB_SITE="http://www.xfce.org/"
   18.14 +
   18.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   18.16 -WEB_SITE="http://www.xfce.org/"
   18.17  WGET_URL="http://archive.xfce.org/src/art/$PACKAGE/${VERSION%.*}/$TARBALL"
   18.18  
   18.19 -DEPENDS=""
   18.20  BUILD_DEPENDS="intltool"
   18.21 +SPLIT="xfce4-icon-theme-dev"
   18.22  
   18.23 -# Rules to configure and make the package.
   18.24 -compile_rules()
   18.25 -{
   18.26 -	cd $src
   18.27 -	./configure --prefix=/usr --infodir=/usr/share/info \
   18.28 -	--mandir=/usr/share/man $CONFIGURE_ARGS && \
   18.29 -	make && make DESTDIR=$DESTDIR install
   18.30 +compile_rules() {
   18.31 +	./configure \
   18.32 +		--sysconfdir=/etc \
   18.33 +		--localstatedir=/var \
   18.34 +		--disable-debug \
   18.35 +		$CONFIGURE_ARGS &&
   18.36 +	make &&
   18.37 +	make install
   18.38  }
   18.39  
   18.40 -# Rules to gen a SliTaz package suitable for Tazpkg.
   18.41 -genpkg_rules()
   18.42 -{
   18.43 -		# Remove SVG Icons
   18.44 -	#find $install/usr/share -name "*scalable*" -exec rm -rf {} \;
   18.45 -	
   18.46 -	mkdir -p $fs/usr
   18.47 -	cp -a $install/usr/share $fs/usr
   18.48 +genpkg_rules() {
   18.49 +	case $PACKAGE in
   18.50 +		xfce4-icon-theme)
   18.51 +			copy @std
   18.52 +			;;
   18.53 +		*-dev)
   18.54 +			copy @dev
   18.55 +			;;
   18.56 +	esac
   18.57 +	TAGS="Xfce"
   18.58  }
    19.1 --- a/xfce4-ristretto/receipt	Fri Nov 03 15:13:54 2017 +0100
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,43 +0,0 @@
    19.4 -# SliTaz package receipt.
    19.5 -
    19.6 -PACKAGE="xfce4-ristretto"
    19.7 -VERSION="0.6.3"
    19.8 -CATEGORY="x-window"
    19.9 -SHORT_DESC="Picture-viewer for Xfce "
   19.10 -MAINTAINER="erjo@slitaz.org"
   19.11 -LICENSE="GPL2"
   19.12 -SOURCE="ristretto"
   19.13 -TARBALL="$SOURCE-$VERSION.tar.bz2"
   19.14 -WEB_SITE="http://goodies.xfce.org/projects/applications/ristretto"
   19.15 -WGET_URL="http://archive.xfce.org/src/apps/$SOURCE/${VERSION%.*}/$TARBALL"
   19.16 -
   19.17 -DEPENDS="libxfce4util libxfce4ui libexif dbus-glib thunar gamin xfconf"
   19.18 -BUILD_DEPENDS="xfce4-dev-tools intltool libexif-dev dbus-glib-dev libxfce4util-dev \
   19.19 - libxfce4ui-dev xfconf-dev"
   19.20 -
   19.21 -# Rules to configure and make the package.
   19.22 -compile_rules()
   19.23 -{
   19.24 -	cd $src
   19.25 -	./configure && make && make install
   19.26 -}
   19.27 -
   19.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
   19.29 -genpkg_rules()
   19.30 -{
   19.31 -	mkdir -p $fs/usr \
   19.32 -		$fs/usr/share/icons/hicolor \
   19.33 -		$fs/usr/share/pixmaps 
   19.34 -				
   19.35 -	cp -a $install/usr/bin $fs/usr
   19.36 -	cp -a $install/usr/share/icons/hicolor/16* $fs/usr/share/icons/hicolor
   19.37 -	cp -a $install/usr/share/icons/hicolor/48* $fs/usr/share/icons/hicolor
   19.38 -	ln -s /usr/share/icons/hicolor/48x48/apps/$SOURCE.png $fs/usr/share/pixmaps/$SOURCE.png
   19.39 -}
   19.40 -
   19.41 -post_install()
   19.42 -{
   19.43 -	echo "Execute post-install command"
   19.44 -	gtk-update-icon-cache -f -t -q "$1/usr/share/icons/hicolor"
   19.45 -}
   19.46 -
    20.1 --- a/xfce4-taskmanager/receipt	Fri Nov 03 15:13:54 2017 +0100
    20.2 +++ b/xfce4-taskmanager/receipt	Fri Nov 03 16:28:49 2017 +0200
    20.3 @@ -3,29 +3,30 @@
    20.4  PACKAGE="xfce4-taskmanager"
    20.5  VERSION="1.0.1"
    20.6  CATEGORY="x-window"
    20.7 -SHORT_DESC="Simple taskmanager for Xfce."
    20.8 +SHORT_DESC="Simple taskmanager for Xfce"
    20.9  MAINTAINER="erjo@slitaz.org"
   20.10  LICENSE="GPL2"
   20.11 +WEB_SITE="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
   20.12 +
   20.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   20.14 -WEB_SITE="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
   20.15  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   20.16  
   20.17 -DEPENDS="libxfce4util libxfcegui4 startup-notification"
   20.18  BUILD_DEPENDS="libxfce4util-dev libxfcegui4-dev startup-notification-dev \
   20.19  intltool gtk+-dev"
   20.20 +BUILD_DEPENDS="intltool gtk+-dev libwnck2-dev "
   20.21  
   20.22 -# Rules to configure and make the package.
   20.23 -compile_rules()
   20.24 -{
   20.25 -	cd $src
   20.26 -	./configure $CONFIGURE_ARGS && 
   20.27 -	make && make install
   20.28 +compile_rules(){
   20.29 +	./configure \
   20.30 +		--sysconfdir=/etc \
   20.31 +		--localstatedir=/var \
   20.32 +		--disable-debug \
   20.33 +		$CONFIGURE_ARGS &&
   20.34 +	make &&
   20.35 +	make install
   20.36  }
   20.37  
   20.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
   20.39 -genpkg_rules()
   20.40 -{
   20.41 -	mkdir -p $fs/usr
   20.42 -	cp -a $install/usr/bin $fs/usr
   20.43 +genpkg_rules() {
   20.44 +	copy @std
   20.45 +	DEPENDS="libxfce4util libxfcegui4 startup-notification"
   20.46 +	TAGS="Xfce"
   20.47  }
   20.48 -
    21.1 --- a/xfce4-taskmanager/stuff/xfce4-taskmanager.desktop	Fri Nov 03 15:13:54 2017 +0100
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,11 +0,0 @@
    21.4 -[Desktop Entry]
    21.5 -Encoding=UTF-8
    21.6 -Name=xfce4 taskmanager
    21.7 -Name[fr]=Gestionnaire de tāches
    21.8 -Comment=Taskmanager for XFCE
    21.9 -Comment[fr]=Gestionnaire de tāches pour Xfce4
   21.10 -Exec=xfce4-taskmanager
   21.11 -Icon=xfce4-taskmanager
   21.12 -Terminal=false
   21.13 -Type=Application
   21.14 -Categories=X-XFCE;Application;System;
    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/xfce4-terminal/receipt	Fri Nov 03 16:28:49 2017 +0200
    22.3 @@ -0,0 +1,38 @@
    22.4 +# SliTaz package receipt.
    22.5 +
    22.6 +PACKAGE="terminal"
    22.7 +VERSION="0.6.3"
    22.8 +CATEGORY="x-window"
    22.9 +SHORT_DESC="Terminal emunaltor for Xfce Desktop Environment"
   22.10 +MAINTAINER="erjo@slitaz.org"
   22.11 +LICENSE="GPL2"
   22.12 +SOURCE="xfce4-terminal"
   22.13 +TARBALL="$SOURCE-$VERSION.tar.bz2"
   22.14 +WEB_SITE="http://www.xfce.org/"
   22.15 +WGET_URL="http://archive.xfce.org/src/apps/$SOURCE/${VERSION%.*}/$TARBALL"
   22.16 +TAGS="terminal"
   22.17 +PROVIDE="$SOURCE"
   22.18 +
   22.19 +DEPENDS="libexo vte startup-notification dbus libxfce4ui"
   22.20 +BUILD_DEPENDS="libexo-dev gtk+-dev vte-dev dbus-dev startup-notification-dev \
   22.21 +intltool pkg-config util-linux-uuid-dev libxfce4ui-dev"
   22.22 +
   22.23 +# Rules to configure and make the package.
   22.24 +compile_rules()
   22.25 +{
   22.26 +	./configure --prefix=/usr --infodir=/usr/share/info \
   22.27 +	--mandir=/usr/share/man --libexecdir=/usr/lib/xfce4 \
   22.28 +	--disable-static $CONFIGURE_ARGS && \
   22.29 +	make && make DESTDIR=$DESTDIR install
   22.30 +}
   22.31 +
   22.32 +# Rules to gen a SliTaz package suitable for Tazpkg.
   22.33 +genpkg_rules()
   22.34 +{
   22.35 +	mkdir -p $fs/usr/share/locale
   22.36 +	
   22.37 +	cp -a $install/usr/bin $fs/usr
   22.38 +	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
   22.39 +	cp -a $install/usr/share/applications $fs/usr/share
   22.40 +	cp -a $install/usr/share/xfce4 $fs/usr/share
   22.41 +}
    23.1 --- a/xfmpc/receipt	Fri Nov 03 15:13:54 2017 +0100
    23.2 +++ b/xfmpc/receipt	Fri Nov 03 16:28:49 2017 +0200
    23.3 @@ -1,35 +1,38 @@
    23.4 -# SliTaz package receipt.
    23.5 +# SliTaz package receipt v2.
    23.6  
    23.7  PACKAGE="xfmpc"
    23.8 -VERSION="0.2.2"
    23.9 +VERSION="0.2.3"
   23.10  CATEGORY="x-window"
   23.11 -SHORT_DESC="MPD client for Xfce."
   23.12 +SHORT_DESC="MPD client for Xfce"
   23.13  MAINTAINER="erjo@slitaz.org"
   23.14  LICENSE="GPL2"
   23.15 +WEB_SITE="http://goodies.xfce.org/projects/applications/xfmpc"
   23.16 +
   23.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   23.18 -WEB_SITE="http://goodies.xfce.org/projects/applications/xfmpc"
   23.19  WGET_URL="http://archive.xfce.org/src/apps/$PACKAGE/${VERSION%.*}/$TARBALL"
   23.20  
   23.21 -DEPENDS="libxfcegui4 libxfce4util libmpd startup-notification"
   23.22 -BUILD_DEPENDS="libxfcegui4-dev libxfce4util-dev libmpd-dev intltool \
   23.23 -libxfce4ui-dev startup-notification-dev util-linux-uuid-dev gtk+-dev"
   23.24 +BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev gtk+-dev \
   23.25 +libxfce4ui-dev libmpd-dev"
   23.26  
   23.27 -# Rules to configure and make the package.
   23.28 -compile_rules()
   23.29 -{
   23.30 -	cd $src
   23.31 +compile_rules() {
   23.32 +	sed -i 's|\\r||' po/es.po # tiny patch
   23.33 +
   23.34  	./configure \
   23.35 -		--prefix=/usr \
   23.36 -		--infodir=/usr/share/info \
   23.37 -		--mandir=/usr/share/man \
   23.38 +		--sysconfdir=/etc \
   23.39 +		--localstatedir=/var \
   23.40 +		--disable-debug \
   23.41  		$CONFIGURE_ARGS &&
   23.42 -	make && make DESTDIR=$DESTDIR install
   23.43 +	make &&
   23.44 +	make install
   23.45  }
   23.46  
   23.47 -# Rules to gen a SliTaz package suitable for Tazpkg.
   23.48 -genpkg_rules()
   23.49 -{
   23.50 -	mkdir -p $fs/usr
   23.51 -	cp -a $install/usr/bin $fs/usr
   23.52 +genpkg_rules() {
   23.53 +	copy @std
   23.54 +	DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ libffi \
   23.55 +	libharfbuzz liblzma libmpd libpng16 libxfce4ui libxfce4util libxml2 pango \
   23.56 +	pcre startup-notification util-linux-blkid util-linux-mount \
   23.57 +	util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
   23.58 +	xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman \
   23.59 +	xorg-xcb-util zlib"
   23.60 +	TAGS="Xfce"
   23.61  }
   23.62 -