# HG changeset patch # User Antoine Bodin # Date 1297737552 -3600 # Node ID 9a531a816f54e53fba4bcb09be180f51313ef013 # Parent 988633c23f818969a1ad6d60b11b470659b227fe# Parent 822f56c3e541e9526749b9cc814c23d3a9b2fa81 Automated merge with https://bitbucket.org/gokhlayeh/wok diff -r 988633c23f81 -r 9a531a816f54 gcc/receipt --- a/gcc/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/gcc/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -18,9 +18,9 @@ cd $src # GCC requires the GMP, MPFR and MPC packages. - tazwok get-src mpfr --target=$PWD/mpfr - tazwok get-src gmp --target=$PWD/gmp - tazwok get-src mpc-library --target=$PWD/mpc + tazwok get-src mpfr --target=$PWD/mpfr || { report close-bloc; return 1; } + tazwok get-src gmp --target=$PWD/gmp || { report close-bloc; return 1; } + tazwok get-src mpc-library --target=$PWD/mpc || { report close-bloc; return 1; } report step "Running compilation" @@ -38,7 +38,7 @@ --without-ppl --without-cloog && make && make install - } || return 1 + } || { report close-bloc; return 1; } # See LFS for more detais about this. ln -s libgcc.a `$BUILD_HOST-gcc -print-libgcc-file-name | \ @@ -50,7 +50,7 @@ { report open-bloc cd $src - patch -Np1 -i ../stuff/gcc-$VERSION-startfiles_fix-1.patch + patch -Np1 -i ../stuff/gcc-$VERSION-startfiles_fix-1.patch || { report close-bloc; return 1; } # Details about theses lines are in LFS book. sed 's@\./fixinc\.sh@-c true@' -i gcc/Makefile.in @@ -74,9 +74,9 @@ fi # GCC requires the GMP, MPFR and MPC packages. - tazwok get-src mpfr --target=$PWD/mpfr - tazwok get-src gmp --target=$PWD/gmp - tazwok get-src mpc-library --target=$PWD/mpc + tazwok get-src mpfr --target=$PWD/mpfr || { report close-bloc; return 1; } + tazwok get-src gmp --target=$PWD/gmp || { report close-bloc; return 1; } + tazwok get-src mpc-library --target=$PWD/mpc || { report close-bloc; return 1; } report step "Running compilation" @@ -96,7 +96,7 @@ --without-ppl --without-cloog && make && make install - } || return 1 + } || { report close-bloc; return 1; } ln -s gcc /tools/bin/cc report close-bloc } diff -r 988633c23f81 -r 9a531a816f54 libarchive/receipt --- a/libarchive/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/libarchive/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -15,7 +15,6 @@ compile_rules() { cd $src - sed -i 's|acl/libacl.h|libacl.h|' tar/bsdtar_platform.h ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ diff -r 988633c23f81 -r 9a531a816f54 libgudev-dev/receipt --- a/libgudev-dev/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/libgudev-dev/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgudev-dev" -VERSION="165" +VERSION="166" CATEGORY="development" SHORT_DESC="GObject-based wrapper library for libudev. (devel files)" MAINTAINER="pankso@slitaz.org" diff -r 988633c23f81 -r 9a531a816f54 libgudev/receipt --- a/libgudev/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/libgudev/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="libgudev" -VERSION="165" +VERSION="166" CATEGORY="development" SHORT_DESC="GObject-based wrapper library for libudev." MAINTAINER="gokhlayeh@slitaz.org" diff -r 988633c23f81 -r 9a531a816f54 libtaz/receipt --- a/libtaz/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/libtaz/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,18 +1,24 @@ # SliTaz package receipt. PACKAGE="libtaz" -VERSION="0.0.5" +VERSION="0.0.6" CATEGORY="base-system" SHORT_DESC="Slitaz generic library." MAINTAINER="gokhlayeh@slitaz.org" -#TARBALL="$PACKAGE-$VERSION.tar.gz" -TARBALL="$VERSION.tar.bz2" +TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.slitaz.org/" -#WGET_URL="http://mirror.slitaz.org/sources/libtaz/$TARBALL" -WGET_URL="http://hg.slitaz.org/libtaz/archive/$TARBALL" +# Use bitbucket until tank is back. +#WGET_URL="http://mirror.slitaz.org/sources/$PACKAGE/$TARBALL" +BUILD_DEPENDS="wget" +WGET_URL="https://bitbucket.org/gokhlayeh/$PACKAGE/get/$VERSION.tar.bz2" TAGS="slitaz" CONFIG_FILES="/etc/slitaz/slitaz.conf" +compile_rules() +{ + : +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 988633c23f81 -r 9a531a816f54 mingw32-ada/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mingw32-ada/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -0,0 +1,19 @@ +# SliTaz package receipt. + +PACKAGE="mingw32-ada" +SOURCE="gcc-ada" +VERSION="3.4.5-20060117-2" +CATEGORY="development" +SHORT_DESC="MinGW32 ada sources (empty package)." +MAINTAINER="gokhlayeh@mailoo.org" +TARBALL="$SOURCE-$VERSION-src.tar.gz" +WEB_SITE="http://www.mingw.org/" +MINGW32_URL="$SF_MIRROR/mingw" +WGET_URL="$MINGW32_URL/$TARBALL" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr +} + diff -r 988633c23f81 -r 9a531a816f54 mingw32-g++/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mingw32-g++/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -0,0 +1,19 @@ +# SliTaz package receipt. + +PACKAGE="mingw32-g++" +SOURCE="gcc-g++" +VERSION="3.4.5-20060117-2" +CATEGORY="development" +SHORT_DESC="MinGW32 c++ sources (empty package)." +MAINTAINER="gokhlayeh@mailoo.org" +TARBALL="$SOURCE-$VERSION-src.tar.gz" +WEB_SITE="http://www.mingw.org/" +MINGW32_URL="$SF_MIRROR/mingw" +WGET_URL="$MINGW32_URL/$TARBALL" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr +} + diff -r 988633c23f81 -r 9a531a816f54 mingw32-gcc-c/receipt --- a/mingw32-gcc-c/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/mingw32-gcc-c/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,14 +1,14 @@ # SliTaz package receipt. PACKAGE="mingw32-gcc-c" -SOURCE="gcc" +SOURCE="gcc-core" VERSION="3.4.5-20060117-2" CATEGORY="development" SHORT_DESC="MinGW32 gcc, for the C language only." MAINTAINER="rcx@zoominternet.net" DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers mingw32-runtime-headers" BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers" -TARBALL="$SOURCE-core-$VERSION-src.tar.gz" +TARBALL="$SOURCE-$VERSION-src.tar.gz" WEB_SITE="http://www.mingw.org/" MINGW32_URL="$SF_MIRROR/mingw" WGET_URL="$MINGW32_URL/$TARBALL" diff -r 988633c23f81 -r 9a531a816f54 mingw32-gcc/receipt --- a/mingw32-gcc/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/mingw32-gcc/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,15 +1,18 @@ # SliTaz package receipt. PACKAGE="mingw32-gcc" -SOURCE="gcc" +SOURCE="gcc-core" VERSION="3.4.5-20060117-2" CATEGORY="development" SHORT_DESC="MinGW32 gcc, for C, C++, and Ada." MAINTAINER="rcx@zoominternet.net" -DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers mingw32-runtime-headers mingw32-w32api mingw32-runtime" -BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c mingw32-w32api mingw32-runtime" +DEPENDS="glibc-base mingw32-binutils mingw32-w32api-headers \ +mingw32-runtime-headers mingw32-w32api mingw32-runtime" +BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils \ +mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c \ +mingw32-w32api mingw32-runtime mingw32-g++ mingw32-ada" PROVIDE="mingw32-gcc-c" -TARBALL="$SOURCE-core-$VERSION-src.tar.gz" +TARBALL="$SOURCE-$VERSION-src.tar.gz" WEB_SITE="http://www.mingw.org/" MINGW32_URL="$SF_MIRROR/mingw" WGET_URL="$MINGW32_URL/$TARBALL" @@ -28,34 +31,20 @@ return 1 fi - MINGW32_DIR="$PWD" - MINGW32_CPP_TARBALL="$SOURCE-g++-$VERSION-src.tar.gz" - MINGW32_ADA_TARBALL="$SOURCE-ada-$VERSION-src.tar.gz" - - for gcc_tgz in $MINGW32_CPP_TARBALL $MINGW32_ADA_TARBALL ; do - # Download the additional language tarballs - if [ ! -f "$SOURCES_REPOSITORY/$gcc_tgz" ] ; then - cd $SOURCES_REPOSITORY - download $MINGW32_URL/$gcc_tgz - fi - - # Extract the additional language tarballs - if [ -f "$SOURCES_REPOSITORY/$gcc_tgz" ] ; then - cd $MINGW32_DIR - echo "Extracting $gcc_tgz ..." - tar xzf "$SOURCES_REPOSITORY/$gcc_tgz" - else - # Exit if file not found to avoid errors. - echo -e "\nDownload of $gcc_tgz failed, exiting. Please check the URL.\n" - return 1 - fi + report open-bloc + + for s in mingw32-g++ mingw32-ada; do + tazwok get-src $s --target=$PACKAGE-$VERSION && continue + report close-bloc + return 1 done - - cd $MINGW32_DIR + + report step "Running compilation" rm -f -r $src/binutils mkdir -p $SOURCE-$VERSION-build cd $SOURCE-$VERSION-build + { $src/configure \ --prefix=/usr \ --libexecdir=/usr/lib \ @@ -71,7 +60,9 @@ --enable-sjlj-exceptions \ $CONFIGURE_ARGS && make -j 4 CFLAGS="-O2 -fomit-frame-pointer" LDFLAGS="-s" && - make DESTDIR=$src/_pkg install + make DESTDIR=$src/_pkg install && + report close-bloc + } || { report close-bloc; return 1; } } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -99,5 +90,5 @@ # Rules to clean the package clean_wok() { - rm -r $SOURCE-$VERSION-build + rm -rf $SOURCE-$VERSION-build } diff -r 988633c23f81 -r 9a531a816f54 scummvm/receipt --- a/scummvm/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/scummvm/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,12 +1,11 @@ # SliTaz package receipt. PACKAGE="scummvm" -VERSION="1.2.0" +VERSION="1.2.1" CATEGORY="games" SHORT_DESC="A 'virtual machine' for several classic graphical point-and-click adventure games." MAINTAINER="gokhlayeh@slitaz.org" -DEPENDS="gcc-lib-base alsa-lib libmad libvorbis flac libsdl" -BUILD_DEPENDS="alsa-lib-dev libmad-dev libvorbis-dev flac-dev libsdl-dev zlib-dev" +DEPENDS="gcc-lib-base alsa-lib libmad libvorbis flac libsdl zlib" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.scummvm.org/" WGET_URL="http://downloads.sourceforge.net/sourceforge/$PACKAGE/$TARBALL" @@ -16,14 +15,12 @@ { cd $src ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ --datadir=/usr/games/scummvm \ --backend=sdl --disable-debug \ --with-mpeg2-prefix=/usr \ --with-flac-prefix=/usr \ --disable-fluidsynth && - make -j 4 && make DESTDIR=$PWD/_pkg install + make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 988633c23f81 -r 9a531a816f54 tazchroot/receipt --- a/tazchroot/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/tazchroot/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,18 +1,24 @@ # SliTaz package receipt. PACKAGE="tazchroot" -VERSION="0.0.5" +VERSION="0.0.6" CATEGORY="base-system" SHORT_DESC="Slitaz tool to manage chroot" MAINTAINER="gokhlayeh@slitaz.org" DEPENDS="libtaz" -#TARBALL="$PACKAGE-$VERSION.tar.gz" -TARBALL="$VERSION.tar.bz2" +TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.slitaz.org/" -#WGET_URL="http://mirror.slitaz.org/sources/tazchroot/$TARBALL" -WGET_URL="http://hg.slitaz.org/tazchroot/archive/$TARBALL" +# Use bitbucket until tank is back. +#WGET_URL="http://mirror.slitaz.org/sources/$PACKAGE/$TARBALL" +BUILD_DEPENDS="wget" +WGET_URL="https://bitbucket.org/gokhlayeh/$PACKAGE/get/$VERSION.tar.bz2" TAGS="slitaz" +compile_rules() +{ + : +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r 988633c23f81 -r 9a531a816f54 tazwok-experimental/receipt --- a/tazwok-experimental/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/tazwok-experimental/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="tazwok-experimental" -VERSION="0.0.5.6" +VERSION="0.0.6.1" CATEGORY="base-system" SHORT_DESC="SliTaz sources and binaries packages cooker." MAINTAINER="gokhlayeh@slitaz.org" @@ -9,24 +9,49 @@ SUGGESTED="tazchroot" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.slitaz.org/" -WGET_URL="http://mirror.slitaz.org/sources/tazwok-experimental/$TARBALL" +# Use bitbucket until tank is back. +#WGET_URL="http://mirror.slitaz.org/sources/$PACKAGE/$TARBALL" +BUILD_DEPENDS="wget" +WGET_URL="https://bitbucket.org/gokhlayeh/$PACKAGE/get/$VERSION.tar.bz2" CONFIG_FILES="/etc/slitaz/tazwok.conf" PROVIDE="tazwok" TAGS="slitaz" +compile_rules() +{ + : +} + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin $fs/usr/share/doc/tazwok \ - $fs/etc/slitaz + $fs/etc/slitaz $fs/usr/share/slitaz/web-bb # Copy Tazwok, doc and examples. cp -a $src/tazwok $fs/usr/bin + cp -a $src/update-repository $fs/usr/bin chmod 755 $fs/usr/bin/tazwok cp -a $src/doc/* $fs/usr/share/doc/tazwok cp -a $src/applications $fs/usr/share # Config file cp -a $src/examples/tazwok.conf $fs/etc/slitaz cp -a $src/examples/config.site $fs/etc + # Webserver stuff + cp -a $src/web/* $fs/usr/share/slitaz/web-bb } -TAZBB_NO_INSTALL="Not ready to be used on tank yet." +post_install() +{ + echo -e "\\033[1;31mWARNING WARNING WARGNING +You should run update-repository on all repositories you used with +tazwok-experimental until there.This script change sources names, generate sources.list and modify +logs to make you're repository consistent with last changes. + +Usage is: +update-repository LOCAL_REPOSITORY + +Exemple: +update-repository /home/slitaz/experimental + +Sorry for this ;)\\033[0m" +} diff -r 988633c23f81 -r 9a531a816f54 udev-dev/receipt --- a/udev-dev/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/udev-dev/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="udev-dev" -VERSION="165" +VERSION="166" CATEGORY="development" SHORT_DESC="Udev devel file (libudev)." MAINTAINER="pankso@slitaz.org" diff -r 988633c23f81 -r 9a531a816f54 udev/receipt --- a/udev/receipt Mon Feb 14 18:17:28 2011 +0000 +++ b/udev/receipt Tue Feb 15 03:39:12 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="udev" -VERSION="165" +VERSION="166" BUILD_WARNING="Install new udev package and rebuild hal" CATEGORY="base-system" SHORT_DESC="Udev creat automaticly right devices in /dev."