wok-next rev 20851
Add uglifyjs; fix build / up: python-cython, xpra, xscavenger, xsshfs, zbar
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sun Jun 24 16:46:03 2018 +0300 (2018-06-24) |
parents | 71ef8aa58924 |
children | 81b782d36618 |
files | python-cython/receipt uglifyjs/receipt xpra/receipt xpra/stuff/patches/series xpra/stuff/patches/xpra.patch xscavenger/.icon.png xscavenger/receipt xscavenger/stuff/usr/share/applications/xscavenger.desktop xscavenger/stuff/xscavenger.desktop xscavenger/stuff/xscavenger.png xsshfs/receipt xsshfs/stuff/xsshfs xsshfs/stuff/xsshfs.desktop zbar/receipt zsnes/receipt |
line diff
1.1 --- a/python-cython/receipt Sun Jun 24 12:34:21 2018 +0300 1.2 +++ b/python-cython/receipt Sun Jun 24 16:46:03 2018 +0300 1.3 @@ -1,29 +1,21 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="python-cython" 1.8 -VERSION="0.17.1" 1.9 +VERSION="latest" 1.10 CATEGORY="development" 1.11 -SHORT_DESC="Language to write C extensions for Python." 1.12 +SHORT_DESC="Language to write C extensions for Python" 1.13 MAINTAINER="pankso@slitaz.org" 1.14 LICENSE="Apache" 1.15 -SOURCE="Cython" 1.16 -TARBALL="$SOURCE-$VERSION.tar.gz" 1.17 WEB_SITE="http://cython.org/" 1.18 -WGET_URL="http://cython.org/release/$TARBALL" 1.19 1.20 -DEPENDS="python" 1.21 -BUILD_DEPENDS="$DEPENDS python-dev" 1.22 +BUILD_DEPENDS="python-dev" 1.23 1.24 -# Rules to configure and make the package. 1.25 -compile_rules() 1.26 -{ 1.27 - python setup.py build && 1.28 - python setup.py install --root=$DESTDIR 1.29 +compile_rules() { 1.30 + pip install --no-compile --root=$DESTDIR Cython 1.31 } 1.32 1.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.34 -genpkg_rules() 1.35 -{ 1.36 - mkdir -p $fs 1.37 - cp -a $install/usr $fs 1.38 +genpkg_rules() { 1.39 + VERSION=$(sed -n '/^Successfully installed/ s|.*Cython-||p' $LOGS/$PACKAGE.log) 1.40 + copy @std 1.41 + DEPENDS="python" 1.42 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/uglifyjs/receipt Sun Jun 24 16:46:03 2018 +0300 2.3 @@ -0,0 +1,23 @@ 2.4 +# SliTaz package receipt v2. 2.5 + 2.6 +PACKAGE="uglifyjs" 2.7 +VERSION="latest" 2.8 +CATEGORY="utilities" 2.9 +SHORT_DESC="JavaScript parser / mangler / compressor / beautifier library for NodeJS" 2.10 +MAINTAINER="al.bobylev@gmail.com" 2.11 +LICENSE="MIT" 2.12 +WEB_SITE="https://github.com/mishoo/UglifyJS" 2.13 + 2.14 +BUILD_DEPENDS="node" 2.15 + 2.16 +compile_rules() { 2.17 + npm install -g uglify-js@1 || return 1 2.18 + 2.19 + cook_pick_docs $install/usr/lib/node_modules/uglify-js/README.html 2.20 +} 2.21 + 2.22 +genpkg_rules() { 2.23 + VERSION=$(sed -n '/uglify-js@/ s|.*uglify-js@||p' $LOGS/$PACKAGE.log) 2.24 + copy @std 2.25 + DEPENDS="node" 2.26 +}
3.1 --- a/xpra/receipt Sun Jun 24 12:34:21 2018 +0300 3.2 +++ b/xpra/receipt Sun Jun 24 16:46:03 2018 +0300 3.3 @@ -1,28 +1,33 @@ 3.4 -# SliTaz package receipt. 3.5 +# SliTaz package receipt v2. 3.6 3.7 PACKAGE="xpra" 3.8 -VERSION="0.8.7" 3.9 +VERSION="2.3.1" 3.10 CATEGORY="network" 3.11 -SHORT_DESC="screen for X." 3.12 +SHORT_DESC="screen for X" 3.13 MAINTAINER="pascal.bellard@slitaz.org" 3.14 LICENSE="GPL2" 3.15 +WEB_SITE="http://xpra.org/" 3.16 + 3.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 3.18 -WEB_SITE="http://xpra.org/" 3.19 -WGET_URL="${WEB_SITE}src/$TARBALL" 3.20 +WGET_URL="http://xpra.org/src/$TARBALL" 3.21 +# integrity check: http://xpra.org/src/ 3.22 +TARBALL_SHA1="5bcd554bff69a4077b7090f6871e939b5b3b47b2" 3.23 3.24 -DEPENDS="python gtk+ pygtk pygobject x264 ffmpeg libvpx" 3.25 -BUILD_DEPENDS="python-dev gtk+-dev pygtk-dev pygobject-dev \ 3.26 -xorg-dev python-cython x264-dev ffmpeg-dev libvpx-dev" 3.27 +BUILD_DEPENDS="python python-cython libvpx-dev xorg-libX11-dev x264-dev \ 3.28 +x265-dev xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \ 3.29 +xorg-libXfixes-dev xorg-libxkbfile-dev xorg-libXrandr-dev xorg-libXtst-dev \ 3.30 +pygobject-dev pygtk-dev python-dev" 3.31 3.32 -# Rules to configure and make the package. 3.33 -compile_rules() 3.34 -{ 3.35 +compile_rules() { 3.36 + echo 'NAME=SliTaz' > /etc/os-release # use both with the patch 3.37 + 3.38 python setup.py build && 3.39 python setup.py install --root=$DESTDIR 3.40 } 3.41 3.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.43 -genpkg_rules() 3.44 -{ 3.45 - cp -a $install/* $fs/ 3.46 +genpkg_rules() { 3.47 + copy @std 3.48 + DEPENDS="glib gtk+ libvpx python x264 x265 xorg-libX11 xorg-libXcomposite \ 3.49 + xorg-libXdamage xorg-libXext xorg-libXfixes xorg-libXi xorg-libXrandr \ 3.50 + xorg-libXtst xorg-libxkbfile pygtk pygobject" # maybe some other python-* too 3.51 }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/xpra/stuff/patches/series Sun Jun 24 16:46:03 2018 +0300 4.3 @@ -0,0 +1,1 @@ 4.4 +xpra.patch
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/xpra/stuff/patches/xpra.patch Sun Jun 24 16:46:03 2018 +0300 5.3 @@ -0,0 +1,35 @@ 5.4 +SliTaz need to avoid an error too, just like Debian or Ubuntu: 5.5 +/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes] 5.6 + 5.7 +--- a/xpra/os_util.py 5.8 ++++ b/xpra/os_util.py 5.9 +@@ -294,6 +294,9 @@ 5.10 + def is_RedHat(): 5.11 + return is_distribution_variant(b"RedHat") 5.12 + 5.13 ++def is_SliTaz(): 5.14 ++ return is_distribution_variant(b"SliTaz") 5.15 ++ 5.16 + 5.17 + _linux_distribution = None 5.18 + def get_linux_distribution(): 5.19 +--- a/setup.py 5.20 ++++ b/setup.py 5.21 +@@ -93,7 +93,7 @@ 5.22 + # using --with-OPTION or --without-OPTION 5.23 + # only the default values are specified here: 5.24 + #******************************************************************************* 5.25 +-from xpra.os_util import get_status_output, is_Ubuntu, is_Debian, is_Raspbian, getUbuntuVersion,\ 5.26 ++from xpra.os_util import get_status_output, is_Ubuntu, is_Debian, is_Raspbian, is_SliTaz, getUbuntuVersion,\ 5.27 + PYTHON3, BITS 5.28 + 5.29 + PKG_CONFIG = os.environ.get("PKG_CONFIG", "pkg-config") 5.30 +@@ -706,7 +706,7 @@ 5.31 + ] 5.32 + elif get_gcc_version()>=[4, 4]: 5.33 + eifd = ["-Werror"] 5.34 +- if is_Debian() or is_Ubuntu() or is_Raspbian(): 5.35 ++ if is_Debian() or is_Ubuntu() or is_Raspbian() or is_SliTaz(): 5.36 + #needed on Debian and Ubuntu to avoid this error: 5.37 + #/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes] 5.38 + eifd.append("-Wno-error=strict-prototypes")
6.1 Binary file xscavenger/.icon.png has changed
7.1 --- a/xscavenger/receipt Sun Jun 24 12:34:21 2018 +0300 7.2 +++ b/xscavenger/receipt Sun Jun 24 16:46:03 2018 +0300 7.3 @@ -1,30 +1,29 @@ 7.4 -# SliTaz package receipt. 7.5 +# SliTaz package receipt v2. 7.6 7.7 PACKAGE="xscavenger" 7.8 -VERSION="1.4.4" 7.9 +VERSION="1.4.5" 7.10 CATEGORY="games" 7.11 -SHORT_DESC="Lode Runner rewritten for X11." 7.12 +SHORT_DESC="Lode Runner rewritten for X11" 7.13 MAINTAINER="pascal.bellard@slitaz.org" 7.14 LICENSE="GPL2" 7.15 -WEB_SITE="http://www.xdr.com/dash/scavenger.html" 7.16 +WEB_SITE="https://www.linuxmotors.com/scavenger/" 7.17 + 7.18 TARBALL="$PACKAGE-$VERSION.tgz" 7.19 -WGET_URL="$(dirname $WEB_SITE)/$TARBALL" 7.20 +WGET_URL="https://www.linuxmotors.com/scavenger/downloads/$TARBALL" 7.21 7.22 -DEPENDS="xorg" 7.23 -BUILD_DEPENDS="xorg-imake xorg-dev" 7.24 +BUILD_DEPENDS="xorg-imake xorg-xproto xorg-libX11-dev alsa-lib-dev \ 7.25 +xorg-libXext-dev" 7.26 7.27 -# Rules to configure and make the package. 7.28 -compile_rules() 7.29 -{ 7.30 +compile_rules() { 7.31 cd $src/src 7.32 cp scavenger.6 scavenger.man 7.33 - xmkmf 7.34 - make && make DESTDIR=$DESTDIR install 7.35 + 7.36 + xmkmf && 7.37 + make && 7.38 + make install 7.39 } 7.40 7.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.42 -genpkg_rules() 7.43 -{ 7.44 - cp -a $install/usr $fs 7.45 - cp -a $stuff/*/ $fs 7.46 +genpkg_rules() { 7.47 + copy @std 7.48 + DEPENDS="alsa-lib xorg-libX11 xorg-libXext" 7.49 }
8.1 --- a/xscavenger/stuff/usr/share/applications/xscavenger.desktop Sun Jun 24 12:34:21 2018 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,8 +0,0 @@ 8.4 -[Desktop Entry] 8.5 -Type=Application 8.6 -Encoding=UTF-8 8.7 -Name=Xscavenger 8.8 -Exec=xscavenger 8.9 -Terminal=false 8.10 -Categories=Application;Game; 8.11 -Comment=Lode Runner rewritten for X11
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/xscavenger/stuff/xscavenger.desktop Sun Jun 24 16:46:03 2018 +0300 9.3 @@ -0,0 +1,6 @@ 9.4 +[Desktop Entry] 9.5 +Type=Application 9.6 +Name=Xscavenger 9.7 +Comment=Lode Runner rewritten for X11 9.8 +Exec=xscavenger 9.9 +Categories=Game;
10.1 Binary file xscavenger/stuff/xscavenger.png has changed
11.1 --- a/xsshfs/receipt Sun Jun 24 12:34:21 2018 +0300 11.2 +++ b/xsshfs/receipt Sun Jun 24 16:46:03 2018 +0300 11.3 @@ -1,23 +1,33 @@ 11.4 -# SliTaz package receipt. 11.5 +# SliTaz package receipt v2. 11.6 11.7 PACKAGE="xsshfs" 11.8 VERSION="0.5" 11.9 CATEGORY="network" 11.10 -SHORT_DESC="GUI for sshfs." 11.11 +SHORT_DESC="GUI for sshfs" 11.12 MAINTAINER="pascal.bellard@slitaz.org" 11.13 LICENSE="GPL2" 11.14 -TARBALL="${PACKAGE}_$VERSION-all_src.tar.gz" 11.15 -WEB_SITE="http://forge.zici.fr/p/xsshfs/" 11.16 -WGET_URL="${WEB_SITE}downloads/get/$TARBALL" 11.17 +WEB_SITE="https://framagit.org/kepon/xsshfs" 11.18 11.19 -DEPENDS="sshfs perl-config-tiny perl-locale-gettext glade-perl perl-image-librsvg" 11.20 -SUGGESTED="pcmanfm" 11.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 11.22 +WGET_URL="https://framagit.org/kepon/xsshfs/-/archive/master/xsshfs-master.tar.bz2" 11.23 11.24 -# Rules to gen a SliTaz package suitable for Tazpkg. 11.25 -genpkg_rules() 11.26 -{ 11.27 - cp -a $src/usr $fs/ 11.28 - sed -i 's|/bin/bash|/bin/sh|' $fs/usr/bin/xsshfs 11.29 - sed -i 's|"/bin/fusermount|"/usr/bin/fusermount|' $fs/usr/share/xsshfs/xsshfs.pm 11.30 - sed -i 's|xdg-open|pcmanfm|' $fs/usr/share/xsshfs/xsshfs.pm 11.31 +compile_rules() { 11.32 + install -Dm755 $stuff/xsshfs $install/usr/bin/xsshfs 11.33 + install -Dm644 $stuff/xsshfs.desktop $install/usr/share/applications/xsshfs.desktop 11.34 + install -Dm644 xsshfs.svg $install/usr/share/icons/hicolor/scalable/apps/xsshfs.svg 11.35 + install -Dm644 locale/es/LC_MESSAGES/xsshfs.mo $install/usr/share/locale/es/LC_MESSAGES/xsshfs.mo 11.36 + install -Dm644 locale/fr/LC_MESSAGES/xsshfs.mo $install/usr/share/locale/fr/LC_MESSAGES/xsshfs.mo 11.37 + install -Dm644 xsshfs.glade $install/usr/share/xsshfs/xsshfs.glade 11.38 + install -Dm644 xsshfs.pl $install/usr/share/xsshfs/xsshfs.pl 11.39 + install -Dm644 xsshfs.pm $install/usr/share/xsshfs/xsshfs.pm 11.40 + 11.41 + sed -i 's|"/bin/fusermount|"/usr/bin/fusermount|; s|xdg-open|pcmanfm|' \ 11.42 + $install/usr/share/xsshfs/xsshfs.pm 11.43 } 11.44 + 11.45 +genpkg_rules() { 11.46 + copy @std 11.47 + DEPENDS="sshfs fuse2 perl-config-tiny perl-locale-gettext glade-perl \ 11.48 + perl-image-librsvg" 11.49 + SUGGESTED="pcmanfm" 11.50 +}
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/xsshfs/stuff/xsshfs Sun Jun 24 16:46:03 2018 +0300 12.3 @@ -0,0 +1,4 @@ 12.4 +#!/bin/sh 12.5 + 12.6 +cd /usr/share/xsshfs 12.7 +exec ./xsshfs.pl $@
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/xsshfs/stuff/xsshfs.desktop Sun Jun 24 16:46:03 2018 +0300 13.3 @@ -0,0 +1,6 @@ 13.4 +[Desktop Entry] 13.5 +Type=Application 13.6 +Name=Xsshfs 13.7 +Exec=xsshfs 13.8 +Icon=xsshfs 13.9 +Categories=Network;
14.1 --- a/zbar/receipt Sun Jun 24 12:34:21 2018 +0300 14.2 +++ b/zbar/receipt Sun Jun 24 16:46:03 2018 +0300 14.3 @@ -3,47 +3,41 @@ 14.4 PACKAGE="zbar" 14.5 VERSION="0.10" 14.6 CATEGORY="utilities" 14.7 -SHORT_DESC="Decode barcode & QR code." 14.8 +SHORT_DESC="Decode barcode & QR code" 14.9 MAINTAINER="pascal.bellard@slitaz.org" 14.10 LICENSE="LGPL2.1" 14.11 +WEB_SITE="http://zbar.sourceforge.net/" 14.12 + 14.13 TARBALL="$PACKAGE-$VERSION.tar.bz2" 14.14 -WEB_SITE="http://zbar.sourceforge.net/" 14.15 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 14.16 14.17 -BUILD_DEPENDS="linux-api-headers jpeg-dev imagemagick-dev pango-dev cairo-dev \ 14.18 -freetype-dev fontconfig-dev atk-dev gtk+-dev glib-dev util-linux-uuid-dev \ 14.19 -lcms-dev fftw-dev openexr-dev ilmbase-dev graphviz-dev gdk-pixbuf libxml2-dev \ 14.20 -libtool" 14.21 +BUILD_DEPENDS="xmlto xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev \ 14.22 +libjpeg-turbo-dev imagemagick6-dev gtk+-dev" 14.23 SPLIT="zbar-dev" 14.24 14.25 -# Rules to configure and make the package. 14.26 -compile_rules() 14.27 -{ 14.28 - ./configure --prefix=/usr --mandir=/usr/share/man \ 14.29 - --localstatedir=/var \ 14.30 +compile_rules() { 14.31 + sed -i 's|MagickWand |MagickWand-6 |g' configure # search for MagickWand-6.pc instead 14.32 + 14.33 + ./configure \ 14.34 --without-qt \ 14.35 --without-python \ 14.36 --disable-video \ 14.37 - $CONFIGURE_ARGS && 14.38 + $CONFIGURE_ARGS && 14.39 + fix libtool && 14.40 make && 14.41 - make DESTDIR=$DESTDIR install 14.42 + make install 14.43 } 14.44 14.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 14.46 -genpkg_rules() 14.47 -{ 14.48 +genpkg_rules() { 14.49 case $PACKAGE in 14.50 - zbar) 14.51 - DEPENDS="jpeg imagemagick pango cairo freetype fontconfig atk gtk+ glib" 14.52 - mkdir -p $fs/usr/lib 14.53 - cp -a $install/usr/bin $fs/usr 14.54 - cp -a $install/usr/lib/*.so* $fs/usr/lib 14.55 - ;; 14.56 - zbar-dev) 14.57 - mkdir -p $fs/usr/lib 14.58 - cp -a $install/usr/include $fs/usr 14.59 - cp -a $install/usr/lib/*a $fs/usr/lib 14.60 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 14.61 - ;; 14.62 + zbar) 14.63 + copy @std 14.64 + DEPENDS="gdk-pixbuf glib gtk+ imagemagick6 libjpeg-turbo \ 14.65 + xorg-libX11 xorg-libXv" 14.66 + ;; 14.67 + *-dev) 14.68 + copy @dev 14.69 + DEPENDS="zbar glib-dev gtk+-dev" 14.70 + ;; 14.71 esac 14.72 }
15.1 --- a/zsnes/receipt Sun Jun 24 12:34:21 2018 +0300 15.2 +++ b/zsnes/receipt Sun Jun 24 16:46:03 2018 +0300 15.3 @@ -7,6 +7,7 @@ 15.4 MAINTAINER="slaxemulator@gmail.com" 15.5 LICENSE="GPL2" 15.6 WEB_SITE="http://www.zsnes.com/" 15.7 +HOST_ARCH="i486" 15.8 15.9 TARBALL="$PACKAGE${VERSION//./}src.tar.bz2" 15.10 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"