wok-next rev 20339
Try the "compiling sets": update cookutils, fuse-emulator, urxvt, yad; and up fwknop; rm libltdl - already in libtool.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Fri Nov 17 12:56:24 2017 +0200 (2017-11-17) |
| parents | 9020a7ec9899 |
| children | fdfd62313081 |
| files | cookutils/receipt fuse-emulator-gtk3/receipt fuse-emulator/receipt fwknop-dev/receipt fwknop/receipt libltdl/receipt urxvt/receipt urxvt/stuff/urxvt-full.desktop urxvt/stuff/urxvt.desktop yad/receipt yad/stuff/patches/icons-size.patch yad/stuff/patches/series |
line diff
1.1 --- a/cookutils/receipt Fri Nov 17 11:49:24 2017 +0100 1.2 +++ b/cookutils/receipt Fri Nov 17 12:56:24 2017 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="cookutils" 1.7 -VERSION="1002" 1.8 +VERSION="1008" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="SliTaz packages builder new generation" 1.11 MAINTAINER="pankso@slitaz.org"
2.1 --- a/fuse-emulator-gtk3/receipt Fri Nov 17 11:49:24 2017 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,33 +0,0 @@ 2.4 -# SliTaz package receipt v2. 2.5 - 2.6 -PACKAGE="fuse-emulator-gtk3" 2.7 -VERSION="1.4.0" 2.8 -CATEGORY="games" 2.9 -SHORT_DESC="ZX Spectrum emulator (with GTK3 interface)" 2.10 -MAINTAINER="al.bobylev@gmail.com" 2.11 -LICENSE="GPL2" 2.12 -WEB_SITE="http://fuse-emulator.sourceforge.net/fuse.php" 2.13 - 2.14 -TARBALL="fuse-$VERSION.tar.gz" 2.15 -WGET_URL="$SF_MIRROR/fuse-emulator/$TARBALL" 2.16 - 2.17 -BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk+3-dev \ 2.18 -alsa-lib-dev libsdl-dev" 2.19 - 2.20 -compile_rules() { 2.21 - ./configure \ 2.22 - --enable-desktop-integration \ 2.23 - $CONFIGURE_ARGS && 2.24 - make && make install 2.25 -} 2.26 - 2.27 -genpkg_rules() { 2.28 - copy @std 2.29 - rm -r $fs/usr/share/icons; cook_copy_icons # only 16 and 48 2.30 - DEPENDS="alsa-lib atk audiofile bzlib cairo fontconfig freetype gdk-pixbuf \ 2.31 - glib gtk+3 libffi libgcrypt libgpg-error libharfbuzz liblzma libpng16 \ 2.32 - libsdl libspectrum libxml2 pango pcre tslib util-linux-blkid \ 2.33 - util-linux-mount util-linux-uuid xorg-libX11 xorg-libXau xorg-libXdmcp \ 2.34 - xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman zlib" 2.35 - TAGS="emulator spectrum" 2.36 -}
3.1 --- a/fuse-emulator/receipt Fri Nov 17 11:49:24 2017 +0100 3.2 +++ b/fuse-emulator/receipt Fri Nov 17 12:56:24 2017 +0200 3.3 @@ -12,22 +12,40 @@ 3.4 WGET_URL="$SF_MIRROR/fuse-emulator/$TARBALL" 3.5 3.6 BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk+-dev \ 3.7 -alsa-lib-dev libsdl-dev" 3.8 +gtk+3-dev alsa-lib-dev libsdl-dev" 3.9 +SPLIT="fuse-emulator-gtk3:gtk3" 3.10 3.11 compile_rules() { 3.12 + SET_ARGS=''; [ -z "$SET" ] && SET_ARGS='--disable-gtk3' 3.13 + 3.14 ./configure \ 3.15 --enable-desktop-integration \ 3.16 + $SET_ARGS \ 3.17 $CONFIGURE_ARGS && 3.18 make && make install 3.19 } 3.20 3.21 genpkg_rules() { 3.22 - copy @std 3.23 - rm -r $fs/usr/share/icons; cook_copy_icons # only 16 and 48 3.24 - DEPENDS="alsa-lib atk audiofile bzlib cairo fontconfig freetype gdk-pixbuf \ 3.25 - glib gtk+ libffi libgcrypt libgpg-error libharfbuzz liblzma libpng16 \ 3.26 - libsdl libspectrum libxml2 pango pcre tslib util-linux-blkid \ 3.27 - util-linux-mount util-linux-uuid xorg-libX11 xorg-libXau xorg-libXdmcp \ 3.28 - xorg-libXext xorg-libXrender xorg-libxcb xorg-pixman zlib" 3.29 + case $PACKAGE in 3.30 + fuse-emulator) 3.31 + copy @std @ico # only 16 and 48 3.32 + DEPENDS="alsa-lib atk audiofile bzlib cairo fontconfig freetype \ 3.33 + gdk-pixbuf glib gtk+ libffi libgcrypt libgpg-error libharfbuzz \ 3.34 + liblzma libpng16 libsdl libspectrum libxml2 pango pcre tslib \ 3.35 + util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \ 3.36 + xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \ 3.37 + xorg-pixman zlib" 3.38 + ;; 3.39 + fuse-emulator-gtk3) 3.40 + copy @std @ico # only 16 and 48 3.41 + CAT="games|with GTK+3 interface" 3.42 + DEPENDS="alsa-lib atk audiofile bzlib cairo fontconfig freetype \ 3.43 + gdk-pixbuf glib gtk+3 libffi libgcrypt libgpg-error libharfbuzz \ 3.44 + liblzma libpng16 libsdl libspectrum libxml2 pango pcre tslib \ 3.45 + util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \ 3.46 + xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libxcb \ 3.47 + xorg-pixman zlib" 3.48 + ;; 3.49 + esac 3.50 TAGS="emulator spectrum" 3.51 }
4.1 --- a/fwknop-dev/receipt Fri Nov 17 11:49:24 2017 +0100 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,20 +0,0 @@ 4.4 -# SliTaz package receipt. 4.5 - 4.6 -PACKAGE="fwknop-dev" 4.7 -VERSION="2.6.9" 4.8 -CATEGORY="development" 4.9 -SHORT_DESC="Single Packet Authorization, development files" 4.10 -MAINTAINER="pascal.bellard@slitaz.org" 4.11 -LICENSE="GPL2" 4.12 -WEB_SITE="http://www.cipherdyne.org/fwknop/" 4.13 -WANTED="fwknop" 4.14 - 4.15 -DEPENDS="fwknop" 4.16 - 4.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 4.18 -genpkg_rules() 4.19 -{ 4.20 - mkdir -p $fs/usr/lib 4.21 - cp -a $install/usr/include $fs/usr 4.22 - cp -a $install/usr/lib/*a $fs/usr/lib 4.23 -}
5.1 --- a/fwknop/receipt Fri Nov 17 11:49:24 2017 +0100 5.2 +++ b/fwknop/receipt Fri Nov 17 12:56:24 2017 +0200 5.3 @@ -1,40 +1,41 @@ 5.4 -# SliTaz package receipt. 5.5 +# SliTaz package receipt v2. 5.6 5.7 PACKAGE="fwknop" 5.8 VERSION="2.6.9" 5.9 CATEGORY="network" 5.10 -SHORT_DESC="Single Packet Authorization" 5.11 +SHORT_DESC="FireWall KNock OPerator: Single Packet Authorization and Port Knocking" 5.12 MAINTAINER="pascal.bellard@slitaz.org" 5.13 LICENSE="GPL2" 5.14 +WEB_SITE="https://www.cipherdyne.org/fwknop/" 5.15 + 5.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.17 -WEB_SITE="http://www.cipherdyne.org/fwknop/" 5.18 -WGET_URL="${WEB_SITE}download/$TARBALL" 5.19 -CONFIG_FILES="/etc/fwknop" 5.20 +WGET_URL="https://cipherdyne.org/fwknop/download/$TARBALL" 5.21 5.22 -DEPENDS="iptables gpgme gnupg libgpg-error" 5.23 -BUILD_DEPENDS="libpcap-dev gpgme-dev gnupg iptables" 5.24 +BUILD_DEPENDS="automake libtool gpgme-dev libpcap-dev iptables gnupg texinfo" 5.25 +SPLIT="fwknop-dev" 5.26 5.27 -# Rules to configure and make the package. 5.28 -compile_rules() 5.29 -{ 5.30 - ./configure --prefix=/usr --infodir=/usr/share/info \ 5.31 +compile_rules() { 5.32 + autoreconf -fiv && 5.33 + ./configure \ 5.34 --sysconfdir=/etc \ 5.35 - --mandir=/usr/share/man \ 5.36 + --localstatedir=/var \ 5.37 $CONFIGURE_ARGS && 5.38 make && 5.39 - make DESTDIR=$DESTDIR install 5.40 + make install || return 1 5.41 + 5.42 + cook_pick_docs README CREDITS AUTHORS ChangeLog 5.43 } 5.44 5.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 5.46 -genpkg_rules() 5.47 -{ 5.48 - mkdir -p $fs/usr/lib $install/usr/share/doc 5.49 - cp $src/README $install/usr/share/doc 5.50 - cp $src/CREDITS $install/usr/share/doc 5.51 - cp $src/AUTHORS $install/usr/share/doc 5.52 - cp $src/ChangeLog $install/usr/share/doc 5.53 - cp -a $install/etc $fs 5.54 - cp -a $install/usr/bin $fs/usr 5.55 - cp -a $install/usr/sbin $fs/usr 5.56 - cp -a $install/usr/lib/*.so* $fs/usr/lib 5.57 +genpkg_rules() { 5.58 + case $PACKAGE in 5.59 + fwknop) 5.60 + copy @std 5.61 + DEPENDS="gpgme libassuan libgpg-error libpcap gnupg iptables" 5.62 + CONFIG_FILES="/etc/fwknop" 5.63 + ;; 5.64 + *-dev) 5.65 + copy @dev 5.66 + DEPENDS="fwknop gpgme-dev libassuan-dev libgpg-error-dev" 5.67 + ;; 5.68 + esac 5.69 }
6.1 --- a/libltdl/receipt Fri Nov 17 11:49:24 2017 +0100 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,18 +0,0 @@ 6.4 -# SliTaz package receipt. 6.5 - 6.6 -PACKAGE="libltdl" 6.7 -VERSION="2.4.6" 6.8 -CATEGORY="system-tools" 6.9 -SHORT_DESC="The GNU Portable Library Tool." 6.10 -MAINTAINER="pankso@slitaz.org" 6.11 -LICENSE="GPL2" 6.12 -WEB_SITE="https://www.gnu.org/software/libtool/" 6.13 -HOST_ARCH="i486 arm" 6.14 - 6.15 -WANTED="libtool" 6.16 - 6.17 -# Rules to gen a SliTaz package suitable for Tazpkg. 6.18 -genpkg_rules() 6.19 -{ 6.20 - copy *.so* 6.21 -}
7.1 --- a/urxvt/receipt Fri Nov 17 11:49:24 2017 +0100 7.2 +++ b/urxvt/receipt Fri Nov 17 12:56:24 2017 +0200 7.3 @@ -13,31 +13,29 @@ 7.4 7.5 BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev gdk-pixbuf-dev \ 7.6 startup-notification-dev xorg-libXmu-dev xorg-libXft-dev perl-dev ncurses-extra" 7.7 -SPLIT="urxvt-full" 7.8 +SPLIT="urxvt-full:full" 7.9 7.10 compile_rules() { 7.11 - rm -r $install-full 2>/dev/null 7.12 - cp -a $src $src-full 7.13 + case $SET in 7.14 + '') 7.15 + ./configure \ 7.16 + --disable-everything \ 7.17 + $CONFIGURE_ARGS && 7.18 + make && make install 7.19 + ;; 7.20 + full) 7.21 + ./configure \ 7.22 + --enable-everything \ 7.23 + --enable-256-color \ 7.24 + --with-terminfo=/usr/share/terminfo \ 7.25 + $CONFIGURE_ARGS && 7.26 + make && make install || return 1 7.27 7.28 - ./configure \ 7.29 - --disable-everything \ 7.30 - $CONFIGURE_ARGS && 7.31 - make && make install || return 1 7.32 - 7.33 - cd $src-full 7.34 - ./configure \ 7.35 - --enable-everything \ 7.36 - --enable-256-color \ 7.37 - --with-terminfo=/usr/share/terminfo \ 7.38 - $CONFIGURE_ARGS && 7.39 - make && make DESTDIR=$install-full install || return 1 7.40 - 7.41 - install -Dm0644 $stuff/urxvt-full.desktop \ 7.42 - $install-full/usr/share/applications/urxvt-full.desktop 7.43 - 7.44 - R="$install-full/usr/share/terminfo" 7.45 - mkdir -p $R 7.46 - tic -s -o $R $src-full/doc/etc/rxvt-unicode.terminfo 7.47 + R="$install/usr/share/terminfo" 7.48 + mkdir -p $R 7.49 + tic -s -o $R $src/doc/etc/rxvt-unicode.terminfo 7.50 + ;; 7.51 + esac 7.52 } 7.53 7.54 genpkg_rules() { 7.55 @@ -47,7 +45,7 @@ 7.56 DEPENDS="xorg-libX11" 7.57 ;; 7.58 urxvt-full) 7.59 - install=$install-full copy @std 7.60 + copy @std 7.61 CAT="utilities|everything enabled" 7.62 DEPENDS="fontconfig freetype gdk-pixbuf glib perl perl-core \ 7.63 startup-notification xorg-libX11 xorg-libXft xorg-libXmu \
8.1 --- a/urxvt/stuff/urxvt-full.desktop Fri Nov 17 11:49:24 2017 +0100 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 -Name=Urxvt-full 8.7 -GenericName=Unicode Terminal 8.8 -Comment=Terminal emulator with unicode CJK support 8.9 -Exec=urxvt -bg black -fg white -cr orange -pr green 8.10 -Icon=utilities-terminal 8.11 -Categories=Utility;Terminal;
9.1 --- a/urxvt/stuff/urxvt.desktop Fri Nov 17 11:49:24 2017 +0100 9.2 +++ b/urxvt/stuff/urxvt.desktop Fri Nov 17 12:56:24 2017 +0200 9.3 @@ -1,7 +1,6 @@ 9.4 [Desktop Entry] 9.5 Type=Application 9.6 Name=Urxvt 9.7 -GenericName=Unicode Terminal 9.8 Comment=Terminal emulator with unicode support 9.9 Comment[ru]=Эмулятор терминала с поддержкой юникода 9.10 Exec=urxvt -bg black -fg white -cr orange -pr green
10.1 --- a/yad/receipt Fri Nov 17 11:49:24 2017 +0100 10.2 +++ b/yad/receipt Fri Nov 17 12:56:24 2017 +0200 10.3 @@ -13,29 +13,22 @@ 10.4 WGET_URL="$SF_MIRROR/yad-dialog/$TARBALL" 10.5 10.6 BUILD_DEPENDS="patch gtk+-dev gtk+3-dev webkitgtk-dev intltool" 10.7 -SPLIT="yad-html yad-gtk3" 10.8 +SPLIT="yad-html:html yad-gtk3:gtk3" 10.9 10.10 compile_rules() { 10.11 - sed -i '/^SUBDIRS/ s|.*|SUBDIRS = 16x16 48x48|' data/icons/Makefile.in 10.12 - rm -rf $install-* 10.13 - cp -a $src $src-h 10.14 - cp -a $src $src-3 10.15 + case $SET in 10.16 + '') Gtk=gtk2; Html=disable;; 10.17 + html) Gtk=gtk2; Html=enable ;; 10.18 + gtk3) Gtk=gtk3; Html=disable;; 10.19 + esac 10.20 10.21 -while read Pkg Src Gtk Html Install; do 10.22 - title "Making $Pkg" 10.23 - cd $Src 10.24 ./configure \ 10.25 --enable-icon-browser \ 10.26 --with-gtk=$Gtk \ 10.27 --$Html-html \ 10.28 $CONFIGURE_ARGS && 10.29 make && 10.30 - make DESTDIR=$Install install || return 1 10.31 -done <<EOT 10.32 -yad $src gtk2 disable $install 10.33 -yad-html $src-h gtk2 enable $install-h 10.34 -yad-gtk3 $src-3 gtk3 disable $install-3 10.35 -EOT 10.36 + make install 10.37 } 10.38 10.39 genpkg_rules() { 10.40 @@ -47,7 +40,7 @@ 10.41 TAGS="gtk2" 10.42 ;; 10.43 yad-html) 10.44 - install=$install-h copy @std 10.45 + copy @std 10.46 CAT="utilities|GTK+2, with HTML widget" 10.47 DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ \ 10.48 libsoup pango webkitgtk" 10.49 @@ -55,7 +48,7 @@ 10.50 PROVIDE="yad:webkitgtk" 10.51 ;; 10.52 yad-gtk3) 10.53 - install=$install-3 copy @std 10.54 + copy @std 10.55 CAT="utilities|GTK+3" 10.56 DEPENDS="atk cairo gdk-pixbuf glib gtk+3 pango" 10.57 TAGS="gtk3"
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/yad/stuff/patches/icons-size.patch Fri Nov 17 12:56:24 2017 +0200 11.3 @@ -0,0 +1,11 @@ 11.4 +--- a/data/icons/Makefile.in 11.5 ++++ b/data/icons/Makefile.in 11.6 +@@ -313,7 +313,7 @@ 11.7 + top_build_prefix = @top_build_prefix@ 11.8 + top_builddir = @top_builddir@ 11.9 + top_srcdir = @top_srcdir@ 11.10 +-SUBDIRS = 16x16 24x24 32x32 48x48 96x96 128x128 11.11 ++SUBDIRS = 16x16 48x48 11.12 + gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor 11.13 + all: all-recursive 11.14 +