# HG changeset patch # User Aleksej Bobylev # Date 1529847963 -10800 # Node ID baaa04032e25ae6e3e57c0058d99288ef707acdc # Parent 71ef8aa58924e7722d66a894c1bbebe463e20015 Add uglifyjs; fix build / up: python-cython, xpra, xscavenger, xsshfs, zbar diff -r 71ef8aa58924 -r baaa04032e25 python-cython/receipt --- a/python-cython/receipt Sun Jun 24 12:34:21 2018 +0300 +++ b/python-cython/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -1,29 +1,21 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="python-cython" -VERSION="0.17.1" +VERSION="latest" CATEGORY="development" -SHORT_DESC="Language to write C extensions for Python." +SHORT_DESC="Language to write C extensions for Python" MAINTAINER="pankso@slitaz.org" LICENSE="Apache" -SOURCE="Cython" -TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://cython.org/" -WGET_URL="http://cython.org/release/$TARBALL" -DEPENDS="python" -BUILD_DEPENDS="$DEPENDS python-dev" +BUILD_DEPENDS="python-dev" -# Rules to configure and make the package. -compile_rules() -{ - python setup.py build && - python setup.py install --root=$DESTDIR +compile_rules() { + pip install --no-compile --root=$DESTDIR Cython } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs - cp -a $install/usr $fs +genpkg_rules() { + VERSION=$(sed -n '/^Successfully installed/ s|.*Cython-||p' $LOGS/$PACKAGE.log) + copy @std + DEPENDS="python" } diff -r 71ef8aa58924 -r baaa04032e25 uglifyjs/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/uglifyjs/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -0,0 +1,23 @@ +# SliTaz package receipt v2. + +PACKAGE="uglifyjs" +VERSION="latest" +CATEGORY="utilities" +SHORT_DESC="JavaScript parser / mangler / compressor / beautifier library for NodeJS" +MAINTAINER="al.bobylev@gmail.com" +LICENSE="MIT" +WEB_SITE="https://github.com/mishoo/UglifyJS" + +BUILD_DEPENDS="node" + +compile_rules() { + npm install -g uglify-js@1 || return 1 + + cook_pick_docs $install/usr/lib/node_modules/uglify-js/README.html +} + +genpkg_rules() { + VERSION=$(sed -n '/uglify-js@/ s|.*uglify-js@||p' $LOGS/$PACKAGE.log) + copy @std + DEPENDS="node" +} diff -r 71ef8aa58924 -r baaa04032e25 xpra/receipt --- a/xpra/receipt Sun Jun 24 12:34:21 2018 +0300 +++ b/xpra/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -1,28 +1,33 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="xpra" -VERSION="0.8.7" +VERSION="2.3.1" CATEGORY="network" -SHORT_DESC="screen for X." +SHORT_DESC="screen for X" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://xpra.org/" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://xpra.org/" -WGET_URL="${WEB_SITE}src/$TARBALL" +WGET_URL="http://xpra.org/src/$TARBALL" +# integrity check: http://xpra.org/src/ +TARBALL_SHA1="5bcd554bff69a4077b7090f6871e939b5b3b47b2" -DEPENDS="python gtk+ pygtk pygobject x264 ffmpeg libvpx" -BUILD_DEPENDS="python-dev gtk+-dev pygtk-dev pygobject-dev \ -xorg-dev python-cython x264-dev ffmpeg-dev libvpx-dev" +BUILD_DEPENDS="python python-cython libvpx-dev xorg-libX11-dev x264-dev \ +x265-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \ +xorg-libXfixes-dev xorg-libxkbfile-dev xorg-libXrandr-dev xorg-libXtst-dev \ +pygobject-dev pygtk-dev python-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { + echo 'NAME=SliTaz' > /etc/os-release # use both with the patch + python setup.py build && python setup.py install --root=$DESTDIR } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/* $fs/ +genpkg_rules() { + copy @std + DEPENDS="glib gtk+ libvpx python x264 x265 xorg-libX11 xorg-libXcomposite \ + xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi xorg-libXrandr \ + xorg-libXtst xorg-libxkbfile pygtk pygobject" # maybe some other python-* too } diff -r 71ef8aa58924 -r baaa04032e25 xpra/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xpra/stuff/patches/series Sun Jun 24 16:46:03 2018 +0300 @@ -0,0 +1,1 @@ +xpra.patch diff -r 71ef8aa58924 -r baaa04032e25 xpra/stuff/patches/xpra.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xpra/stuff/patches/xpra.patch Sun Jun 24 16:46:03 2018 +0300 @@ -0,0 +1,35 @@ +SliTaz need to avoid an error too, just like Debian or Ubuntu: +/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes] + +--- a/xpra/os_util.py ++++ b/xpra/os_util.py +@@ -294,6 +294,9 @@ + def is_RedHat(): + return is_distribution_variant(b"RedHat") + ++def is_SliTaz(): ++ return is_distribution_variant(b"SliTaz") ++ + + _linux_distribution = None + def get_linux_distribution(): +--- a/setup.py ++++ b/setup.py +@@ -93,7 +93,7 @@ + # using --with-OPTION or --without-OPTION + # only the default values are specified here: + #******************************************************************************* +-from xpra.os_util import get_status_output, is_Ubuntu, is_Debian, is_Raspbian, getUbuntuVersion,\ ++from xpra.os_util import get_status_output, is_Ubuntu, is_Debian, is_Raspbian, is_SliTaz, getUbuntuVersion,\ + PYTHON3, BITS + + PKG_CONFIG = os.environ.get("PKG_CONFIG", "pkg-config") +@@ -706,7 +706,7 @@ + ] + elif get_gcc_version()>=[4, 4]: + eifd = ["-Werror"] +- if is_Debian() or is_Ubuntu() or is_Raspbian(): ++ if is_Debian() or is_Ubuntu() or is_Raspbian() or is_SliTaz(): + #needed on Debian and Ubuntu to avoid this error: + #/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes] + eifd.append("-Wno-error=strict-prototypes") diff -r 71ef8aa58924 -r baaa04032e25 xscavenger/.icon.png Binary file xscavenger/.icon.png has changed diff -r 71ef8aa58924 -r baaa04032e25 xscavenger/receipt --- a/xscavenger/receipt Sun Jun 24 12:34:21 2018 +0300 +++ b/xscavenger/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -1,30 +1,29 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="xscavenger" -VERSION="1.4.4" +VERSION="1.4.5" CATEGORY="games" -SHORT_DESC="Lode Runner rewritten for X11." +SHORT_DESC="Lode Runner rewritten for X11" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://www.xdr.com/dash/scavenger.html" +WEB_SITE="https://www.linuxmotors.com/scavenger/" + TARBALL="$PACKAGE-$VERSION.tgz" -WGET_URL="$(dirname $WEB_SITE)/$TARBALL" +WGET_URL="https://www.linuxmotors.com/scavenger/downloads/$TARBALL" -DEPENDS="xorg" -BUILD_DEPENDS="xorg-imake xorg-dev" +BUILD_DEPENDS="xorg-imake xorg-xproto xorg-libX11-dev alsa-lib-dev \ +xorg-libXext-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { cd $src/src cp scavenger.6 scavenger.man - xmkmf - make && make DESTDIR=$DESTDIR install + + xmkmf && + make && + make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/usr $fs - cp -a $stuff/*/ $fs +genpkg_rules() { + copy @std + DEPENDS="alsa-lib xorg-libX11 xorg-libXext" } diff -r 71ef8aa58924 -r baaa04032e25 xscavenger/stuff/usr/share/applications/xscavenger.desktop --- a/xscavenger/stuff/usr/share/applications/xscavenger.desktop Sun Jun 24 12:34:21 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=Xscavenger -Exec=xscavenger -Terminal=false -Categories=Application;Game; -Comment=Lode Runner rewritten for X11 diff -r 71ef8aa58924 -r baaa04032e25 xscavenger/stuff/xscavenger.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xscavenger/stuff/xscavenger.desktop Sun Jun 24 16:46:03 2018 +0300 @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Xscavenger +Comment=Lode Runner rewritten for X11 +Exec=xscavenger +Categories=Game; diff -r 71ef8aa58924 -r baaa04032e25 xscavenger/stuff/xscavenger.png Binary file xscavenger/stuff/xscavenger.png has changed diff -r 71ef8aa58924 -r baaa04032e25 xsshfs/receipt --- a/xsshfs/receipt Sun Jun 24 12:34:21 2018 +0300 +++ b/xsshfs/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -1,23 +1,33 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="xsshfs" VERSION="0.5" CATEGORY="network" -SHORT_DESC="GUI for sshfs." +SHORT_DESC="GUI for sshfs" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -TARBALL="${PACKAGE}_$VERSION-all_src.tar.gz" -WEB_SITE="http://forge.zici.fr/p/xsshfs/" -WGET_URL="${WEB_SITE}downloads/get/$TARBALL" +WEB_SITE="https://framagit.org/kepon/xsshfs" -DEPENDS="sshfs perl-config-tiny perl-locale-gettext glade-perl perl-image-librsvg" -SUGGESTED="pcmanfm" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="https://framagit.org/kepon/xsshfs/-/archive/master/xsshfs-master.tar.bz2" -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $src/usr $fs/ - sed -i 's|/bin/bash|/bin/sh|' $fs/usr/bin/xsshfs - sed -i 's|"/bin/fusermount|"/usr/bin/fusermount|' $fs/usr/share/xsshfs/xsshfs.pm - sed -i 's|xdg-open|pcmanfm|' $fs/usr/share/xsshfs/xsshfs.pm +compile_rules() { + install -Dm755 $stuff/xsshfs $install/usr/bin/xsshfs + install -Dm644 $stuff/xsshfs.desktop $install/usr/share/applications/xsshfs.desktop + install -Dm644 xsshfs.svg $install/usr/share/icons/hicolor/scalable/apps/xsshfs.svg + install -Dm644 locale/es/LC_MESSAGES/xsshfs.mo $install/usr/share/locale/es/LC_MESSAGES/xsshfs.mo + install -Dm644 locale/fr/LC_MESSAGES/xsshfs.mo $install/usr/share/locale/fr/LC_MESSAGES/xsshfs.mo + install -Dm644 xsshfs.glade $install/usr/share/xsshfs/xsshfs.glade + install -Dm644 xsshfs.pl $install/usr/share/xsshfs/xsshfs.pl + install -Dm644 xsshfs.pm $install/usr/share/xsshfs/xsshfs.pm + + sed -i 's|"/bin/fusermount|"/usr/bin/fusermount|; s|xdg-open|pcmanfm|' \ + $install/usr/share/xsshfs/xsshfs.pm } + +genpkg_rules() { + copy @std + DEPENDS="sshfs fuse2 perl-config-tiny perl-locale-gettext glade-perl \ + perl-image-librsvg" + SUGGESTED="pcmanfm" +} diff -r 71ef8aa58924 -r baaa04032e25 xsshfs/stuff/xsshfs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xsshfs/stuff/xsshfs Sun Jun 24 16:46:03 2018 +0300 @@ -0,0 +1,4 @@ +#!/bin/sh + +cd /usr/share/xsshfs +exec ./xsshfs.pl $@ diff -r 71ef8aa58924 -r baaa04032e25 xsshfs/stuff/xsshfs.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xsshfs/stuff/xsshfs.desktop Sun Jun 24 16:46:03 2018 +0300 @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Xsshfs +Exec=xsshfs +Icon=xsshfs +Categories=Network; diff -r 71ef8aa58924 -r baaa04032e25 zbar/receipt --- a/zbar/receipt Sun Jun 24 12:34:21 2018 +0300 +++ b/zbar/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -3,47 +3,41 @@ PACKAGE="zbar" VERSION="0.10" CATEGORY="utilities" -SHORT_DESC="Decode barcode & QR code." +SHORT_DESC="Decode barcode & QR code" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="LGPL2.1" +WEB_SITE="http://zbar.sourceforge.net/" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://zbar.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -BUILD_DEPENDS="linux-api-headers jpeg-dev imagemagick-dev pango-dev cairo-dev \ -freetype-dev fontconfig-dev atk-dev gtk+-dev glib-dev util-linux-uuid-dev \ -lcms-dev fftw-dev openexr-dev ilmbase-dev graphviz-dev gdk-pixbuf libxml2-dev \ -libtool" +BUILD_DEPENDS="xmlto xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev \ +libjpeg-turbo-dev imagemagick6-dev gtk+-dev" SPLIT="zbar-dev" -# Rules to configure and make the package. -compile_rules() -{ - ./configure --prefix=/usr --mandir=/usr/share/man \ - --localstatedir=/var \ +compile_rules() { + sed -i 's|MagickWand |MagickWand-6 |g' configure # search for MagickWand-6.pc instead + + ./configure \ --without-qt \ --without-python \ --disable-video \ - $CONFIGURE_ARGS && + $CONFIGURE_ARGS && + fix libtool && make && - make DESTDIR=$DESTDIR install + make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in - zbar) - DEPENDS="jpeg imagemagick pango cairo freetype fontconfig atk gtk+ glib" - mkdir -p $fs/usr/lib - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib/*.so* $fs/usr/lib - ;; - zbar-dev) - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib - ;; + zbar) + copy @std + DEPENDS="gdk-pixbuf glib gtk+ imagemagick6 libjpeg-turbo \ + xorg-libX11 xorg-libXv" + ;; + *-dev) + copy @dev + DEPENDS="zbar glib-dev gtk+-dev" + ;; esac } diff -r 71ef8aa58924 -r baaa04032e25 zsnes/receipt --- a/zsnes/receipt Sun Jun 24 12:34:21 2018 +0300 +++ b/zsnes/receipt Sun Jun 24 16:46:03 2018 +0300 @@ -7,6 +7,7 @@ MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2" WEB_SITE="http://www.zsnes.com/" +HOST_ARCH="i486" TARBALL="$PACKAGE${VERSION//./}src.tar.bz2" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"