# HG changeset patch # User Aleksej Bobylev # Date 1536625320 -10800 # Node ID 315a1dc02606a400c72acc5e5738639afc0b9acb # Parent 48b896290f1279bf245bcfd37f1e209e35adf3cc Micro-updates diff -r 48b896290f12 -r 315a1dc02606 conky-theme-onsea/receipt --- a/conky-theme-onsea/receipt Mon Sep 10 11:49:32 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="conky-theme-onsea" -VERSION="0.1" -CATEGORY="x-window" -SHORT_DESC="A smooth theme for conky with smoke color." -MAINTAINER="hackdorte@sapo.pt" -LICENSE="PublicDomain" -SOURCE="onsea" -WEB_SITE="http://people.slitaz.org/~leonardolaporte" -STUFF_DIR="lab.slitaz/5.0/pkg/conky/1.9.0" -TARBALL="$SOURCE-$VERSION.tar.gz" -WGET_URL="${WEB_SITE}/$STUFF_DIR/$TARBALL" -TAGS="conky desktop monitoring theme" -HOST_ARCH="i486 x86_64" - -DEPENDS="conky" -BUILD_DEPENDS="wget" - -BAK_DIR=".conky-backup" -BAK_FILE="old_conkyrc" - -# Rules to configure and make the package. -compile_rules() -{ - mkdir -p $install/usr/share/conky/themes/$SOURCE - cp -a $src/.conkyrc $install/usr/share/conky/themes/$SOURCE/.conkyrc -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/* $fs -} - -pre_install() -{ -# Build current ".conkyrc" backup. -if [ -e $1/home/$USER/.conkyrc ]; then - mkdir -p $1/home/$USER/$BAK_DIR/$BAK_FILE - mv $1/home/$USER/.conkyrc $1/home/$USER/$BAK_DIR/$BAK_FILE - -# README (Alert file only). -cat > $1/home/$USER/$BAK_DIR/README <>/dev/null 2>&1; then - su - $USER -c "killall conky" && su - $USER -c "conky &"; - else - su - $USER -c "conky &"; - fi -} - -pre_remove() -{ -# Restore old ".conkyrc" backup. - if [ -e $1/home/$USER/$BAK_DIR/$BAK_FILE/.conkyrc ]; then - mv $1/home/$USER/$BAK_DIR/$BAK_FILE/.conkyrc $1/home/$USER - chmod 777 $1/home/$USER/.conkyrc - rm -rf $1/home/$USER/$BAK_DIR/$BAK_FILE - rm -rf $1/home/$USER/$BAK_DIR/README - else - rm -irf $1/home/$USER/.conkyrc - fi -} - -post_remove() -{ -# Check the conky process and run old theme. -[ "$1" ] || - if busybox pidof conky >>/dev/null 2>&1; then - su - $USER -c "killall conky" && su - $USER -c "conky &"; - else - su - $USER -c "conky &"; - fi -} diff -r 48b896290f12 -r 315a1dc02606 guile/.icon.png Binary file guile/.icon.png has changed diff -r 48b896290f12 -r 315a1dc02606 guile/receipt --- a/guile/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/guile/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,9 +1,9 @@ # SliTaz package receipt v2. PACKAGE="guile" -VERSION="2.2.3" +VERSION="2.2.4" CATEGORY="development" -SHORT_DESC="Project GNU's extension language" +SHORT_DESC="GNU Ubiquitous Intelligent Language for Extension" MAINTAINER="pankso@slitaz.org" LICENSE="LGPL3" WEB_SITE="https://www.gnu.org/software/guile/" diff -r 48b896290f12 -r 315a1dc02606 gupnp/receipt --- a/gupnp/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/gupnp/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="gupnp" -VERSION="1.0.2" +VERSION="1.0.3" CATEGORY="network" SHORT_DESC="Framework for creating UPnP devices and control points" MAINTAINER="pascal.bellard@slitaz.org" diff -r 48b896290f12 -r 315a1dc02606 hackdorte-artwork/receipt --- a/hackdorte-artwork/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/hackdorte-artwork/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -217,3 +217,20 @@ pre_remove_slim_theme_montanhoso() { chroot "$1/" slim-theme -f Montanhoso } + + +post_install_conky_theme_onsea() { + for i in $1/home/*; do + [ -e $i/.conkyrc ] || return + mv $i/.conkyrc $i/.conkyrc.bak + ln -s /usr/share/conky/themes/onsea/.conkyrc $i/.conkyrc + done +} + +post_remove_conky_theme_onsea() { + for i in $1/home/*; do + [ -e $i/.conkyrc.bak ] || return + rm $i/.conkyrc + mv $i/.conkyrc.bak $i/.conkyrc + done +} diff -r 48b896290f12 -r 315a1dc02606 hunspell/receipt --- a/hunspell/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/hunspell/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,24 +1,29 @@ # SliTaz package receipt v2. PACKAGE="hunspell" -VERSION="1.6.1" +VERSION="1.6.2" CATEGORY="system-tools" SHORT_DESC="A spell checker" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2 LGPL2.1 MPL" -WEB_SITE="http://hunspell.github.io/" +WEB_SITE="https://hunspell.github.io/" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/hunspell/hunspell/archive/v$VERSION.tar.gz" -BUILD_DEPENDS="automake libtool gettext" +BUILD_DEPENDS="automake libtool gettext readline-dev" SPLIT="hunspell-dev" compile_rules() { autoreconf -vfi && rm $src/po/stamp-po && - ./configure $CONFIGURE_ARGS && + ./configure \ + --with-ui \ + --with-readline \ + --disable-static \ + --without-included-gettext \ + $CONFIGURE_ARGS && fix libtool && make && make -j1 DESTDIR=$DESTDIR install @@ -26,7 +31,12 @@ genpkg_rules() { case $PACKAGE in - hunspell) copy @std;; - *-dev) copy @dev;; + hunspell) + copy @std + DEPENDS="ncurses readline" + ;; + *-dev) + copy @dev + ;; esac } diff -r 48b896290f12 -r 315a1dc02606 iniparser/receipt --- a/iniparser/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/iniparser/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -18,18 +18,16 @@ mkdir -p $install/usr/lib $install/usr/include cp -a *.so* $install/usr/lib - cp *.*a $install/usr/lib + ln -s libiniparser.so.1 $install/usr/lib/libiniparser.so +# cp *.*a $install/usr/lib cp src/*.h $install/usr/include + cook_pick_docs html/ AUTHORS README.md LICENSE FAQ* } genpkg_rules() { case $PACKAGE in - iniparser) - copy @std - ;; - *-dev) - copy @dev - ;; + iniparser) copy @std;; + *-dev) copy @dev;; esac } diff -r 48b896290f12 -r 315a1dc02606 iptstate/receipt --- a/iptstate/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/iptstate/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="iptstate" -VERSION="2.2.5" +VERSION="2.2.6" CATEGORY="network" SHORT_DESC="IPTState is a top-like interface to your netfilter \ connection-tracking table" @@ -10,16 +10,18 @@ WEB_SITE="https://www.phildev.net/iptstate/" TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" +WGET_URL="https://github.com/jaymzh/iptstate/releases/download/v$VERSION/$TARBALL" BUILD_DEPENDS="ncurses-dev libnetfilter_conntrack-dev libnfnetlink-dev" compile_rules() { make && - install -Dm755 $src/iptstate $install/usr/sbin/iptstate + make PREFIX=$install/usr install || return 1 + + cook_pick_docs README.md WISHLIST BUGS Changelog } genpkg_rules() { copy @std - DEPENDS="ncurses libnetfilter_conntrack libnfnetlink iptables" + DEPENDS="libnetfilter_conntrack ncurses libnfnetlink iptables" } diff -r 48b896290f12 -r 315a1dc02606 isomaster/.icon.png Binary file isomaster/.icon.png has changed diff -r 48b896290f12 -r 315a1dc02606 isomaster/receipt --- a/isomaster/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/isomaster/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,34 +1,43 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="isomaster" -VERSION="1.3.13" +VERSION="1.3.14" CATEGORY="utilities" -SHORT_DESC="Graphical CD image (ISO) editor." +SHORT_DESC="Graphical CD image (ISO) editor" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://littlesvr.ca/isomaster/" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://littlesvr.ca/isomaster/" WGET_URL="http://littlesvr.ca/isomaster/releases/$TARBALL" -TAGS="iso editor" -DEPENDS="gtk+ libxml2 xorg-libXdamage" -BUILD_DEPENDS="xorg-dev gtk+-dev libxml2-dev intltool" +BUILD_DEPENDS="gettext gtk+-dev iniparser-dev" -# Rules to configure and make the package. -compile_rules() -{ - make PREFIX=/usr && - mkdir -p $install/usr/share/doc/bkisofs - make PREFIX=/usr DESTDIR=$DESTDIR install +compile_rules() { + rm -r iniparser-4.1/ + + make \ + PREFIX=/usr \ + USE_SYSTEM_INIPARSER=1 \ + && + make \ + PREFIX=/usr \ + USE_SYSTEM_INIPARSER=1 \ + install || return 1 + + mkdir -p $install/usr/share/icons/hicolor/64x64/apps/ + ln -s /usr/share/isomaster/icons/isomaster.png \ + $install/usr/share/icons/hicolor/64x64/apps/isomaster.png + fix symlinks + + mkdir -p $install/etc/ + cp -r $stuff/skel/ $install/etc/ + + cook_pick_docs README.TXT CHANGELOG.TXT } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share $fs/etc - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/share/isomaster $fs/usr/share - rm $fs/usr/share/isomaster/icons/isomaster.png - cp -a $stuff/skel $fs/etc/skel - chown -R 0.0 $fs +genpkg_rules() { + copy @std hicolor/ + DEPENDS="gdk-pixbuf glib gtk+ iniparser" + TAGS="iso editor" } diff -r 48b896290f12 -r 315a1dc02606 isomaster/stuff/isomaster.png Binary file isomaster/stuff/isomaster.png has changed diff -r 48b896290f12 -r 315a1dc02606 jikes/receipt --- a/jikes/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/jikes/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -11,30 +11,22 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -BUILD_DEPENDS="slitaz-toolchain" SPLIT="jikes-dev" compile_rules() { - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && - make && - make DESTDIR=$DESTDIR install + ./configure $CONFIGURE_ARGS && + make && + make install } genpkg_rules() { case $PACKAGE in jikes) - mkdir -p $fs/usr - cp -a $install/usr/bin $fs/usr - DEPENDS="gcc-lib-base" + copy @std TAGS="java" ;; *-dev) - mkdir -p $fs/usr - cp -a $install/usr/include $fs/usr + copy @dev ;; esac } diff -r 48b896290f12 -r 315a1dc02606 jp2a/receipt --- a/jp2a/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/jp2a/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,20 +1,27 @@ # SliTaz package receipt v2. PACKAGE="jp2a" -VERSION="1.0.6" +VERSION="1.0.7" CATEGORY="graphics" SHORT_DESC="Converts JPG images to ASCII" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -WEB_SITE="https://csl.name/jp2a/" +WEB_SITE="https://github.com/cslarsen/jp2a" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/cslarsen/jp2a/archive/v$VERSION.tar.gz" -BUILD_DEPENDS="libjpeg-turbo-dev curl-dev" +BUILD_DEPENDS="automake libjpeg-turbo-dev curl-dev" compile_rules() { - ./configure $CONFIGURE_ARGS && make && make install + autoreconf -vi + + ./configure $CONFIGURE_ARGS && + make && + make install || return 1 + + mv README README.md + cook_pick_docs README.md BUGS ChangeLog } genpkg_rules() { diff -r 48b896290f12 -r 315a1dc02606 keyutils/receipt --- a/keyutils/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/keyutils/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,18 +1,18 @@ # SliTaz package receipt v2. PACKAGE="keyutils" -VERSION="1.5.10" +VERSION="1.5.11" CATEGORY="system-tools" SHORT_DESC="Linux key management utilities" MAINTAINER="al.bobylev@gmail.com" LICENSE="GPL2 LGPL2.1" WEB_SITE="http://people.redhat.com/~dhowells/keyutils/" -LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/keyutils.html" +LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/keyutils.html" TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://people.redhat.com/~dhowells/keyutils/$TARBALL" -BUILD_DEPENDS="file" +BUILD_DEPENDS="file krb5-dev" SPLIT="keyutils-dev" COOKOPTS="skip-log-errors" @@ -20,13 +20,14 @@ make && make NO_ARLIB=1 DESTDIR=$install install || return 1 - ln -sf libkeyutils.so.1.6 $install/lib/libkeyutils.so + fix symlinks } genpkg_rules() { case $PACKAGE in keyutils) copy @std + DEPENDS="libcomerr3 libkrb5" CONFIG_FILES="/etc/request-key.conf /etc/request-key.d/" ;; *-dev) diff -r 48b896290f12 -r 315a1dc02606 l3afpad/.icon.png Binary file l3afpad/.icon.png has changed diff -r 48b896290f12 -r 315a1dc02606 l3afpad/receipt --- a/l3afpad/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/l3afpad/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,35 +1,28 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="l3afpad" -VERSION="0.8.18.1.10" +VERSION="0.8.18.1.11" CATEGORY="utilities" SHORT_DESC="Simple text editor forked from Leafpad, supports GTK+ 3.x" MAINTAINER="al.bobylev@gmail.com" LICENSE="LGPL2.1" -WEB_SITE="http://www.calno.com/l3afpad/" -TARBALL="$PACKAGE-$VERSION.tar.xz" -WGET_URL="http://www.calno.com/$PACKAGE/$TARBALL" -TAGS="text-editor" +WEB_SITE="https://github.com/stevenhoneyman/l3afpad" -DEPENDS="gtk+3" -BUILD_DEPENDS="gtk+3-dev intltool" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://github.com/stevenhoneyman/l3afpad/archive/v$VERSION.tar.gz" -# Rules to configure and make the package. -compile_rules() -{ - chmod +x $src/install-sh - ./configure \ - --enable-gtkgrid \ - --enable-search-history \ - $CONFIGURE_ARGS && +BUILD_DEPENDS="automake gtk+3-dev intltool" + +compile_rules() { + ./autogen.sh && + ./configure $CONFIGURE_ARGS && make && make install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share/pixmaps - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/share/pixmaps/*.png $fs/usr/share/pixmaps +genpkg_rules() { + copy @std @ico + rm -r $fs/usr/share/pixmaps/ + DEPENDS="cairo glib gtk+3 pango" + TAGS="text-editor" } diff -r 48b896290f12 -r 315a1dc02606 l3afpad/stuff/l3afpad.desktop --- a/l3afpad/stuff/l3afpad.desktop Mon Sep 10 11:49:32 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -[Desktop Entry] -Type=Application -Name=L3afpad -Comment=Simple text editor -Comment[bg]=Опростен текстов редактор -Comment[br]=Embanner testennou eeun -Comment[ca]=Editor de text simple -Comment[cs]=Jednoduchý textový editor -Comment[da]=Enkel tekstbehandler -Comment[de]=Einfacher Texteditor -Comment[el]=Απλός επεξεργαστής κειμένου -Comment[eo]=Simpla tekstredaktilo -Comment[es]=Editor de texto simple -Comment[et]=Lihtne tekstiredaktor -Comment[eu]=Testu editore sinplea -Comment[fi]=Yksinkertainen tekstieditori -Comment[fr]=Un éditeur de texte tout simple -Comment[ga]=Eagarthóir simplí -Comment[gl]=Editor de texto sinxelo -Comment[he]=עורך טקסט פשוט -Comment[hu]=Egyszerű szöveg szerkesztő -Comment[id]=Penyunting teks sederhana -Comment[it]=Semplice editor di testi -Comment[ja]=シンプルなテキストエディタ -Comment[ko]=간단한 텍스트 편집기 -Comment[lt]=Paprastas teksto redaktorius -Comment[lv]=Vienkāršā teksta redaktors -Comment[nl]=Eenvoudige teksteditor -Comment[nn]=Enkel tekstredigering -Comment[pl]=Prosty edytor tekstu -Comment[pt]=Editor de texto simples -Comment[pt_BR]=Editor de texto simples -Comment[ru]=Простой текстовый редактор -Comment[sk]=Jednoduchý textový editor -Comment[sl]=Preprost urejevalnik besedila -Comment[sr]=Једноставан уређивач текста -Comment[sv]=Enkel textredigerare -Comment[ta]=எளிமையான உரை பதிப்பான் -Comment[tr]=Basit metin düzenleyicisi -Comment[uk]=Простий текстовий редактор -Comment[vi]=Một trình soạn thảo văn bản đơn giản -Comment[zh_CN]=简易文字编辑器 -Comment[zh_TW]=簡易文字編輯器 -Exec=l3afpad %f -Icon=l3afpad -Terminal=false -Categories=GTK;Utility;TextEditor; -MimeType=text/plain; diff -r 48b896290f12 -r 315a1dc02606 lftp/.icon.png Binary file lftp/.icon.png has changed diff -r 48b896290f12 -r 315a1dc02606 lftp/receipt --- a/lftp/receipt Mon Sep 10 11:49:32 2018 +0300 +++ b/lftp/receipt Tue Sep 11 03:22:00 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="lftp" -VERSION="4.8.3" +VERSION="4.8.4" CATEGORY="network" SHORT_DESC="Small but powerful FTP client" MAINTAINER="mimas@slitaz.org" @@ -11,12 +11,12 @@ TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="${WEB_SITE}ftp/$TARBALL" -BUILD_DEPENDS="gmp-dev ncurses-dev readline-dev expat-dev gperf gnutls-dev" - -CROSS="bug: failed at test" +BUILD_DEPENDS="gmp-dev ncurses-dev readline-dev expat-dev gperf gnutls-dev \ +gettext" compile_rules() { ./configure \ + --disable-static \ --with-gnutls \ --without-openssl \ $CONFIGURE_ARGS && @@ -27,5 +27,5 @@ genpkg_rules() { copy @std - DEPENDS="gmp readline expat gnutls gcc-lib-base" + DEPENDS="expat libgnutls libidn2 ncurses readline zlib" }