# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1538001251 -10800
# Node ID 2949147cd6ecf59b93977591c31a9d5b4c16d34c
# Parent  019246ad2f42697d3e8c1294d2c10ceb4c1e487d
Small improvements

diff -r 019246ad2f42 -r 2949147cd6ec adeskbar/.icon.png
Binary file adeskbar/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec awn/.icon.png
Binary file awn/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec gajim/.icon.png
Binary file gajim/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec itaka/.icon.png
Binary file itaka/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec itaka/receipt
--- a/itaka/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/itaka/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="itaka"
 VERSION="0.2.2"
@@ -6,25 +6,20 @@
 SHORT_DESC="Itaka on-demand screenshot server. Start server and let client connect via http"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://web.archive.org/web/20140701101226/http://itaka.jardinpresente.com.ar/"
+HOST_ARCH="any"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://web.archive.org/web/20140701101226/http://itaka.jardinpresente.com.ar/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="screenshot"
 
-DEPENDS="python-pygtk python-twisted"
+compile_rules() {
+	make PREFIX=$install/usr || return 1
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make PREFIX=$DESTDIR/usr
+	ln -sf ../lib/itaka/itaka.py $install/usr/bin/itaka
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/itaka $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="python-pygtk python-twisted"
+	TAGS="screenshot"
 }
diff -r 019246ad2f42 -r 2949147cd6ec labyrinth/.icon.png
Binary file labyrinth/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec lutris/.icon.png
Binary file lutris/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec novnc/.icon.png
Binary file novnc/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec novnc/receipt
--- a/novnc/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/novnc/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -1,25 +1,28 @@
 # SliTaz package receipt v2.
 
 PACKAGE="novnc"
-VERSION="201111004"
+VERSION="1.0.0"
 CATEGORY="network"
