wok-next rev 20799

libbonobo: add patch; up florence to the latest version; add old florence-gtk2; add alure and jpegoptim; update dependencies.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Jun 12 00:53:16 2018 +0300 (2018-06-12)
parents a0fadf898422
children 75a0cf793185
files Xdialog/receipt acl/receipt aiksaurus/receipt alarm-clock-applet/receipt alarm-clock/receipt alsa-plugins/receipt alsaplayer/receipt alure/receipt alure/stuff/patches/alure.patch alure/stuff/patches/series apngopt/receipt appdata-tools/receipt apr-util/receipt aria2/receipt astromenace/receipt asunder/receipt aterm/receipt aubio/receipt audacity/receipt autoconf/receipt automake/receipt bind/receipt binutils/receipt bird/receipt bmpanel2/receipt brasero/receipt cairo-compmgr/receipt cairo-dock/receipt calcurse/receipt florence-gtk2/.icon.png florence-gtk2/receipt florence-gtk2/stuff/patches/florence.patch florence-gtk2/stuff/patches/series florence/.icon.png florence/receipt florence/stuff/patches/florence.patch florence/stuff/patches/series jpegoptim/receipt libbonobo/stuff/patches/libbonobo.patch libbonobo/stuff/patches/series
line diff
     1.1 --- a/Xdialog/receipt	Mon Jun 11 17:54:37 2018 +0300
     1.2 +++ b/Xdialog/receipt	Tue Jun 12 00:53:16 2018 +0300
     1.3 @@ -24,8 +24,5 @@
     1.4  
     1.5  genpkg_rules() {
     1.6  	copy @std
     1.7 -	DEPENDS="glibc-base glib expat zlib fontconfig freetype gtk+ atk cairo pango \
     1.8 -	xorg-pixman libpng16 xorg-libxcb xorg-xcb-util xorg-libX11 xorg-libXau \
     1.9 -	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext \
    1.10 -	xorg-libXfixes xorg-libXinerama xorg-libXrender"
    1.11 +	DEPENDS="glib gtk+"
    1.12  }
     2.1 --- a/acl/receipt	Mon Jun 11 17:54:37 2018 +0300
     2.2 +++ b/acl/receipt	Tue Jun 12 00:53:16 2018 +0300
     2.3 @@ -48,7 +48,6 @@
     2.4  			;;
     2.5  		acl-dev)
     2.6  			copy @dev
     2.7 -			DEPENDS="acl attr-dev"
     2.8  			;;
     2.9  	esac
    2.10  }
     3.1 --- a/aiksaurus/receipt	Mon Jun 11 17:54:37 2018 +0300
     3.2 +++ b/aiksaurus/receipt	Tue Jun 12 00:53:16 2018 +0300
     3.3 @@ -27,10 +27,11 @@
     3.4  	case $PACKAGE in
     3.5  		aiksaurus)
     3.6  			copy @std
     3.7 -			DEPENDS="gtk+ expat xorg-libXau glib"
     3.8 +			DEPENDS="glib gtk+"
     3.9  			;;
    3.10  		aiksaurus-dev)
    3.11  			copy @dev
    3.12 +			DEPENDS="aiksaurus gtk+-dev"
    3.13  			;;
    3.14  	esac
    3.15  }
     4.1 --- a/alarm-clock-applet/receipt	Mon Jun 11 17:54:37 2018 +0300
     4.2 +++ b/alarm-clock-applet/receipt	Tue Jun 12 00:53:16 2018 +0300
     4.3 @@ -10,7 +10,8 @@
     4.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     4.5  WGET_URL="https://launchpad.net/alarm-clock/trunk/$VERSION/+download/$TARBALL"
     4.6  
     4.7 -DEPENDS="GConf gstreamer0 libnotify libunique notification-daemon-gtk2"
     4.8 +DEPENDS="GConf glib gstreamer0 gtk+ libnotify libunique libxml2   \
     4.9 +notification-daemon-gtk2"
    4.10  BUILD_DEPENDS="libxml2-dev gtk+-dev gstreamer0-dev GConf-dev gnome-icon-theme \
    4.11  libnotify-dev libunique-dev intltool"
    4.12  
     5.1 --- a/alarm-clock/receipt	Mon Jun 11 17:54:37 2018 +0300
     5.2 +++ b/alarm-clock/receipt	Tue Jun 12 00:53:16 2018 +0300
     5.3 @@ -28,6 +28,6 @@
     5.4  
     5.5  genpkg_rules() {
     5.6  	copy @std
     5.7 -	DEPENDS="gtk+ libunique libnotify gstreamer0"
     5.8 +	DEPENDS="gdk-pixbuf glib gstreamer0 gtk+ libnotify libunique"
     5.9  	TAGS="clock reminder"
    5.10  }
     6.1 --- a/alsa-plugins/receipt	Mon Jun 11 17:54:37 2018 +0300
     6.2 +++ b/alsa-plugins/receipt	Tue Jun 12 00:53:16 2018 +0300
     6.3 @@ -12,7 +12,7 @@
     6.4  TARBALL="$PACKAGE-$VERSION.tar.bz2"
     6.5  WGET_URL="ftp://ftp.alsa-project.org/pub/plugins/$TARBALL"
     6.6  
     6.7 -BUILD_DEPENDS="alsa-lib-dev libsamplerate-dev speex-dev"
     6.8 +BUILD_DEPENDS="alsa-lib-dev libsamplerate-dev speex-dev speexdsp-dev"
     6.9  
    6.10  compile_rules() {
    6.11  	./configure $CONFIGURE_ARGS &&
     7.1 --- a/alsaplayer/receipt	Mon Jun 11 17:54:37 2018 +0300
     7.2 +++ b/alsaplayer/receipt	Tue Jun 12 00:53:16 2018 +0300
     7.3 @@ -38,13 +38,13 @@
     7.4  		alsaplayer-scopes)
     7.5  			copy scopes2/*.so
     7.6  			CAT="multimedia|visualisations"
     7.7 -			DEPENDS="alsaplayer"
     7.8 +			DEPENDS="glib gtk+   alsaplayer"
     7.9  			;;
    7.10  		alsaplayer)
    7.11  			copy @std @rm
    7.12 -			DEPENDS="gtk+ alsa-lib libmad libogg libvorbis xorg-libXdamage"
    7.13 +			DEPENDS="alsa-lib flac gdk-pixbuf glib gtk+ libmad libvorbis pango"
    7.14  			TAGS="music audio player mp3 ogg flac"
    7.15 -			SUGGESTED="alsaplayer-scopes libid3tag flac"
    7.16 +			SUGGESTED="alsaplayer-scopes libid3tag"
    7.17  			;;
    7.18  		*-dev) copy @dev;;
    7.19  	esac
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/alure/receipt	Tue Jun 12 00:53:16 2018 +0300
     8.3 @@ -0,0 +1,40 @@
     8.4 +# SliTaz package receipt v2.
     8.5 +
     8.6 +PACKAGE="alure"
     8.7 +VERSION="1.2"
     8.8 +CATEGORY="sound"
     8.9 +SHORT_DESC="Utility library to help manage common tasks with OpenAL applications"
    8.10 +MAINTAINER="al.bobylev@gmail.com"
    8.11 +LICENSE="MIT"
    8.12 +WEB_SITE="http://kcat.strangesoft.net/alure.html"
    8.13 +
    8.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    8.15 +WGET_URL="http://kcat.strangesoft.net/alure-releases/$TARBALL"
    8.16 +
    8.17 +BUILD_DEPENDS="cmake openal-dev   libsndfile-dev libvorbis-dev mpg123-dev \
    8.18 +fluidsynth-dev"
    8.19 +SPLIT="alure-dev"
    8.20 +
    8.21 +compile_rules() {
    8.22 +	mkdir build
    8.23 +	cd    build
    8.24 +	cmake \
    8.25 +		-DCMAKE_INSTALL_PREFIX=/usr \
    8.26 +		.. &&
    8.27 +	make &&
    8.28 +	make install
    8.29 +}
    8.30 +
    8.31 +genpkg_rules() {
    8.32 +	case $PACKAGE in
    8.33 +		alure)
    8.34 +			copy @std
    8.35 +			DEPENDS="openal"
    8.36 +			SUGGESTED="libsndfile libvorbis mpg123 fluidsynth"
    8.37 +			;;
    8.38 +		*-dev)
    8.39 +			copy @dev
    8.40 +			DEPENDS="alure openal-dev"
    8.41 +			;;
    8.42 +	esac
    8.43 +}
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/alure/stuff/patches/alure.patch	Tue Jun 12 00:53:16 2018 +0300
     9.3 @@ -0,0 +1,12 @@
     9.4 +diff -rupN a/src/codec_fluidsynth.cpp b/src/codec_fluidsynth.cpp
     9.5 +--- a/src/codec_fluidsynth.cpp	2011-07-29 08:37:48.000000000 +0000
     9.6 ++++ b/src/codec_fluidsynth.cpp	2014-01-03 10:42:13.280792235 +0000
     9.7 +@@ -32,7 +32,7 @@
     9.8 + #endif
     9.9 + 
    9.10 + #include <istream>
    9.11 +-
    9.12 ++#include <unistd.h>
    9.13 + #include <fluidsynth.h>
    9.14 + 
    9.15 + 
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/alure/stuff/patches/series	Tue Jun 12 00:53:16 2018 +0300
    10.3 @@ -0,0 +1,2 @@
    10.4 +# from https://www.archlinux.org/packages/community/x86_64/alure/
    10.5 +alure.patch
    11.1 --- a/apngopt/receipt	Mon Jun 11 17:54:37 2018 +0300
    11.2 +++ b/apngopt/receipt	Tue Jun 12 00:53:16 2018 +0300
    11.3 @@ -1,4 +1,4 @@
    11.4 -# SliTaz package receipt.
    11.5 +# SliTaz package receipt v2.
    11.6  
    11.7  PACKAGE="apngopt"
    11.8  VERSION="1.4"
    11.9 @@ -11,20 +11,16 @@
   11.10  TARBALL="$PACKAGE-$VERSION-src.zip"
   11.11  WGET_URL="$SF_MIRROR/apng/$TARBALL"
   11.12  
   11.13 -DEPENDS="zlib libpng16"
   11.14  BUILD_DEPENDS="zlib-dev libpng16-dev"
   11.15  
   11.16 -# Rules to configure and make the package.
   11.17 -compile_rules()
   11.18 -{
   11.19 -	make
   11.20 +compile_rules() {
   11.21 +	make &&
   11.22 +	install -Dm755 apngopt $install/usr/bin/apngopt || return 1
   11.23  
   11.24 -	mkdir -p $install/usr/bin
   11.25 -	cp -a $src/apngopt $install/usr/bin
   11.26 +	cook_copy_docs readme.txt
   11.27  }
   11.28  
   11.29 -# Rules to gen a SliTaz package suitable for Tazpkg.
   11.30 -genpkg_rules()
   11.31 -{
   11.32 -	copy apngopt
   11.33 +genpkg_rules() {
   11.34 +	copy @std
   11.35 +	DEPENDS="libpng16 zlib"
   11.36  }
    12.1 --- a/appdata-tools/receipt	Mon Jun 11 17:54:37 2018 +0300
    12.2 +++ b/appdata-tools/receipt	Tue Jun 12 00:53:16 2018 +0300
    12.3 @@ -22,5 +22,5 @@
    12.4  
    12.5  genpkg_rules() {
    12.6  	copy @std @dev
    12.7 -	DEPENDS="gdk-pixbuf libsoup"
    12.8 +	DEPENDS="gdk-pixbuf glib libsoup"
    12.9  }
    13.1 --- a/apr-util/receipt	Mon Jun 11 17:54:37 2018 +0300
    13.2 +++ b/apr-util/receipt	Tue Jun 12 00:53:16 2018 +0300
    13.3 @@ -39,43 +39,43 @@
    13.4  			;;
    13.5  		apr-dbd-mysql)
    13.6  			copy *mysql*.so
    13.7 -			DEPENDS="apr-util libmysqlclient"
    13.8 +			DEPENDS="libmysqlclient   apr-util"
    13.9  			CAT="libdevel|MySQL DBD driver"
   13.10  			;;
   13.11  		apr-dbd-odbc)
   13.12  			copy *odbc*.so
   13.13 -			DEPENDS="apr-util libunixODBC"
   13.14 +			DEPENDS="libunixODBC   apr-util"
   13.15  			CAT="libdevel|ODBC DBD driver"
   13.16  			;;
   13.17  		apr-dbd-pgsql)
   13.18  			copy *pgsql*.so
   13.19 -			DEPENDS="apr-util libpostgresqlclient"
   13.20 +			DEPENDS="libpostgresqlclient   apr-util"
   13.21  			CAT="libdevel|PostgreSQL DBD driver"
   13.22  			;;
   13.23  		apr-dbd-sqlite)
   13.24  			copy *sqlite*.so
   13.25 -			DEPENDS="apr-util libsqlite3"
   13.26 +			DEPENDS="libsqlite3   apr-util"
   13.27  			CAT="libdevel|SQLite DBD driver"
   13.28  			;;
   13.29  		apr-crypto)
   13.30  			copy *crypto*.so
   13.31 -			DEPENDS="apr-util openssl"
   13.32 +			DEPENDS="openssl   apr-util"
   13.33  			CAT="libdevel|OpenSSL crypto plugin"
   13.34  			;;
   13.35  		apr-dbm-gdbm)
   13.36  			copy *dbm*.so
   13.37 -			DEPENDS="apr-util gdbm"
   13.38 +			DEPENDS="gdbm   apr-util"
   13.39  			CAT="libdevel|GDBM plugin"
   13.40  			;;
   13.41  		apr-ldap)
   13.42  			copy apr_ldap*.so
   13.43 -			DEPENDS="apr-util libldap"
   13.44 +			DEPENDS="libldap   apr-util"
   13.45  			CAT="libdevel|LDAP plugin"
   13.46  			;;
   13.47  		*-dev)
   13.48  			copy @dev
   13.49  			DEPENDS="apr-util apr-dbd-mysql apr-dbd-odbc apr-dbd-pgsql \
   13.50 -			apr-dbd-sqlite apr-crypto apr-dbm-gdbm \
   13.51 +			apr-dbd-sqlite apr-crypto apr-dbm-gdbm apr-ldap \
   13.52  			apr-dev expat-dev gdbm-dev mysql-dev openldap-dev openssl-dev \
   13.53  			postgresql-dev sqlite3-dev unixODBC-dev util-linux-uuid-dev \
   13.54  			zlib-dev"
    14.1 --- a/aria2/receipt	Mon Jun 11 17:54:37 2018 +0300
    14.2 +++ b/aria2/receipt	Tue Jun 12 00:53:16 2018 +0300
    14.3 @@ -29,5 +29,5 @@
    14.4  
    14.5  genpkg_rules() {
    14.6  	copy @std
    14.7 -	DEPENDS="zlib libxml2 gnutls libgcrypt"
    14.8 +	DEPENDS="gmp libgnutls libxml2 nettle zlib"
    14.9  }
    15.1 --- a/astromenace/receipt	Mon Jun 11 17:54:37 2018 +0300
    15.2 +++ b/astromenace/receipt	Tue Jun 12 00:53:16 2018 +0300
    15.3 @@ -33,6 +33,6 @@
    15.4  genpkg_rules() {
    15.5  	copy @std
    15.6  	TAGS="arcade game shooting space"
    15.7 -	DEPENDS="cmake libsdl libogg libvorbis glu openal freealut \
    15.8 -	xorg-libXinerama freetype"
    15.9 +	DEPENDS="freealut freetype glu libsdl libvorbis mesa openal xorg-libX11 \
   15.10 +	xorg-libXinerama"
   15.11  }
    16.1 --- a/asunder/receipt	Mon Jun 11 17:54:37 2018 +0300
    16.2 +++ b/asunder/receipt	Tue Jun 12 00:53:16 2018 +0300
    16.3 @@ -12,7 +12,7 @@
    16.4  WGET_URL="$WEB_SITE/releases/$TARBALL"
    16.5  TAGS="audio rip"
    16.6  
    16.7 -DEPENDS="gtk+ libcddb alsa-lib cdparanoia-III xorg-libXdamage vorbis-tools"
    16.8 +DEPENDS="atk gdk-pixbuf glib gtk+ libcddb"
    16.9  BUILD_DEPENDS="gtk+-dev alsa-lib-dev libcddb-dev cdparanoia-III-dev \
   16.10  xorg-libXdamage-dev intltool"
   16.11  
    17.1 --- a/aterm/receipt	Mon Jun 11 17:54:37 2018 +0300
    17.2 +++ b/aterm/receipt	Tue Jun 12 00:53:16 2018 +0300
    17.3 @@ -11,7 +11,7 @@
    17.4  WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/aterm/$TARBALL"
    17.5  TAGS="terminal"
    17.6  
    17.7 -DEPENDS="xorg-libSM xorg-libXext"
    17.8 +DEPENDS="xorg-libX11"
    17.9  BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev"
   17.10  
   17.11  # Rules to configure and make the package.
    18.1 --- a/aubio/receipt	Mon Jun 11 17:54:37 2018 +0300
    18.2 +++ b/aubio/receipt	Tue Jun 12 00:53:16 2018 +0300
    18.3 @@ -15,9 +15,7 @@
    18.4  ffmpeg-dev gfortran lapack-dev python-numpy"
    18.5  SPLIT="aubio-dev"
    18.6  
    18.7 -# Rules to configure and make the package.
    18.8 -compile_rules()
    18.9 -{
   18.10 +compile_rules() {
   18.11  	./waf configure \
   18.12  		--prefix=/usr \
   18.13  		--enable-fftw3f &&
   18.14 @@ -27,9 +25,7 @@
   18.15  #	./setup.py install --root="$install" --optimize=1
   18.16  }
   18.17  
   18.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   18.19 -genpkg_rules()
   18.20 -{
   18.21 +genpkg_rules() {
   18.22  	case $PACKAGE in
   18.23  		aubio)
   18.24  			copy @std
    19.1 --- a/audacity/receipt	Mon Jun 11 17:54:37 2018 +0300
    19.2 +++ b/audacity/receipt	Tue Jun 12 00:53:16 2018 +0300
    19.3 @@ -26,7 +26,7 @@
    19.4  
    19.5  genpkg_rules() {
    19.6  	copy @std
    19.7 -	DEPENDS="wxWidgets ffmpeg libvorbis imlib2 libid3tag libmad flac \
    19.8 -	libsndfile lame alsa-lib xorg-libXxf86vm"
    19.9 +	DEPENDS="alsa-lib expat gdk-pixbuf glib gtk+ libmad libogg libsndfile \
   19.10 +	libvorbis wxWidgets zlib"
   19.11  	TAGS="sound audio recorder editor"
   19.12  }
    20.1 --- a/autoconf/receipt	Mon Jun 11 17:54:37 2018 +0300
    20.2 +++ b/autoconf/receipt	Tue Jun 12 00:53:16 2018 +0300
    20.3 @@ -20,6 +20,6 @@
    20.4  
    20.5  genpkg_rules() {
    20.6  	copy @std @dev
    20.7 -	DEPENDS="m4 perl"
    20.8 +	DEPENDS="perl   m4"
    20.9  	TAGS="LFS"
   20.10  }
    21.1 --- a/automake/receipt	Mon Jun 11 17:54:37 2018 +0300
    21.2 +++ b/automake/receipt	Tue Jun 12 00:53:16 2018 +0300
    21.3 @@ -21,6 +21,6 @@
    21.4  
    21.5  genpkg_rules() {
    21.6  	copy @std @dev
    21.7 -	DEPENDS="autoconf"
    21.8 +	DEPENDS="perl   autoconf"
    21.9  	TAGS="LFS"
   21.10  }
    22.1 --- a/bind/receipt	Mon Jun 11 17:54:37 2018 +0300
    22.2 +++ b/bind/receipt	Tue Jun 12 00:53:16 2018 +0300
    22.3 @@ -47,19 +47,19 @@
    22.4  		bind)
    22.5  			CONFIG_FILES="/etc/bind/"
    22.6  			copy etc/ sbin/
    22.7 -			DEPENDS="libbind attr openssl perl"
    22.8 +			DEPENDS="libbind libcap openssl"
    22.9  			TAZPANEL_DAEMON="edit::/etc/bind/named.conf|man|options|web::$WEB_SITE"
   22.10  			TAGS="DNS daemon"
   22.11  			;;
   22.12  		bind-client)
   22.13  			copy bin/; rm $fs/usr/bin/bind9-config
   22.14  			CAT="network|client"
   22.15 -			DEPENDS="libbind openssl attr libpcap"
   22.16 +			DEPENDS="libbind libkrb5 readline"
   22.17  			;;
   22.18  		libbind)
   22.19  			copy *.so*
   22.20  			CAT="libdevel|shared libraries"
   22.21 -			DEPENDS="openssl libcap libxml2 zlib attr libkrb5"
   22.22 +			DEPENDS="libkrb5 openssl"
   22.23  			;;
   22.24  		bind-dev)
   22.25  			copy @dev
    23.1 --- a/binutils/receipt	Mon Jun 11 17:54:37 2018 +0300
    23.2 +++ b/binutils/receipt	Tue Jun 12 00:53:16 2018 +0300
    23.3 @@ -52,7 +52,7 @@
    23.4  			;;
    23.5  		binutils)
    23.6  			copy @std @dev @rm
    23.7 -			DEPENDS="flex libbfd   glibc"
    23.8 +			DEPENDS="libbfd zlib   flex glibc"
    23.9  			TAGS="LFS assembler linker"
   23.10  			;;
   23.11  	esac
    24.1 --- a/bird/receipt	Mon Jun 11 17:54:37 2018 +0300
    24.2 +++ b/bird/receipt	Tue Jun 12 00:53:16 2018 +0300
    24.3 @@ -21,6 +21,6 @@
    24.4  
    24.5  genpkg_rules() {
    24.6  	copy @std
    24.7 -	DEPENDS="readline ncurses"
    24.8 +	DEPENDS="ncurses readline"
    24.9  	TAGS="route routing daemon"
   24.10  }
    25.1 --- a/bmpanel2/receipt	Mon Jun 11 17:54:37 2018 +0300
    25.2 +++ b/bmpanel2/receipt	Tue Jun 12 00:53:16 2018 +0300
    25.3 @@ -41,7 +41,7 @@
    25.4  		bmpanel2cfg)
    25.5  			copy bmpanel2cfg python2.7/
    25.6  			CAT="misc|configurator"
    25.7 -			DEPENDS="bmpanel2 pygtk"
    25.8 +			DEPENDS="bmpanel2 python   pygtk"
    25.9  			;;
   25.10  	esac
   25.11  }
    26.1 --- a/brasero/receipt	Mon Jun 11 17:54:37 2018 +0300
    26.2 +++ b/brasero/receipt	Tue Jun 12 00:53:16 2018 +0300
    26.3 @@ -40,12 +40,13 @@
    26.4  	case $PACKAGE in
    26.5  		brasero)
    26.6  			copy @std
    26.7 -			DEPENDS="glib gtk+ GConf gstreamer0 gst0-plugins-base libxml2 \
    26.8 -			libunique dbus-glib cdrdao dvd+rw-tools libcanberra libvorbis \
    26.9 -			libogg"
   26.10 +			DEPENDS="GConf cairo dbus-glib gdk-pixbuf glib gst0-plugins-base \
   26.11 +			gstreamer0 gtk+ libcanberra-gtk2 libunique libxml2 pango \
   26.12 +			xorg-libICE xorg-libSM" # cdrdao dvd+rw-tools libvorbis libogg
   26.13  			;;
   26.14  		*-dev)
   26.15  			copy @dev
   26.16 +			DEPENDS="brasero dbus-glib-dev glib-dev gtk+-dev"
   26.17  			;;
   26.18  	esac
   26.19  }
    27.1 --- a/cairo-compmgr/receipt	Mon Jun 11 17:54:37 2018 +0300
    27.2 +++ b/cairo-compmgr/receipt	Tue Jun 12 00:53:16 2018 +0300
    27.3 @@ -38,10 +38,14 @@
    27.4  	case $PACKAGE in
    27.5  		cairo-compmgr)
    27.6  			copy @std
    27.7 -			DEPENDS="libbfd gtk+ vala xorg-libSM xorg-libXi"
    27.8 +			DEPENDS="cairo gdk-pixbuf glib gtk+ pango vala xorg-libICE \
    27.9 +			xorg-libSM xorg-libX11 xorg-libXcomposite xorg-libXdamage \
   27.10 +			xorg-libXext xorg-libXfixes xorg-libXi xorg-pixman"
   27.11  			;;
   27.12  		*-dev)
   27.13  			copy @dev
   27.14 +			DEPENDS="cairo-compmgr \
   27.15 +			GConf-dev cairo-dev gtk+-dev"
   27.16  			;;
   27.17  	esac
   27.18  }
    28.1 --- a/cairo-dock/receipt	Mon Jun 11 17:54:37 2018 +0300
    28.2 +++ b/cairo-dock/receipt	Tue Jun 12 00:53:16 2018 +0300
    28.3 @@ -3,10 +3,11 @@
    28.4  PACKAGE="cairo-dock"
    28.5  VERSION="3.3.2"
    28.6  CATEGORY="x-window"
    28.7 -SHORT_DESC="Cairo-Dock is a light and eye-candy dock to launch."
    28.8 +SHORT_DESC="Cairo-Dock is a light and eye-candy dock to launch"
    28.9  MAINTAINER="pankso@slitaz.org"
   28.10  LICENSE="GPL3"
   28.11  WEB_SITE="http://www.glx-dock.org/"
   28.12 +
   28.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
   28.14  WGET_URL="https://github.com/Cairo-Dock/cairo-dock-core/archive/$VERSION.tar.gz"
   28.15  
   28.16 @@ -16,36 +17,29 @@
   28.17  xorg-libXtst-dev xorg-libXcomposite-dev glu-dev gettext-tools"
   28.18  SPLIT="cairo-dock cairo-dock-dev"
   28.19  
   28.20 -# Rules to configure and make the package.
   28.21 -compile_rules()
   28.22 -{
   28.23 -	mkdir -p build && cd build
   28.24 -	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
   28.25 +compile_rules() {
   28.26 +	mkdir build
   28.27 +	cd    build
   28.28 +	cmake \
   28.29 +		-DCMAKE_INSTALL_PREFIX=/usr \
   28.30 +		.. &&
   28.31  	make &&
   28.32  	make DESTDIR=$DESTDIR install
   28.33  }
   28.34  
   28.35 -# Rules to gen a SliTaz package suitable for Tazpkg.
   28.36 -genpkg_rules()
   28.37 -{
   28.38 +genpkg_rules() {
   28.39  	case $PACKAGE in
   28.40 -	cairo-dock)
   28.41 -		DEPENDS="gtk+ cairo librsvg xorg-xcompmgr mesa gtkglext dbus libcurl"
   28.42 -		SUGGESTED="cairo-dock-plugins"
   28.43 -		mkdir -p $fs/usr/lib $fs/usr/share/$PACKAGE
   28.44 -		cp -a $install/usr/bin $fs/usr
   28.45 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
   28.46 -		cp -a $install/usr/share/$PACKAGE $fs/usr/share
   28.47 -		;;
   28.48 -	cairo-dock-dev)
   28.49 -		CAT="x-window|Cairo dock devel file."
   28.50 -		DEPENDS="cairo-dock gtk+-dev dbus-dev curl-dev \
   28.51 -			glu-dev mesa-dev libxml2-dev glib-dev \
   28.52 -			dbus-glib-dev glib-dev librsvg-dev xorg-libX11-dev"
   28.53 -		mkdir -p $fs/usr/lib
   28.54 -		#cp -a $install/usr/lib/*.*a $fs/usr/lib
   28.55 -		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   28.56 -		cp -a $install/usr/include $fs/usr
   28.57 -		;;
   28.58 +		cairo-dock)
   28.59 +			copy @std
   28.60 +			DEPENDS="cairo dbus-glib gdk-pixbuf glib glu gtk+ libcurl librsvg \
   28.61 +			libxml2 mesa pango" # xorg-xcompmgr gtkglext dbus
   28.62 +			SUGGESTED="cairo-dock-plugins"
   28.63 +			;;
   28.64 +		*-dev)
   28.65 +			copy @dev
   28.66 +			DEPENDS="cairo-dock \
   28.67 +			cairo-dev curl-dev dbus-dev dbus-glib-dev glib-dev glu-dev \
   28.68 +			gtk+-dev librsvg-dev libxml2-dev mesa-dev xorg-libX11-dev"
   28.69 +			;;
   28.70  	esac
   28.71  }
    29.1 --- a/calcurse/receipt	Mon Jun 11 17:54:37 2018 +0300
    29.2 +++ b/calcurse/receipt	Tue Jun 12 00:53:16 2018 +0300
    29.3 @@ -1,31 +1,28 @@
    29.4 -# SliTaz package receipt.
    29.5 +# SliTaz package receipt v2.
    29.6  
    29.7  PACKAGE="calcurse"
    29.8  VERSION="2.9.2"
    29.9  CATEGORY="office"
   29.10 -SHORT_DESC="Text-based calender and scheduling application."
   29.11 +SHORT_DESC="Text-based calender and scheduling application"
   29.12  MAINTAINER="paul@slitaz.org"
   29.13  LICENSE="BSD"
   29.14 +WEB_SITE="http://calcurse.org/"
   29.15 +
   29.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
   29.17 -WEB_SITE="http://calcurse.org/"
   29.18  WGET_URL="http://calcurse.org/files/$TARBALL"
   29.19 -TAGS="calendar reminder schedule"
   29.20  
   29.21 -DEPENDS="ncurses"
   29.22  BUILD_DEPENDS="ncurses-dev"
   29.23  
   29.24 -# Rules to configure and make the package.
   29.25 -compile_rules()
   29.26 -{
   29.27 -	cd $src
   29.28 -	./configure --disable-nls $CONFIGURE_ARGS &&
   29.29 -	make && make install
   29.30 +compile_rules() {
   29.31 +	./configure \
   29.32 +		--disable-nls \
   29.33 +		$CONFIGURE_ARGS &&
   29.34 +	make &&
   29.35 +	make install
   29.36  }
   29.37  
   29.38 -# Rules to gen a SliTaz package suitable for Tazpkg.
   29.39 -genpkg_rules()
   29.40 -{
   29.41 -	mkdir -p $fs/usr
   29.42 -	cp -a $install/usr/bin $fs/usr
   29.43 +genpkg_rules() {
   29.44 +	copy @std
   29.45 +	DEPENDS="ncurses"
   29.46 +	TAGS="calendar reminder schedule"
   29.47  }
   29.48 -
    30.1 Binary file florence-gtk2/.icon.png has changed
    31.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    31.2 +++ b/florence-gtk2/receipt	Tue Jun 12 00:53:16 2018 +0300
    31.3 @@ -0,0 +1,33 @@
    31.4 +# SliTaz package receipt v2.
    31.5 +
    31.6 +PACKAGE="florence-gtk2"
    31.7 +VERSION="0.5.4"
    31.8 +CATEGORY="utilities"
    31.9 +SHORT_DESC="On-screen virtual keyboard (GTK2 version)"
   31.10 +MAINTAINER="psychomaniak@xakep.ru"
   31.11 +LICENSE="GPL"
   31.12 +WEB_SITE="http://sourceforge.net/projects/florence/"
   31.13 +
   31.14 +TARBALL="florence-$VERSION.tar.bz2"
   31.15 +WGET_URL="$SF_MIRROR/florence/$TARBALL"
   31.16 +
   31.17 +BUILD_DEPENDS="intltool GConf-dev xorg-libX11-dev glib-dev cairo-dev \
   31.18 +librsvg-dev libxml2-dev gtk+-dev gstreamer0-dev xorg-libXtst-dev \
   31.19 +at-spi2-core-dev at-spi2-atk-dev gtk+-dev"
   31.20 +
   31.21 +compile_rules() {
   31.22 +	./configure \
   31.23 +		--without-panelapplet \
   31.24 +		--without-docs \
   31.25 +		--without-notification \
   31.26 +		$CONFIGURE_ARGS &&
   31.27 +	make -j1 &&
   31.28 +	make -j1 install
   31.29 +}
   31.30 +
   31.31 +genpkg_rules() {
   31.32 +	copy @std *.mo
   31.33 +	DEPENDS="GConf at-spi2-core cairo gdk-pixbuf glib gstreamer0 gtk+ librsvg \
   31.34 +	libxml2 pango xorg-libX11 xorg-libXtst"
   31.35 +	PROVIDE="florence"
   31.36 +}
    32.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    32.2 +++ b/florence-gtk2/stuff/patches/florence.patch	Tue Jun 12 00:53:16 2018 +0300
    32.3 @@ -0,0 +1,17 @@
    32.4 +Fix bad situation when Comment exactly repeat the Name. Add sub-category.
    32.5 +
    32.6 +--- a/data/florence.desktop.in.in
    32.7 ++++ b/data/florence.desktop.in.in
    32.8 +@@ -1,10 +1,10 @@
    32.9 + [Desktop Entry]
   32.10 + Encoding=UTF-8
   32.11 +-_Name=Florence Virtual Keyboard
   32.12 ++Name=Florence
   32.13 + _Comment=Florence Virtual Keyboard
   32.14 + Exec=florence
   32.15 + Terminal=false
   32.16 + Type=Application
   32.17 + Icon=@ICONDIR@/florence.svg
   32.18 +-Categories=Application;Accessibility;
   32.19 ++Categories=Application;Accessibility;Utility;
   32.20 + 
    33.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    33.2 +++ b/florence-gtk2/stuff/patches/series	Tue Jun 12 00:53:16 2018 +0300
    33.3 @@ -0,0 +1,1 @@
    33.4 +florence.patch
    34.1 Binary file florence/.icon.png has changed
    35.1 --- a/florence/receipt	Mon Jun 11 17:54:37 2018 +0300
    35.2 +++ b/florence/receipt	Tue Jun 12 00:53:16 2018 +0300
    35.3 @@ -1,36 +1,45 @@
    35.4 -# SliTaz package receipt.
    35.5 +# SliTaz package receipt v2.
    35.6  
    35.7  PACKAGE="florence"
    35.8 -VERSION="0.5.4"
    35.9 +VERSION="0.6.3"
   35.10 +CATEGORY="utilities"
   35.11  SHORT_DESC="On-screen virtual keyboard"
   35.12 +MAINTAINER="psychomaniak@xakep.ru"
   35.13  LICENSE="GPL"
   35.14 -CATEGORY="utilities"
   35.15 -MAINTAINER="psychomaniak@xakep.ru"
   35.16 +WEB_SITE="http://sourceforge.net/projects/florence/"
   35.17 +
   35.18  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   35.19 -WEB_SITE="http://sourceforge.net/projects/florence/"
   35.20 -WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION-gtk2/$TARBALL"
   35.21 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
   35.22  
   35.23 -DEPENDS="gtk+ GConf librsvg at-spi2-core at-spi2-atk gstreamer0"
   35.24 -BUILD_DEPENDS="gtk+-dev GConf-dev librsvg-dev at-spi2-core-dev at-spi2-atk-dev \
   35.25 -gstreamer0-dev libnotify-dev gnome-doc-utils intltool"
   35.26 +BUILD_DEPENDS="intltool glib-dev xorg-libXext-dev cairo-dev librsvg-dev \
   35.27 +libxml2-dev gstreamer1-dev gtk+3-dev xorg-libXtst-dev"
   35.28 +SPLIT="florence-dev"
   35.29  
   35.30 -# Rules to configure and make the package.
   35.31 -compile_rules()
   35.32 -{
   35.33 +compile_rules() {
   35.34  	./configure \
   35.35 -		--prefix=/usr \
   35.36  		--without-panelapplet \
   35.37  		--without-docs \
   35.38  		--without-notification \
   35.39 -		--without-xtst \
   35.40 -		--disable-schemas-compile
   35.41 -	make && make install
   35.42 +		--with-xtst \
   35.43 +		--disable-schemas-compile \
   35.44 +		--without-at-spi \
   35.45 +		--disable-static \
   35.46 +		$CONFIGURE_ARGS &&
   35.47 +	fix libtool &&
   35.48 +	make -j1 &&
   35.49 +	make -j1 install
   35.50  }
   35.51  
   35.52 -# Rules to gen a SliTaz package suitable for Tazpkg.
   35.53 -genpkg_rules()
   35.54 -{
   35.55 -	cp -a $install/* $fs
   35.56 -	sed 's|Categories.*$|&Utility;|' -i \
   35.57 -		$fs/usr/share/applications/florence.desktop
   35.58 +genpkg_rules() {
   35.59 +	case $PACKAGE in
   35.60 +		florence)
   35.61 +			copy @std *.mo
   35.62 +			DEPENDS="cairo gdk-pixbuf glib gstreamer1 gtk+3 librsvg libxml2 \
   35.63 +			pango xorg-libX11 xorg-libXext xorg-libXtst"
   35.64 +			;;
   35.65 +		*-dev)
   35.66 +			copy @dev
   35.67 +			DEPENDS="florence glib-dev"
   35.68 +			;;
   35.69 +	esac
   35.70  }
    36.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.2 +++ b/florence/stuff/patches/florence.patch	Tue Jun 12 00:53:16 2018 +0300
    36.3 @@ -0,0 +1,17 @@
    36.4 +Fix bad situation when Comment exactly repeat the Name. Add sub-category.
    36.5 +
    36.6 +--- a/data/florence.desktop.in.in
    36.7 ++++ b/data/florence.desktop.in.in
    36.8 +@@ -1,10 +1,10 @@
    36.9 + [Desktop Entry]
   36.10 + Encoding=UTF-8
   36.11 +-_Name=Florence Virtual Keyboard
   36.12 ++Name=Florence
   36.13 + _Comment=Florence Virtual Keyboard
   36.14 + Exec=florence
   36.15 + Terminal=false
   36.16 + Type=Application
   36.17 + Icon=@ICONDIR@/florence.svg
   36.18 +-Categories=Application;Accessibility;
   36.19 ++Categories=Application;Accessibility;Utility;
   36.20 + 
    37.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.2 +++ b/florence/stuff/patches/series	Tue Jun 12 00:53:16 2018 +0300
    37.3 @@ -0,0 +1,1 @@
    37.4 +florence.patch
    38.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.2 +++ b/jpegoptim/receipt	Tue Jun 12 00:53:16 2018 +0300
    38.3 @@ -0,0 +1,25 @@
    38.4 +# SliTaz package receipt v2.
    38.5 +
    38.6 +PACKAGE="jpegoptim"
    38.7 +VERSION="1.4.6"
    38.8 +CATEGORY="graphics"
    38.9 +SHORT_DESC="Optimize/compress JPEG files"
   38.10 +MAINTAINER="al.bobylev@gmail.com"
   38.11 +LICENSE="GPL2"
   38.12 +WEB_SITE="https://github.com/tjko/jpegoptim"
   38.13 +
   38.14 +TARBALL="$PACKAGE-$VERSION.tar.gz"
   38.15 +WGET_URL="https://github.com/tjko/jpegoptim/archive/RELEASE.$VERSION.tar.gz"
   38.16 +
   38.17 +BUILD_DEPENDS="libjpeg-turbo-dev"
   38.18 +
   38.19 +compile_rules() {
   38.20 +	./configure $CONFIGURE_ARGS &&
   38.21 +	make &&
   38.22 +	make install
   38.23 +}
   38.24 +
   38.25 +genpkg_rules() {
   38.26 +	copy @std
   38.27 +	DEPENDS="libjpeg-turbo"
   38.28 +}
    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/libbonobo/stuff/patches/libbonobo.patch	Tue Jun 12 00:53:16 2018 +0300
    39.3 @@ -0,0 +1,11 @@
    39.4 +--- a/samples/echo/Bonobo_Sample_Echo-stubs.c
    39.5 ++++ b/samples/echo/Bonobo_Sample_Echo-stubs.c
    39.6 +@@ -6,7 +6,7 @@
    39.7 + #define ORBIT2_STUBS_API
    39.8 + #include "Bonobo_Sample_Echo.h"
    39.9 + 
   39.10 +-void Bonobo_Sample_Echo_echo(Bonobo_Sample_Echo _obj, const CORBA_char * message, CORBA_Environment *ev){
   39.11 ++extern void Bonobo_Sample_Echo_echo(Bonobo_Sample_Echo _obj, const CORBA_char * message, CORBA_Environment *ev){
   39.12 + gpointer _args[1];
   39.13 + _args[0] = (gpointer)&message;
   39.14 + ORBit_c_stub_invoke (_obj, &Bonobo_Sample_Echo__iinterface.methods, 0, NULL, _args, NULL, ev, Bonobo_Sample_Echo__classid, G_STRUCT_OFFSET (POA_Bonobo_Sample_Echo__epv, echo),
    40.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.2 +++ b/libbonobo/stuff/patches/series	Tue Jun 12 00:53:16 2018 +0300
    40.3 @@ -0,0 +1,1 @@
    40.4 +libbonobo.patch