-SHORT_DESC="VNC client in HTML5/javascript."
+SHORT_DESC="VNC client using HTML5 (WebSockets, Canvas) with encryption (wss://) support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MPL2"
-WEB_SITE="http://github.com/kanaka/noVNC"
+WEB_SITE="https://kanaka.github.io/noVNC/"
 
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="git|git://github.com/kanaka/noVNC.git"
-
-BUILD_DEPENDS="python python-pil openssl git"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/novnc/noVNC/archive/v$VERSION.tar.gz"
 
 compile_rules() {
-	mkdir -p $DESTDIR
-	sed -i 's/bash/sh/;s/ps -p \([^ ]*\)/ps | grep "^ *\1 "/' utils/launch.sh
+	mkdir -p $install/usr/share/novnc/
+#	sed -i 's#bash#sh#; s#ps -p \([^ ]*\)#ps | grep "^ *\1 "#' utils/launch.sh
 
-	IMAGE=/usr/share/images/slitaz-background.jpg
-	[ -s $IMAGE ] && utils/img2js.py $IMAGE noVNC_logo > include/logo.js
-	cp -a *.html images/favicon.ico utils include $DESTDIR
+	cp -r $src/* $install/usr/share/novnc/
+
+	install -Dm755 utils/launch.sh $install/usr/bin/novnc_server
+
+	find $install -type f \( -name 'README.md' -o -name '.*' -o -name Makefile \) -delete
+	rm -r $install/usr/share/novnc/docs/ $install/usr/share/novnc/utils/
+
+	cook_pick_docs README.md docs/
 }
 
 genpkg_rules() {
@@ -38,7 +41,7 @@
 
 
 EOT
-	DEPENDS="python python-numpy"
-	SUGGESTED="python-pyopenssl openssl"
+	DEPENDS="python-websockify net-tools"
+	SUGGESTED="openssl"
 	TAGS="vnc remote-desktop html5"
 }
diff -r 019246ad2f42 -r 2949147cd6ec novnc/stuff/patches/launch.sh.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/novnc/stuff/patches/launch.sh.patch	Thu Sep 27 01:34:11 2018 +0300
@@ -0,0 +1,53 @@
+--- a/utils/launch.sh
++++ b/utils/launch.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ 
+ # Copyright 2016 Joel Martin
+ # Copyright 2016 Solly Ross
+@@ -110,42 +110,11 @@
+     echo "Warning: could not find self.pem"
+ fi
+ 
+-# try to find websockify (prefer local, try global, then download local)
+-if [[ -e ${HERE}/websockify ]]; then
+-    WEBSOCKIFY=${HERE}/websockify/run
+-
+-    if [[ ! -x $WEBSOCKIFY ]]; then
+-        echo "The path ${HERE}/websockify exists, but $WEBSOCKIFY either does not exist or is not executable."
+-        echo "If you intended to use an installed websockify package, please remove ${HERE}/websockify."
+-        exit 1
+-    fi
+-
+-    echo "Using local websockify at $WEBSOCKIFY"
+-else
+-    WEBSOCKIFY=$(which websockify 2>/dev/null)
+-
+-    if [[ $? -ne 0 ]]; then
+-        echo "No installed websockify, attempting to clone websockify..."
+-        WEBSOCKIFY=${HERE}/websockify/run
+-        git clone https://github.com/novnc/websockify ${HERE}/websockify
+-
+-        if [[ ! -e $WEBSOCKIFY ]]; then
+-            echo "Unable to locate ${HERE}/websockify/run after downloading"
+-            exit 1
+-        fi
+-
+-        echo "Using local websockify at $WEBSOCKIFY"
+-    else
+-        echo "Using installed websockify at $WEBSOCKIFY"
+-    fi
+-fi
+-
+ echo "Starting webserver and WebSockets proxy on port ${PORT}"
+-#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
+-${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
++${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
+ proxy_pid="$!"
+ sleep 1
+-if ! ps -p ${proxy_pid} >/dev/null; then
++if [ -z "$proxy_pid" ] || ! ps -o pid= | grep -qw ${proxy_pid}; then
+     proxy_pid=
+     echo "Failed to start WebSockets proxy"
+     exit 1
diff -r 019246ad2f42 -r 2949147cd6ec novnc/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/novnc/stuff/patches/series	Thu Sep 27 01:34:11 2018 +0300
@@ -0,0 +1,3 @@
+# Be Busybox compatible; websockify already in the dependencies
+
+launch.sh.patch
diff -r 019246ad2f42 -r 2949147cd6ec openbox/.icon.png
Binary file openbox/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec openshot/.icon.png
Binary file openshot/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec pygoocanvas/receipt
--- a/pygoocanvas/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/pygoocanvas/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -24,6 +24,6 @@
 }
 
 genpkg_rules() {
-	copy @dev
+	copy @std @dev
 	DEPENDS="python python-pygtk goocanvas"
 }
diff -r 019246ad2f42 -r 2949147cd6ec python-dbus/receipt
--- a/python-dbus/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/python-dbus/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -22,7 +22,7 @@
 	pip$SET install --no-compile --root=$install $ORIGIN==$VERSION || return 1
 
 	# fix installation
-	mv $install/tmp/pip-build-*/dbus-python/build/lib.*/* \
+	mv $install/tmp/pip-*/dbus-python/build/lib.*/* \
 		$install/usr/lib/python*/site-packages/
 	rm -r $install/tmp
 
diff -r 019246ad2f42 -r 2949147cd6ec python-websockify/.icon.png
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python-websockify/.icon.png	Thu Sep 27 01:34:11 2018 +0300
@@ -0,0 +1,1 @@
+../python/.icon.png
\ No newline at end of file
diff -r 019246ad2f42 -r 2949147cd6ec python-websockify/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python-websockify/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -0,0 +1,25 @@
+# SliTaz package receipt v2.
+
+ORIGIN="websockify"
+PACKAGE="python-websockify"
+VERSION="0.8.0"
+CATEGORY="python"
+SHORT_DESC="WebSockets support for any application/server"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="LGPL3"
+WEB_SITE="https://pypi.org/project/$ORIGIN/"
+HOST_ARCH="any"
+REPOLOGY="python:websockify"
+
+BUILD_DEPENDS="python python-numpy  python3 python3-numpy"
+SPLIT="${PACKAGE/python/python3}:3"
+
+compile_rules() {
+	pip$SET install --no-compile --root=$install $ORIGIN==$VERSION
+}
+
+genpkg_rules() {
+	copy @std @dev # not a dev files really in include/
+	py="${PACKAGE%%-*}" # python/python3
+	DEPENDS="$py $py-numpy"
+}
diff -r 019246ad2f42 -r 2949147cd6ec python/receipt
--- a/python/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/python/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -89,7 +89,7 @@
 genpkg_rules() {
 	case $PACKAGE in
 		*-dev)
-			copy @dev test/ distutils/command/*.exe
+			copy @dev test/ distutils/command/*.exe ensurepip/
 			find $fs -type f -name pyconfig.h -delete # move to python package
 			;;
 		*-idle)
diff -r 019246ad2f42 -r 2949147cd6ec radiotray/.icon.png
Binary file radiotray/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec screenlets/.icon.png
Binary file screenlets/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec songwrite/.icon.png
Binary file songwrite/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec songwrite/receipt
--- a/songwrite/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/songwrite/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="songwrite"
-SOURCE="Songwrite2"
-VERSION="0.4"
+VERSION="0.14"
 CATEGORY="multimedia"
-SHORT_DESC="music score and songbook editor."
+SHORT_DESC="Music score and songbook editor"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.lesfleursdunormal.fr/static/informatique/songwrite/index_en.html"
-WGET_URL="http://download.gna.org/songwrite/$TARBALL"
 
-DEPENDS="python editobj gtk+ python-pycairo"
+TARBALL="songwrite_0.14.orig.tar.gz"
+WGET_URL="http://http.debian.net/debian/pool/main/s/songwrite/$TARBALL"
+
 BUILD_DEPENDS="python"
-SUGGESTED="TiMidity++ evince"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	python ./setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B ./setup.py install --root=$install || return 1
+
+	mv $install/usr/share/songwrite/doc/ $install/usr/share/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python editobj gtk+ python-pycairo"
+	SUGGESTED="TiMidity++ evince"
 }
diff -r 019246ad2f42 -r 2949147cd6ec tahoe-lafs/.icon.png
Binary file tahoe-lafs/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec vim-tiny/receipt
--- a/vim-tiny/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="vim-tiny"
-VERSION="7.4"
-CATEGORY="editors"
-SHORT_DESC="Advanced text editor with no GUI"
-MAINTAINER="erjo@slitaz.org"
-LICENSE="other"
-WEB_SITE="http://www.vim.org/"
-CONFIG_FILES="/etc/vim/vimrc"
-TAGS="text-editor"
-
-TARBALL="vim-$VERSION.tar.bz2"
-WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
-
-DEPENDS="ncurses"
-BUILD_DEPENDS="ncurses-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-
-	./configure --prefix=/usr \
-		--with-features=tiny \
-		--without-x \
-		--disable-gui \
-		--enable-multibyte \
-		--with-vim-name=$PACKAGE \
-		--disable-acl \
-		$CONFIGURE_ARGS &&
-	make && make install
-
-	mkdir -p $DESTDIR/etc/vim
-	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
-
-	mkdir -p $install/usr/share/doc
-	mv $install/usr/share/vim/vim*/doc $install/usr/share/doc/$PACKAGE-$VERSION
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	copy etc/ bin/ vim/
-	rm -f  $fs/usr/bin/*tutor
-	rm -rf $fs/usr/share/vim/vim*/tutor
-}
-
-post_install()
-{
-	cmd=$(readlink "$1/bin/vi")
-	if [ "$cmd" != '/usr/bin/vim' ]; then
-		echo
-		echo "**** Actual VI link : $cmd"
-		echo
-		echo -n 'Do you want vim  for /bin/vi (y/N)? : '; read -t 30 anser
-		if [ "$anser" == 'y' ]; then
-			echo
-			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
-			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
-			status
-		else
-			echo
-			echo "Leaving /bin/vi to $cmd"
-		fi
-	fi
-}
-
-post_remove()
-{
-	# restore previous symlink
-	ln -sf /bin/busybox "$1/bin/vi"
-}
diff -r 019246ad2f42 -r 2949147cd6ec vim/receipt
--- a/vim/receipt	Wed Sep 26 00:03:58 2018 +0300
+++ b/vim/receipt	Thu Sep 27 01:34:11 2018 +0300
@@ -1,15 +1,15 @@
 # SliTaz package receipt v2.
 
 PACKAGE="vim"
-VERSION="8.1"
+VERSION="8.1.0436"
 CATEGORY="editors"
 SHORT_DESC="Advanced text editor"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="other"
-WEB_SITE="http://www.vim.org/"
+WEB_SITE="https://www.vim.org/"
 
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/vim/vim/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="python ncurses-dev acl-dev diffutils gettext"
 SPLIT="vim-tiny:tiny"
@@ -58,8 +58,11 @@
 
 # common post-install for vim and vim-tiny
 post_install() {
+	if [ -n "$quiet" ]; then return; fi
+
 	cmd=$(readlink "$1/bin/vi")
 	[ "$cmd" != '/usr/bin/vim' ] || return
+
 	echo
 	echo "**** Actual VI link : $cmd"
 	echo
diff -r 019246ad2f42 -r 2949147cd6ec virt-manager/.icon.png
Binary file virt-manager/.icon.png has changed
diff -r 019246ad2f42 -r 2949147cd6ec zim/.icon.png
Binary file zim/.icon.png has changed