# HG changeset patch # User Antoine Bodin # Date 1297966125 -3600 # Node ID d8351aeb23da6d81e5762648a3d0d1d94e7a58a6 # Parent c3d23bc104d33643cb5e28d1c5f296398221ec22# Parent 5b4581f8e47639bf11a011ddf2368b0f2b0211f5 Automated merge with http://repos.slitaz.org/wok diff -r c3d23bc104d3 -r d8351aeb23da PyQt-x11-gpl/receipt --- a/PyQt-x11-gpl/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/PyQt-x11-gpl/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="PyQt-x11-gpl" -VERSION="4.8.2" +VERSION="4.8.3" CATEGORY="development" SHORT_DESC="PyQt" MAINTAINER="allan316@gmail.com" diff -r c3d23bc104d3 -r d8351aeb23da Qt4-dev/receipt --- a/Qt4-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/Qt4-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -8,7 +8,7 @@ DEPENDS="QtDesigner jpeg tiff libpng mesa libglu-mesa \ freetds libmysqlclient libpostgresqlclient libunixODBC xcb-util \ libQt3Support libQtClucene libQtDBus libQtHelp libQtOpenGL \ -libQtScript libQtSql libQtWebkit qtconfig gcc-lib-base" +libQtScript libQtSql libQtWebkit libQtTest qtconfig gcc-lib-base" SUGGESTED="libmng nvidia" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" @@ -18,7 +18,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib cp -a $_pkg/usr/lib/*.*a $fs/usr/lib/ diff -r c3d23bc104d3 -r d8351aeb23da QtDesigner/receipt --- a/QtDesigner/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/QtDesigner/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,7 +9,6 @@ expat fontconfig freetype glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender zlib \ libpng gcc-lib-base" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" WANTED="qt4" SOURCE="qt-everywhere-opensource-src" @@ -21,8 +20,7 @@ mkdir -p $fs/usr/bin \ $fs/usr/share/pixmaps \ $fs/usr/share/applications - src="$WOK/$WANTED/$SOURCE-$VERSION" - _pkg="$src/_pkg" + cp -a $_pkg/usr/bin/designer* $fs/usr/bin cp -a $_pkg/usr/bin/linguist* $fs/usr/bin cp -a $_pkg/usr/bin/assistant* $fs/usr/bin diff -r c3d23bc104d3 -r d8351aeb23da TeXmacs-windows-fonts/receipt --- a/TeXmacs-windows-fonts/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/TeXmacs-windows-fonts/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,16 +10,9 @@ WEB_SITE="http://www.texmacs.org" WGET_URL="ftp://ftp.texmacs.org/pub/TeXmacs/fonts/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - echo "Nothing to compile" - [ -d fonts ] -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share/TeXmacs/ - cp -a fonts $fs/usr/share/TeXmacs + cp -a $src $fs/usr/share/TeXmacs/fonts } diff -r c3d23bc104d3 -r d8351aeb23da accessx/receipt --- a/accessx/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/accessx/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -17,7 +17,7 @@ mv $PACKAGE $PACKAGE-$VERSION 2> /dev/null cd $src # Patch for deprecated - patch -p0 < ../stuff/accessx.diff || exit 1 + patch -p0 < ../stuff/accessx.diff || return 1 make } diff -r c3d23bc104d3 -r d8351aeb23da aircrack-ng/receipt --- a/aircrack-ng/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/aircrack-ng/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -15,11 +15,11 @@ compile_rules() { cd $src - sed -i s#/usr/local#/usr#g common.mak || exit 1 - sed -i s#/man/man1#/share/man/man1# common.mak || exit 1 + sed -i s#/usr/local#/usr#g common.mak || return 1 + sed -i s#/man/man1#/share/man/man1# common.mak || return 1 # fix build with gcc45 - sed -i s/-Werror// common.mak || exit 1 + sed -i s/-Werror// common.mak || return 1 make && make DESTDIR=$PWD/_pkg install diff -r c3d23bc104d3 -r d8351aeb23da alsa-plugins/receipt --- a/alsa-plugins/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/alsa-plugins/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -19,7 +19,7 @@ --prefix=/usr \ $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make -j1 DESTDIR=$PWD/_pkg install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da ario/receipt --- a/ario/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ario/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,7 +7,7 @@ MAINTAINER="erjo@slitaz.org" DEPENDS="libgcrypt gtk+ libcurl libglade libmpdclient taglib dbus-glib \ gcc-lib-base libunique libtasn1" -BUILD_DEPENDS="libgcrypt-dev libglade-dev curl-dev gnutls-dev libmpdclient-dev taglib-dev" +BUILD_DEPENDS="gnutls-dev taglib-dev intltool" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://ario-player.sourceforge.net/index.php?en" WGET_URL="http://freefr.dl.sourceforge.net/sourceforge/ario-player/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da aspell-en/receipt --- a/aspell-en/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/aspell-en/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="aspell-en" -VERSION="6.0-0" +VERSION="7.1-0" CATEGORY="system-tools" SHORT_DESC="English aspell dictionary." MAINTAINER="paul@slitaz.org" @@ -17,7 +17,7 @@ { cd $src ./configure && \ - make && make DESTDIR=$PWD/_pkg install + make && make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da assaultcube-data/receipt --- a/assaultcube-data/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/assaultcube-data/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,15 +7,10 @@ MAINTAINER="slaxemulator@gmail.com" SOURCE="AssaultCube" TARBALL="${SOURCE}_v${VERSION}.tar.bz2" +SOURCE="AssaultCube-Data" WEB_SITE="http://assault.cubers.net/" WGET_URL="$SF_MIRROR/actiongame/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - ln -s $WOK/$PACKAGE/$VERSION $WOK/$PACKAGE/$SOURCE-$VERSION -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r c3d23bc104d3 -r d8351aeb23da assaultcube/receipt --- a/assaultcube/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/assaultcube/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,28 +9,31 @@ BUILD_DEPENDS="openal-dev libsdl-image-dev libsdl-mixer-dev mesa-dev" SOURCE="AssaultCube" TARBALL="${SOURCE}_v${VERSION}_source.tar.bz2" +SOURCE="AssaultCube-Source" WEB_SITE="http://assault.cubers.net/" WGET_URL="$SF_MIRROR/actiongame/$TARBALL" # Rules to configure and make the package. compile_rules() -{ - [ -d $WOK/$PACKAGE/$VERSION ] && ln -s $WOK/$PACKAGE/$VERSION $WOK/$PACKAGE/$SOURCE-$VERSION +{ cd $src/source/src make + [ ! -d $DESTDIR/usr/bin ] && mkdir -p $DESTDIR/usr/bin + cp -a ac_client $DESTDIR/usr/bin + cp -a ac_server $DESTDIR/usr/bin + } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - _src=$src/source/src - _stuff=$WOK/$PACKAGE/stuff + stuff=$WOK/$PACKAGE/stuff mkdir -p $fs/usr/bin $fs/usr/share/pixmaps $fs/usr/share/applications - cp -a $_src/ac_client $fs/usr/bin - cp -a $_src/ac_server $fs/usr/bin - cp -a $_stuff/assaultcube $fs/usr/bin - cp -a $_stuff/assaultcube-server $fs/usr/bin - cp -a $_stuff/assaultcube.png $fs/usr/share/pixmaps + cp -a $_pkg/usr/bin/ac_client $fs/usr/bin + cp -a $_pkg/usr/bin/ac_server $fs/usr/bin + cp -a $stuff/assaultcube $fs/usr/bin + cp -a $stuff/assaultcube-server $fs/usr/bin + cp -a $stuff/assaultcube.png $fs/usr/share/pixmaps chmod +x $fs/usr/bin/assaultcube chmod +x $fs/usr/bin/assaultcube-server } diff -r c3d23bc104d3 -r d8351aeb23da aterm/receipt --- a/aterm/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/aterm/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -6,7 +6,7 @@ SHORT_DESC="terminal emulator" MAINTAINER="allan316@gmail.com" DEPENDS="xorg-libSM xorg-libXext" -BUILD_DEPENDS="xorg-libSM-dev xorg-libXest-dev xorg-libXt-dev" +BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://aterm.sourceforge.net" WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/aterm/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da aufs-utils/receipt --- a/aufs-utils/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/aufs-utils/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,29 +1,19 @@ # SliTaz package receipt. PACKAGE="aufs-utils" -VERSION="20110124" +VERSION="20110214" CATEGORY="system-tools" SHORT_DESC="The aufs utils." MAINTAINER="pankso@slitaz.org" DEPENDS="aufs" BUILD_DEPENDS="git linux-module-headers" WEB_SITE="http://aufs.sourceforge.net/" - +WGET_URL="git|http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git" +BRANCH="origin/aufs2.1" # Rules to configure and make the package. compile_rules() { - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma - if [ -f $TARBALL ]; then - unlzma -c $TARBALL | tar xf - - cd $src && git checkout origin/aufs2.1 - else - git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git $PACKAGE-$VERSION - tar cf - $PACKAGE-$VERSION | lzma e $TARBALL -si - cd $src && git checkout origin/aufs2.1 - fi - - KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` + KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` cd $src sed -i 's/-m 644 -T/-m 644/' Makefile make && diff -r c3d23bc104d3 -r d8351aeb23da aufs/receipt --- a/aufs/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/aufs/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="aufs" -VERSION="20110124" +VERSION="20110214" CATEGORY="base-system" SHORT_DESC="aufs2 kernel module" MAINTAINER="slaxemulator@gmail.com" @@ -9,21 +9,12 @@ BUILD_DEPENDS="linux-module-headers git lzma" WEB_SITE="http://aufs.sf.net/" PROVIDE="linux-aufs" +WGET_URL="git|http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git" +BRANCH="origin/${PACKAGE}2.1-37" # Rules to configure and make the package. compile_rules() { - AUFSDIR="$PACKAGE-$VERSION" - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma - if [ -f $TARBALL ]; then - unlzma -c $TARBALL | tar xf - - cd $AUFSDIR && git checkout origin/aufs2.1-37 - else - # Aufs2 from git repository - git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs2-standalone.git $AUFSDIR - tar cf - $AUFSDIR | lzma e $TARBALL -si - cd $AUFSDIR && git checkout origin/aufs2.1-37 - fi cd $src sed -i 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \ diff -r c3d23bc104d3 -r d8351aeb23da bazaar/receipt --- a/bazaar/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/bazaar/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -2,7 +2,7 @@ PACKAGE="bazaar" SOURCE="bzr" -VERSION="2.2.0" +VERSION="2.3.0" CATEGORY="development" SHORT_DESC="A free distributed version control system." MAINTAINER="rcx@zoominternet.net" diff -r c3d23bc104d3 -r d8351aeb23da bcrypt/receipt --- a/bcrypt/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/bcrypt/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -16,7 +16,7 @@ compile_rules() { cd $src - make || exit 1 + make } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da busybox-pam/receipt --- a/busybox-pam/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/busybox-pam/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="busybox-pam" -VERSION="1.18.2" +VERSION="1.18.3" CATEGORY="base-system" SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities." MAINTAINER="pascal.bellard@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da busybox-static/receipt --- a/busybox-static/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/busybox-static/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="busybox-static" -VERSION="1.18.2" +VERSION="1.18.3" CATEGORY="base-system" SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities." MAINTAINER="pascal.bellard@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da busybox/receipt --- a/busybox/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/busybox/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="busybox" -VERSION="1.18.2" +VERSION="1.18.3" CATEGORY="base-system" SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities." MAINTAINER="pascal.bellard@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da cdrdao/receipt --- a/cdrdao/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/cdrdao/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -25,6 +25,7 @@ grep -qs 'define u8' scsilib/libscg/scsi-linux-sg.c || sed -i 's|#include |#define u8 __u8\n&|' \ scsilib/libscg/scsi-linux-sg.c + patch -Np1 -i ../stuff/$PACKAGE-$VERSION-stat.patch || return 1 ./configure --prefix=/usr --with-lame && make && make DESTDIR=$PWD/_pkg install diff -r c3d23bc104d3 -r d8351aeb23da cdrdao/stuff/cdrdao-1.2.3-stat.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cdrdao/stuff/cdrdao-1.2.3-stat.patch Thu Feb 17 19:08:45 2011 +0100 @@ -0,0 +1,13 @@ +diff -up cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat cdrdao-1.2.3/dao/ScsiIf-linux.cc +--- cdrdao-1.2.3/dao/ScsiIf-linux.cc.stat 2010-01-20 20:11:36.000000000 +0100 ++++ cdrdao-1.2.3/dao/ScsiIf-linux.cc 2010-01-20 20:14:07.000000000 +0100 +@@ -19,6 +19,9 @@ + + #include + ++#include ++#include ++ + #include + #include + #include diff -r c3d23bc104d3 -r d8351aeb23da cdrkit/receipt --- a/cdrkit/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/cdrkit/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -17,7 +17,7 @@ cd $src sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \ genisoimage/CMakeLists.txt - #patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || exit 1 + #patch -p1 < ../stuff/$PACKAGE-1.1.9-glibc-2.10.patch || return 1 #grep -qs 'define u8' libusal/scsi-linux-sg.c || #sed -i 's|#include |#define u8 __u8\n&|' libusal/scsi-linux-sg.c make && diff -r c3d23bc104d3 -r d8351aeb23da celestia/receipt --- a/celestia/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/celestia/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -28,9 +28,9 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share + mkdir -p $fs/usr/share/applications cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/share/applications $fs/usr/share + cp -a stuff/celestia.desktop $fs/usr/share/applications cp -a $_pkg/usr/share/celestia $fs/usr/share cp -a $_pkg/usr/share/pixmaps $fs/usr/share } diff -r c3d23bc104d3 -r d8351aeb23da celestia/stuff/celestia.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/celestia/stuff/celestia.desktop Thu Feb 17 19:08:45 2011 +0100 @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.4.0 +Type=Application +Exec=celestia +Icon=celestia +X-GNOME-DocPath= +Terminal=false +Name=Celestia +Comment=Space Simulator +StartupNotify=true +Categories=Education;Astronomy;Science; diff -r c3d23bc104d3 -r d8351aeb23da clucene-dev/receipt --- a/clucene-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/clucene-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -11,8 +11,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - # we need to re-create $_pkg as SOURCE != PACKAGE - _pkg=$WOK/$WANTED/$WANTED-core-$VERSION/_pkg mkdir -p $fs/usr/lib $fs/usr/include cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/lib/*.*a $fs/usr/lib diff -r c3d23bc104d3 -r d8351aeb23da clucene/receipt --- a/clucene/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/clucene/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -23,7 +23,7 @@ --disable-static \ $CONFIGURE_ARGS make - make DESTDIR=$PWD/_pkg install + make -j1 install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da clutter-dev/receipt --- a/clutter-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/clutter-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="clutter-dev" -VERSION="1.4.2" +VERSION="1.6.2" CATEGORY="development" SHORT_DESC="Clutter tool kit devel files." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da clutter/receipt --- a/clutter/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/clutter/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="clutter" -VERSION="1.4.2" +VERSION="1.6.2" CATEGORY="x-window" SHORT_DESC="Animated graphical user interfaces library." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da cmake/receipt --- a/cmake/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/cmake/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="cmake" -VERSION="2.8.3" +VERSION="2.8.4" CATEGORY="development" SHORT_DESC="Cross-platform Make." MAINTAINER="pankso@slitaz.org" @@ -18,16 +18,15 @@ ./bootstrap \ --prefix=/usr \ --docdir=/share/doc/$PACKAGE \ - --mandir=/share/man \ - $CONFIGURE_ARGS && + --mandir=/share/man && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cp -a $_pkg/* $fs + cp -a $_pkg/usr $fs rm -rf $fs/usr/share/man } diff -r c3d23bc104d3 -r d8351aeb23da compcache/receipt --- a/compcache/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/compcache/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -19,7 +19,7 @@ cd $src # Fix build with kernel 2.6.34 - patch -p1 < ../stuff/compcache-0.6.2-linux-2.6.34.u || exit 1 + patch -p1 < ../stuff/compcache-0.6.2-linux-2.6.34.u || return 1 find -name Makefile | xargs sed -i \ "s|/lib/modules/\$(shell uname -r)/build|/usr/src/linux|" diff -r c3d23bc104d3 -r d8351aeb23da coreutils-file-output-full/receipt --- a/coreutils-file-output-full/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/coreutils-file-output-full/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -36,12 +36,13 @@ root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/cat $root/usr/bin/od + rm -f $root/bin/cat $root/usr/bin/od $root/usr/bin/tac status } post_remove() { - ln -s /bin/busybox /bin/cat - ln -s /bin/busybox /usr/bin/od + ln -s /bin/busybox $1/bin/cat + ln -s /bin/busybox $1/usr/bin/od + ln -s /bin/busybox $1/usr/bin/tac } diff -r c3d23bc104d3 -r d8351aeb23da coreutils/receipt --- a/coreutils/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/coreutils/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -33,8 +33,8 @@ uname.u EOT - sed -i 's/1.10a/1.10.2/' configure.ac || exit 1 - sed -i 's/dist-xz/dist-lzma/' configure.ac || exit 1 + sed -i 's/1.10a/1.10.2/' configure.ac || return 1 + sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1 ./configure \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da dahdi-linux/receipt --- a/dahdi-linux/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/dahdi-linux/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -8,7 +8,7 @@ TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.asterisk.org/" WGET_URL="http://downloads.asterisk.org/pub/telephony/$PACKAGE/releases/$TARBALL" -DEPENDS="linux" +DEPENDS="linux udev" #PROVIDE="linux-misdn" # Rules to gen a SliTaz package suitable for Tazpkg. @@ -17,13 +17,14 @@ cd $src sed -i 's/tar -xof/tar -xf/' drivers/dahdi/firmware/Makefile [ -d $WOK/linux/taz ] || tazwok cook linux - make KSRC=$WOK/linux/$(ls $WOK/linux/taz) DESTDIR=$PWD/_pkg install + make KSRC=$WOK/linux/$(ls $WOK/linux/taz) install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr + cp -a $_pkg/etc $fs cp -a $_pkg/dev $fs cp -a $_pkg/lib $fs cp -a $_pkg/usr/share $fs/usr diff -r c3d23bc104d3 -r d8351aeb23da dahdi-tools/receipt --- a/dahdi-tools/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/dahdi-tools/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,7 +9,7 @@ WEB_SITE="http://www.asterisk.org/" WGET_URL="http://downloads.asterisk.org/pub/telephony/$PACKAGE/releases/$TARBALL" DEPENDS="libusb newt libpri" -BUILD_DEPENDS="dahdi-linux-dev ppp-dev libusb-dev newt-dev libpri-dev" +BUILD_DEPENDS="dahdi-linux ppp libusb newt libpri" CONFIG_FILES="/etc/dahdi/" # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da dillo-hg/receipt --- a/dillo-hg/receipt Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="dillo-hg" -VERSION="1326" -CATEGORY="network" -SHORT_DESC="Light and fast web browse using FLTK (Hg version)." -MAINTAINER="pankso@slitaz.org" -WEB_SITE="http://www.dillo.org/" -DEPENDS="fltk-2.0.x libpng jpeg zlib xorg-libXi xorg-libXinerama gcc-lib-base" -BUILD_DEPENDS="$DEPENDS fltk-2.0.x-dev libpng-dev jpeg-dev zlib-dev \ -python mercurial" -SUGGESTED="openssl" -CONFLICTS="dillo" - -# Rules to configure and make the package. -compile_rules() -{ - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.gz - if [ -f $TARBALL ]; then - tar xzf $TARBALL - else - echo "Cloning revision $VERSION from Dillo repository..." - hg clone --rev $VERSION \ - http://hg.dillo.org/dillo $PACKAGE-$VERSION || exit 0 - tar czf $TARBALL $PACKAGE-$VERSION - fi - cd $src - ./autogen.sh && - ./configure \ - --sysconfdir=/etc \ - --prefix=/usr \ - --enable-ssl \ - $CONFIGURE_ARGS && - make && - make DESTDIR=$PWD/_pkg install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib \ - $fs/usr/share/applications \ - $fs/usr/share/pixmaps - cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/lib/dillo $fs/usr/lib - strip -s $fs/usr/lib/dillo/dpi/*/* - chmod +x $fs/usr/bin/* - # Config files with custom dillorc and desktop file. - cp -a $_pkg/etc $fs - cp stuff/dillorc $fs/etc/dillo - cp -a stuff/dillo.desktop $fs/usr/share/applications - cp -a stuff/dillo.png $fs/usr/share/pixmaps - # Webhome - cp -a stuff/webhome $fs/usr/share - chown -R root.root $fs -} - -pre_install() -{ - if [ -d $1/var/lib/tazpkg/installed/$CONFLICTS ]; then - echo "y" | tazpkg remove $CONFLICTS - fi -} diff -r c3d23bc104d3 -r d8351aeb23da dillo-hg/stuff/dillo.desktop --- a/dillo-hg/stuff/dillo.desktop Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Dillo Web Browser -Name[de]=Netznavigator Dillo -Name[fr]=Navigateur Web Dillo -Name[pt_PT]=Navegador Web Dillo -Name[zh_CN]=Dillo网页浏览器 -Type=Application -Categories=Network; -MimeType=text/html;application/xhtml+xml; -Exec=dillo %u -Icon=dillo.png diff -r c3d23bc104d3 -r d8351aeb23da dillo-hg/stuff/dillo.png Binary file dillo-hg/stuff/dillo.png has changed diff -r c3d23bc104d3 -r d8351aeb23da dillo-hg/stuff/dillorc --- a/dillo-hg/stuff/dillorc Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,228 +0,0 @@ -# dillorc -# Sample dillo initialization file. -# -# Lines that start with a '#' are comments. -# "#option=..." shows the built-in default. -# "# option=..." is an additional example. -# "option=..." overrides the built-in value. - -#------------------------------------------------------------------------- -# FIRST SECTION :) -#------------------------------------------------------------------------- - -# Set the desired initial browser size -# geometry=650x545+0+20 -#geometry=780x580 - -# Change this if you want to have text-only browsing from the start. -# (there's a toggle button near the bug meter to change this on-the-fly) -#load_images=YES - -# Change this if you want to disable loading of CSS stylesheets. -#load_stylesheets=YES - -# Change this if you want to disable parsing of embedded CSS. -#parse_embedded_css=YES - -# Change the buffering scheme for drawing -# 0 no double buffering - useful for debugging -# 1 light buffering using a single back buffer for all windows -# 2 full fltk-based double buffering for all windows -#buffered_drawing=1 - -# Set your default directory for download/save operations -#save_dir=/tmp - -#------------------------------------------------------------------------- -# RENDERING SECTION -#------------------------------------------------------------------------- - -# Fontnames: -# - some fonts may slow down rendering. -# - try to tune a fontname/font_factor combination. -# Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...} -# The values below represent the defaults. -# -#font_serif="DejaVu Serif" -#font_sans_serif="DejaVu Sans" -#font_cursive="DejaVu Sans" -#font_fantasy="DejaVu Sans" -#font_monospace="DejaVu Sans Mono" - -# All font sizes are scaled by this value -# font_factor=1.5 -#font_factor=1.0 - -# Maximum font size in pixels -#font_max_size=100 - -# Minimum font size in pixels -#font_min_size=6 - -# Show tooltip popup for images? -# Note: We use the "title" attribute and not "alt". -# More info at: http://bugzilla.mozilla.org/show_bug.cgi?id=25537 -# *** NOT HOOKED UP YET *** -# -#show_tooltip=YES - -# Set this to YES if you want to limit the word wrap width to the viewport -# width (may be useful for iPAQ) -# *** NOT HOOKED UP YET *** -# -#limit_text_width=NO - - -#------------------------------------------------------------------------- -# PARSING SECTION -#------------------------------------------------------------------------- - -# If you prefer more accurate HTML bug diagnosis over better rendering -# (page authors and webmasters) set the following to "NO". -# -#w3c_plus_heuristics=YES - - -#------------------------------------------------------------------------- -# NETWORK SECTION -#------------------------------------------------------------------------- - -# Set the start page. -# start_page="about:blank" -# start_page="http://www.dillo.org" -# start_page="file:/home/jcid/custom_page.html" -start_page="file:/usr/share/webhome/dillo.html" - -# Set the home location -# home="file:/home/jcid/HomePage/Home.html" -home="file:/usr/share/webhome/dillo.html" - -# Set the URL used by the web search dialog. -# "%s" is replaced with the search keywords separated by '+'. -# search_url="http://search.lycos.com/?query=%s" -# search_url="http://www.alltheweb.com/search?cat=web&query=%s" -#search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s" - -# If set, dillo will ask web servers to send pages in this language. -# This setting does NOT change dillo's user interface. -# Format explained: www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 -# Language-REGION values: www.iana.org/assignments/language-subtag-registry -# (by default, no Accept-Language header is sent) -# http_language="de" -# http_language="pt-BR" -# http_language="vi,de-CH,de;q=0.5,th;q=0.3" -http_language="en" - -# Set the proxy information for http. -# WARNING: - HTTPS does not currently use the proxy settings. -# - FTP and downloads plugins use wget. To use a proxy with them, -# you will need to configure wget accordingly. -# http_proxy="http://localhost:8080/" -#(by default, no proxy is used) - -# If you need to provide a user/password pair for the proxy, -# set the proxy user name here and Dillo will ask for the password later. -# http_proxyuser="joe" -#(by default, no proxy is used) - -# Set the domains to access without proxy -# no_proxy = ".hola.com .mynet.cl .hi.de" -#(by default, no proxy is used) - -# Set the HTTP Referer (sic) header. -# Note that there is no option to reveal the page that you came from because it -# would endanger your privacy. 'host' and 'path' allow you to pretend that the -# link you followed was on the same site that you're going to. -# none : Don't send any Referer header at all. -# host : Send the requested URI's hostname. -# path : Send the requested URI's host and path. -#http_referer=host - - -#------------------------------------------------------------------------- -# COLORS SECTION -#------------------------------------------------------------------------- - -# If your eyes suffer with white backgrounds, change this. -#allow_white_bg=YES - -# When set to YES, the page author's visited link color may be overridden -# to allow better contrast with text/links/background -#contrast_visited_color=YES - -#------------------------------------------------------------------------- -# USER INTERFACE SECTION -#------------------------------------------------------------------------- - -# Size of dillo panel (used to enlarge the browsing area) -# tiny : recommended for iPAQ (with small_icons) -# small : very nice! (it's "medium" without icon titles) -# medium : nice! -# large : Traditional -# panel_size=tiny -panel_size=small -# panel_size=medium -# panel_size=large - -#small_icons=NO - -# Here you can choose to hide some widgets of the dillo panel... -#show_back=YES -#show_forw=YES -#show_home=YES -#show_reload=YES -#show_save=YES -#show_stop=YES -#show_bookmarks=YES -#show_tools=YES -#show_filemenu=YES -#show_clear_url=YES -#show_url=YES -#show_search=YES -#show_progress_box=YES - -# Start dillo with the panels hidden? -#fullwindow_start=NO - -# When filling out forms, our default behaviour is to submit on enterpress, -# but only when there's a single text entry (to avoid incomplete submits). -# OTOH, if you have to fill out the same form repeatedly, you may find it -# useful to keep away from the mouse by forcing enter to submit. -#enterpress_forces_submit=NO - -# A mouse's middle click over a link opens a new Tab. -# If you prefer to open a new Window instead, set it to NO. -#middle_click_opens_new_tab=YES - -# Mouse middle click by default drives drag-scrolling. -# To paste an URL into the window instead of scrolling, set it to NO. -# Note: You could always paste the URL onto the URL box clear button. -#middle_click_drags_page=YES - -# Focus follows new Tabs. -# You can hold SHIFT to temporarily revert this behaviour. -#focus_new_tab=YES - - -#------------------------------------------------------------------------- -# DEBUG MESSAGES SECTION -#------------------------------------------------------------------------- - -# Soon we should add the "show_debug_messages=NO" option... - -# Generic messages (mainly for debugging specific parts) -# Change this to disable them. -#show_msg=YES - - -#------------------------------------------------------------------------- -# HTML BUG MESSAGES SECTION -#------------------------------------------------------------------------- - -# Accepted by the W3C validator but "strongly discouraged" by the SPEC. -# (Such as "TAB character inside
").
-#show_extra_warnings=NO
-
-
-# -----------------------------------------------------------------------
-# dillorc ends here.
diff -r c3d23bc104d3 -r d8351aeb23da dillo-hg/stuff/webhome/dillo.css
--- a/dillo-hg/stuff/webhome/dillo.css	Thu Feb 17 15:35:13 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/* 
-	CSS style for SliTaz GNU/Linux *book.
-	Pankso 2007 - www.slitaz.org
-*/
-
-body {
-	font: 13px sans-serif, vernada, arial;
-	background: #222222;
-	margin: 0;
-	padding-bottom: 100%;
-}
-
-#header {
-	background: #f0ba08;
-	color: black;
-	height: 50px;
-	border-top: 1px solid black;
-	border-bottom: 1px solid black;
-}
-#quicknav {
-	margin-right: 6px;
-	text-align: right;
-	font-size: 12px;
-	font-weight: bold;
-	margin-right: 6px;
-	}
-
-#quicknav a {
-	background: inherit;
-	color: white;
-	text-decoration: none;
-}
-
-#quicknav a:hover {
-	background: inherit;
-	color: #222222;
-}
-
-/*  content. */
-
-#content {
-	background: #ffffff;
-	color: black;
-	padding: 20px;
-	margin: 20px 50px 0px 50px;
-	width: auto;
-	text-align: justify;
-}
-
-#content li {
-	line-height: 1.5em;
-	text-align: left;
-}
-
-/* Legal informations */
-
-#copy {
-	font-size: 11px ;
-	text-align: center ;
-	background: transparent;
-	color: #ffffff;
-	padding-top: 20px;
-}
-
-#copy a {
-	background: inherit;
-	color: #a8a8a8;
-}
-
-#copy a:hover {
-	background: inherit;
-	color: #EDEDED;
-}
-
-/* Clouds */
-
-#cloud {
-	padding: 10px 80px 40px 80px;
-	line-height: 3em;
-	text-align: center;
-}
-#cloud a { padding: 4px; color: #956411; }
-#cloud a.tag1 { font-size: 0.7em; font-weight: 100; }
-#cloud a.tag2 { font-size: 0.8em; font-weight: 200; }
-#cloud a.tag3 { font-size: 0.9em; font-weight: 300; }
-#cloud a.tag4 { font-size: 1.0em; font-weight: 400; }
-#cloud a.tag5 { font-size: 1.2em; font-weight: 500; }
-#cloud a.tag6 { font-size: 1.4em; font-weight: 600; }
-#cloud a.tag7 { font-size: 1.6em; font-weight: 700; }
-#cloud a.tag8 { font-size: 1.8em; font-weight: 800; }
-#cloud a.tag9 { font-size: 2.2em; font-weight: 900; }
-#cloud a.tag10 { font-size: 2.5em; font-weight: 900; }
-
-/* General HTML entities for  content. */
-
-h1 {
-	margin: 0px 0px 0px 16px;
-}
-
-h2 {
-	margin: 12px 0;
-	color: #484B7C;
-	background: white;
-}
-
-h3 {
-	font-weight: bold;
-	color: #6c0023;
-	background: white;
-}
-
-a {
-	text-decoration: underline;
-}
-a:hover {
-	text-decoration: none;
-}
-
-pre {
-	padding: 5px;
-	color: black;
-	background: #e1e0b0;
-}
-pre.script {
-	padding: 10px;
-	color: black;
-	background: #e8e8e8;
-	border: 1px inset #333333;
-}
-
-code {
-	font-size: 12px;
-	color: #669900;
-	background: transparent;
-}
-
-li {
-	line-height: 1.4em;
-}
-
-hr {
-	border: 0pt none;
-}
diff -r c3d23bc104d3 -r d8351aeb23da dillo-hg/stuff/webhome/dillo.html
--- a/dillo-hg/stuff/webhome/dillo.html	Thu Feb 17 15:35:13 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-
-
-
-	SliTaz Dillo - Web Homepage
-	
-	
-	
-	
-
-
-
-
-
-
-
-
-
- -
- - - - - - - - - - - -
[ Wikipedia ] -
- - - -
-
[ Google ] -
- - -
-
-
- - - - - -
- - - diff -r c3d23bc104d3 -r d8351aeb23da dmsetup/receipt --- a/dmsetup/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/dmsetup/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="dmsetup" -VERSION="2.02.82" +VERSION="2.02.84" CATEGORY="system-tools" SHORT_DESC="Linux device mapper setup tool." MAINTAINER="b1+slitaz@nagel.org" diff -r c3d23bc104d3 -r d8351aeb23da dvdauthor/receipt --- a/dvdauthor/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/dvdauthor/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -14,7 +14,6 @@ # Rules to configure and make the package. compile_rules() { - src=$WOK/$PACKAGE/$PACKAGE cd $src ./configure \ --prefix=/usr \ @@ -27,7 +26,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - _pkg=$WOK/$PACKAGE/$PACKAGE/_pkg mkdir -p $fs/usr/share cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share diff -r c3d23bc104d3 -r d8351aeb23da ecj/receipt --- a/ecj/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ecj/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -20,10 +20,6 @@ # Rules to configure and make the package. compile_rules() { - # Please see the link below for a feature request addressing jar untar errors - # http://labs.slitaz.org/issues/show/133 - echo " ** IGNORING ANY UNTAR ERRORS - UNTAR NOT NEEDED **" - # Build the ecj shell script to use the current version mkdir -p $src/_pkg/usr/bin && echo "#!/bin/sh" > $src/_pkg/usr/bin/ecj && @@ -32,8 +28,7 @@ chmod +x $src/_pkg/usr/bin/ecj && mkdir -p $src/_pkg/usr/share/java && - cp -a $SOURCES_REPOSITORY/$TARBALL $src/_pkg/usr/share/java && - echo " ** BUILD SUCCEEDED **" + cp -a $src/$TARBALL $src/_pkg/usr/share/java } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da ecm/receipt --- a/ecm/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ecm/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,25 +9,14 @@ BUILD_DEPENDS="unzip" TARBALL="${PACKAGE}${VERSION}.zip" WEB_SITE="http://www.neillcorlett.com/ecm/" -WGET="http://www.neillcorlett.com/downloads/$TARBALL" +WGET_URL="http://www.neillcorlett.com/downloads/$TARBALL" # Rules to configure and make the package. compile_rules() { - src=$WOK/$PACKAGE/$PACKAGE-$VERSION - mkdir -p $src - cd $src - if [ -f $SOURCES_REPOSITORY/$TARBALL ]; then - unzip $SOURCES_REPOSITORY/$TARBALL - else - [ -L /usr/bin/wget ] && tazpkg get-install wget --forced - wget -O $SOURCES_REPOSITORY/$TARBALL $WGET - unzip $SOURCES_REPOSITORY/$TARBALL -d $src - fi - for i in {,un}ecm; do + for i in ecm unecm; do gcc $i.c -o $i done - } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da efreet/receipt --- a/efreet/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/efreet/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -25,5 +25,6 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/share $fs/usr cp -a $_pkg/usr/lib/*.so* $fs/usr/lib + cp -a $_pkg/usr/lib/efreet $fs/usr/lib } diff -r c3d23bc104d3 -r d8351aeb23da elementary-dev/receipt --- a/elementary-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/elementary-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="elementary-dev" -VERSION="0.6.0.063" +VERSION="0.7.0.55225" CATEGORY="development" SHORT_DESC="Elementary devel files." MAINTAINER="pankso@slitaz.org" @@ -11,8 +11,13 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib + mkdir -p $fs/usr/lib/edje/modules/elm/linux-gnu-i486-1.0.0 \ + $fs/usr/lib/elementary/modules/test_entry/linux-gnu-i486-0.7.0 cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/lib/*.*a $fs/usr/lib + cp -a $_pkg/usr/lib/edje/modules/elm/linux-gnu-i486-1.0.0/module.la \ + $fs/usr/lib/edje/modules/elm/linux-gnu-i486-1.0.0 + cp -a $_pkg/usr/lib/elementary/modules/test_entry/linux-gnu-i486-0.7.0/module.la \ + $fs/usr/lib/elementary/modules/test_entry/linux-gnu-i486-0.7.0 cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib } diff -r c3d23bc104d3 -r d8351aeb23da elementary/receipt --- a/elementary/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/elementary/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="elementary" -VERSION="0.6.0.063" +VERSION="0.7.0.55225" CATEGORY="x-window" SHORT_DESC="Widget set based on EFL for mobile touch-screen devices." MAINTAINER="pankso@slitaz.org" @@ -10,7 +10,7 @@ BUILD_DEPENDS="cairo-dev evas-dev" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.enlightenment.org/" -WGET_URL="http://download.enlightenment.org/snapshots/2009-12-02/$TARBALL" +WGET_URL="http://download.enlightenment.org/snapshots/2010-12-03/$TARBALL" # Rules to configure and make the package. compile_rules() @@ -27,9 +27,14 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib + mkdir -p $fs/usr/lib/edje/modules/elm/linux-gnu-i486-1.0.0 \ + $fs/usr/lib/elementary/modules/test_entry/linux-gnu-i486-0.7.0 cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/share $fs/usr cp -a $_pkg/usr/lib/*.so* $fs/usr/lib + cp -a $_pkg/usr/lib/edje/modules/elm/linux-gnu-i486-1.0.0/module.so \ + $fs/usr/lib/edje/modules/elm/linux-gnu-i486-1.0.0 + cp -a $_pkg/usr/lib/elementary/modules/test_entry/linux-gnu-i486-0.7.0/module.so \ + $fs/usr/lib/elementary/modules/test_entry/linux-gnu-i486-0.7.0 cp -a $_pkg/usr/lib/elementary $fs/usr/lib } diff -r c3d23bc104d3 -r d8351aeb23da emotion-dev/receipt --- a/emotion-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/emotion-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="emotion-dev" -VERSION="42672" +VERSION="55225" CATEGORY="development" SHORT_DESC="Devel files from E17 emotion libs." MAINTAINER="pankso@slitaz.org" @@ -12,10 +12,12 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/emotion + mkdir -p $fs/usr/lib/edje/modules/emotion/linux-gnu-i486-1.0.0 cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/lib/*.*a $fs/usr/lib cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib cp -a $_pkg/usr/lib/emotion/*.*a $fs/usr/lib/emotion + cp -a $_pkg/usr/lib/edje/modules/emotion/linux-gnu-i486-1.0.0/*.*a \ + $fs/usr/lib/edje/modules/emotion/linux-gnu-i486-1.0.0 } diff -r c3d23bc104d3 -r d8351aeb23da emotion/receipt --- a/emotion/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/emotion/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,28 +1,21 @@ # SliTaz package receipt. PACKAGE="emotion" -VERSION="42672" +VERSION="55225" CATEGORY="x-window" SHORT_DESC="E17 emotion libs." MAINTAINER="pankso@slitaz.org" DEPENDS="xine-lib xorg-libXp xorg-libXss fribidi edje xorg-libXdamage \ xorg-libXtst gnutls jpeg fontconfig glib eina libtasn1" BUILD_DEPENDS="eet-dev evas-dev ecore-dev embryo-dev edje-dev xine-lib-dev -xorg-libXp-dev xorg-libXss-dev fribidi-dev" +xorg-libXp-dev xorg-libXss-dev fribidi-dev subversion" WEB_SITE="http://www.enlightenment.org/" +WGET_URL="subversion|http://svn.enlightenment.org/svn/e/trunk/$PACKAGE" +BRANCH="$VERSION" # Rules to configure and make the package. compile_rules() { - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-svn-$VERSION.tar.gz - if [ -f $TARBALL ]; then - tar xzf $TARBALL - else - svn co http://svn.enlightenment.org/svn/e/trunk/$PACKAGE \ - -r $VERSION $PACKAGE-$VERSION && - tar czf $TARBALL $PACKAGE-$VERSION - fi cd $src ./autogen.sh \ --prefix=/usr \ @@ -36,9 +29,11 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib/emotion + mkdir -p $fs/usr/lib/edje/modules/emotion/linux-gnu-i486-1.0.0 cp -a $_pkg/usr/share $fs/usr cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/lib/emotion/*.so $fs/usr/lib/emotion + cp -a $_pkg/usr/lib/edje/modules/emotion/linux-gnu-i486-1.0.0/*.so \ + $fs/usr/lib/edje/modules/emotion/linux-gnu-i486-1.0.0 } diff -r c3d23bc104d3 -r d8351aeb23da esmart/receipt --- a/esmart/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/esmart/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,19 +9,12 @@ xorg-libXp libgpg-error xorg-libXtst libtasn1" BUILD_DEPENDS="cairo-dev evas-dev" WEB_SITE="http://www.enlightenment.org/" +WGET_URL="subversion|http://svn.enlightenment.org/svn/e/OLD/$PACKAGE" +BRANCH="$VERSION" # Rules to configure and make the package. compile_rules() { - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-svn-$VERSION.tar.gz - if [ -f $TARBALL ]; then - tar xzf $TARBALL - else - svn co http://svn.enlightenment.org/svn/e/OLD/$PACKAGE \ - -r $VERSION $PACKAGE-$VERSION && - tar czf $TARBALL $PACKAGE-$VERSION - fi cd $src ./autogen.sh \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da ewl-dev/receipt --- a/ewl-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="ewl-dev" -VERSION="42530" -CATEGORY="development" -SHORT_DESC="Devel files from E17 ewl libs." -MAINTAINER="pankso@slitaz.org" -DEPENDS="eet-dev evas-dev ecore-dev embryo-dev edje-dev emotion-dev" -WANTED="ewl" -WEB_SITE="http://www.enlightenment.org/" - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib/ewl - cp -a $_pkg/usr/include $fs/usr - cp -a $_pkg/usr/lib/*.*a $fs/usr/lib - cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib - cp -a $_pkg/usr/lib/ewl $fs/usr/lib - rm $fs/usr/lib/ewl/*/*.so* -} diff -r c3d23bc104d3 -r d8351aeb23da ewl/receipt --- a/ewl/receipt Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="ewl" -VERSION="42530" -CATEGORY="x-window" -SHORT_DESC="The Enlightened Widget Library (E17)." -MAINTAINER="pankso@slitaz.org" -DEPENDS="jpeg ecore eet evas edje efreet emotion libcurl openssl \ -libpng xorg-libXss libidn libcrypto glib xorg-libXp" -BUILD_DEPENDS="cvs subversion eet-dev evas-dev ecore-dev efreet-dev efreet \ -emotion emotion-dev" -WEB_SITE="http://www.enlightenment.org/" - -# Rules to configure and make the package. -compile_rules() -{ - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-svn-$VERSION.tar.gz - if [ -f $TARBALL ]; then - tar xzf $TARBALL - else - svn co http://svn.enlightenment.org/svn/e/trunk/$PACKAGE \ - -r $VERSION $PACKAGE-$VERSION && - tar czf $TARBALL $PACKAGE-$VERSION - fi - cd $src - ./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - $CONFIGURE_ARGS && - make -j 4 && - make DESTDIR=$PWD/_pkg install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib - cp -a $_pkg/etc $fs - cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib - cp -a $_pkg/usr/lib/ewl $fs/usr/lib - rm $fs/usr/lib/ewl/*/*.*a - cp -a $_pkg/usr/share $fs/usr -} diff -r c3d23bc104d3 -r d8351aeb23da faac/receipt --- a/faac/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/faac/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -15,7 +15,7 @@ compile_rules() { cd $src/common/mp4v2 - patch -p0 < ../../../stuff/gcc44.patch || exit 1 + patch -p0 < ../../../stuff/gcc44.patch || return 1 cd ../.. ./configure \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da fcitx-zm/receipt --- a/fcitx-zm/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/fcitx-zm/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,15 +7,11 @@ MAINTAINER="lufeng369" DEPENDS="fcitx" BUILD_DEPENDS="fcitx" -FILE="zm.mb" -URL="http://fcitx.googlecode.com/files/$FILE" +TARBALL="zm.mb" +WGET_URL="http://fcitx.googlecode.com/files/$TARBALL" # Rules to gen a SliTaz package suitable for Tazpkg. compile_rules() { - cd $WOK/$PACKAGE - echo "Downloading Archive" - wget -O $SOURCES_REPOSITORY/$FILE $URL - # re-generate echo -n "Remove All Words,Remained Hanzi only" # mkdir stuff mb2txt $SOURCES_REPOSITORY/zm.mb | awk 'NR<=10{print} NR>10{if(length($2)==3)print}' > stuff/zm.txt @@ -30,6 +26,5 @@ mkdir -p $EXTDIR cp stuff/zm.mb $EXTDIR cp stuff/zm.conf $EXTDIR - } diff -r c3d23bc104d3 -r d8351aeb23da ffmpeg-svn/receipt --- a/ffmpeg-svn/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ffmpeg-svn/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -11,23 +11,13 @@ PROVIDE="ffmpeg" SUGGESTED="ffplay" TAGS="audio video convert stream" +WGET_URL="subversion|svn://svn.ffmpeg.org/ffmpeg/trunk" +BRANCH="$VERSION" # Rules to configure and make the package. compile_rules() { - mkdir -p $src 2> /dev/null - cd $src - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.gz - if [ -f ffmpeg/configure ]; then - true - elif [ -f $TARBALL ]; then - tar xzf $TARBALL - else - svn checkout -r "$VERSION" svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg && - tar czf $TARBALL ffmpeg - fi - - cd ffmpeg + cd $src # make busybox compatible or add coreutils-file-format coreutils-file-special in BUILD_DEPENDS if patch/configure fails patch -Np1 -i ../../stuff/$PACKAGE-$VERSION-mktemp.patch diff -r c3d23bc104d3 -r d8351aeb23da ffmpeg/receipt --- a/ffmpeg/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ffmpeg/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -20,7 +20,7 @@ cd $src # Fix gcc45 build. - patch -p1 < ../stuff/ffmpeg-0.5.1-gcc45.u || exit 1 + patch -p1 < ../stuff/ffmpeg-0.5.1-gcc45.u || return 1 ./configure \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da filezilla/receipt --- a/filezilla/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/filezilla/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,13 +10,12 @@ SOURCE="FileZilla" TARBALL="${SOURCE}_${VERSION}_src.tar.bz2" WEB_SITE="http://filezilla-project.org/" -WGET_URL="http://d10xg45o6p6dbl.cloudfront.net/projects/f/filezilla/$TARBALL" +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" TAGS="ftp client" # Rules to configure and make the package. compile_rules() { - src=$PACKAGE-$VERSION cd $src ./configure \ --prefix=/usr \ @@ -31,7 +30,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - _pkg=$PACKAGE-$VERSION/_pkg mkdir -p $fs/usr/share cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/share/filezilla $fs/usr/share diff -r c3d23bc104d3 -r d8351aeb23da firefox-langpack-fr/receipt --- a/firefox-langpack-fr/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/firefox-langpack-fr/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,38 +7,17 @@ MAINTAINER="lufeng369@gmail.com" DEPENDS="firefox" WEB_SITE="http://www.mozilla.com" -SOURCE="firefox" LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'` LANG_DIR="langpack-$LANG@firefox.mozilla.org" TARBALL="$LANG.xpi" -URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/xpi/$TARBALL" - -# Rules to gen a SliTaz package suitable for Tazpkg. -compile_rules() -{ - cd $WOK/$PACKAGE - mkdir -p $LANG_DIR - - # Get xpi - if [ -f $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi ]; then - echo "Using current langpack ($PACKAGE-$VERSION.xpi)" - else - echo "Downloading langpack ($PACKAGE-$VERSION.xpi)" - wget -O $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi $URL - fi - # Uncompress - echo -n "Uncompressing langpack ($PACKAGE-$VERSION.xpi)" - mkdir -p $LANG_DIR && unzip $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi -d $LANG_DIR - status - -} +WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/xpi/$TARBALL" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions" + EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR" mkdir -p $EXTDIR - cp -a $LANG_DIR $EXTDIR + cp -a $src/* $EXTDIR } post_install() diff -r c3d23bc104d3 -r d8351aeb23da firefox-langpack-zh_CN/receipt --- a/firefox-langpack-zh_CN/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/firefox-langpack-zh_CN/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,38 +7,17 @@ MAINTAINER="lufeng369@gmail.com" DEPENDS="firefox" WEB_SITE="http://www.mozilla.com" -SOURCE="firefox" LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'` LANG_DIR="langpack-$LANG@firefox.mozilla.org" TARBALL="$LANG.xpi" -URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/xpi/$TARBALL" - -# Rules to gen a SliTaz package suitable for Tazpkg. -compile_rules() -{ - cd $WOK/$PACKAGE - mkdir -p $LANG_DIR - - # Get xpi - if [ -f $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi ]; then - echo "Using current langpack ($PACKAGE-$VERSION.xpi)" - else - echo "Downloading langpack ($PACKAGE-$VERSION.xpi)" - wget -O $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi $URL - fi - # Uncompress - echo -n "Uncompressing langpack ($PACKAGE-$VERSION.xpi)" - mkdir -p $LANG_DIR && unzip $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi -d $LANG_DIR - status - -} +WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/xpi/$TARBALL" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions" + EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR" mkdir -p $EXTDIR - cp -a $LANG_DIR $EXTDIR + cp -a $src/* $EXTDIR } post_install() diff -r c3d23bc104d3 -r d8351aeb23da firefox-langpack-zh_TW/receipt --- a/firefox-langpack-zh_TW/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/firefox-langpack-zh_TW/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,38 +7,17 @@ MAINTAINER="lufeng369@gmail.com" DEPENDS="firefox" WEB_SITE="http://www.mozilla.com" -SOURCE="firefox" LANG=`echo $PACKAGE | cut -d'-' -f3 | tr '_' '-'` LANG_DIR="langpack-$LANG@firefox.mozilla.org" TARBALL="$LANG.xpi" -URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/xpi/$TARBALL" - -# Rules to gen a SliTaz package suitable for Tazpkg. -compile_rules() -{ - cd $WOK/$PACKAGE - mkdir -p $LANG_DIR - - # Get xpi - if [ -f $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi ]; then - echo "Using current langpack ($PACKAGE-$VERSION.xpi)" - else - echo "Downloading langpack ($PACKAGE-$VERSION.xpi)" - wget -O $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi $URL - fi - # Uncompress - echo -n "Uncompressing langpack ($PACKAGE-$VERSION.xpi)" - mkdir -p $LANG_DIR && unzip $SOURCES_REPOSITORY/$PACKAGE-$VERSION.xpi -d $LANG_DIR - status - -} +WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/linux-i686/xpi/$TARBALL" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions" + EXTDIR="$fs/usr/lib/$SOURCE-$VERSION/extensions/$LANG_DIR" mkdir -p $EXTDIR - cp -a $LANG_DIR $EXTDIR + cp -a $src/* $EXTDIR } post_install() diff -r c3d23bc104d3 -r d8351aeb23da fltk-2.0.x-dev/receipt --- a/fltk-2.0.x-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/fltk-2.0.x-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fltk-2.0.x-dev" -VERSION="r6671" +VERSION="r7725" CATEGORY="development" SHORT_DESC="Fast Light Tool Kit devel files (FLZK 2.0)." WANTED="fltk-2.0.x" diff -r c3d23bc104d3 -r d8351aeb23da fltk-2.0.x-fluid2/receipt --- a/fltk-2.0.x-fluid2/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/fltk-2.0.x-fluid2/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fltk-2.0.x-fluid2" -VERSION="r6671" +VERSION="r7725" CATEGORY="development" SHORT_DESC="Fast Light Tool Kit designer 2.0 serie." WANTED="fltk-2.0.x" diff -r c3d23bc104d3 -r d8351aeb23da fltk-2.0.x-gl/receipt --- a/fltk-2.0.x-gl/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/fltk-2.0.x-gl/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="fltk-2.0.x-gl" -VERSION="r6671" +VERSION="r7725" CATEGORY="x-window" SHORT_DESC="Fast Light Tool Kit GL library." WANTED="fltk-2.0.x" diff -r c3d23bc104d3 -r d8351aeb23da fltk-2.0.x/receipt --- a/fltk-2.0.x/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/fltk-2.0.x/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,14 +1,14 @@ # SliTaz package receipt. PACKAGE="fltk-2.0.x" -VERSION="r6671" +VERSION="r7725" CATEGORY="system-tools" SHORT_DESC="Fast Light Tool Kit (provide fluid)." MAINTAINER="pankso@slitaz.org" DEPENDS="expat fontconfig freetype jpeg xorg-libX11 xorg-libXau xorg-libXdmcp \ xorg-libXext xorg-libXft xorg-libXrender zlib libpng xorg-libXi \ xorg-libXinerama gcc-lib-base" -BUILD_DEPENDS="xorg-dev xorg-libXft-dev mesa mesa-dev" +BUILD_DEPENDS="xorg-dev xorg-libXft-dev libglu-mesa mesa mesa-dev" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.fltk.org/" WGET_URL="http://ftp.easysw.com/pub/fltk/snapshots/$TARBALL" @@ -17,7 +17,13 @@ compile_rules() { cd $src - patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1 + patch -p0 src/filename_list.cxx < int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort); +EOF + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff -r c3d23bc104d3 -r d8351aeb23da fltk-2.0.x/stuff/filename_list-dirent.patch --- a/fltk-2.0.x/stuff/filename_list-dirent.patch Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- src/filename_list.cxx 2009-09-24 21:22:26.000000000 +0200 -+++ src/filename_list.cxx 2009-09-24 21:28:12.000000000 +0200 -@@ -63,7 +63,7 @@ - // some Unix systems): - int n = scandir(d, list, 0, sort); - #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__) -- int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); -+ int n = scandir(d, list, 0, (int(*)(const dirent **,const dirent **))sort); - #elif defined(__hpux) || defined(__CYGWIN__) - // HP-UX, Cygwin define the comparison function like this: - int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); diff -r c3d23bc104d3 -r d8351aeb23da fltk/receipt --- a/fltk/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/fltk/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -16,7 +16,7 @@ compile_rules() { cd $src - patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1 + patch -p 0 < ../stuff/filename_list-dirent.patch || return 1 ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff -r c3d23bc104d3 -r d8351aeb23da ftjam/receipt --- a/ftjam/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ftjam/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,6 +7,7 @@ SHORT_DESC=="FT Jam - an enhanced version of the Jam build tool" WEB_SITE="http://freetype.org/jam/" DEPENDS="glibc-base" +BUILD_DEPENDS="bison" PROVIDE="jam" TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="http://david.freetype.org/jam/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da gcc/receipt --- a/gcc/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/gcc/receipt Thu Feb 17 19:08:45 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 } @@ -106,7 +106,7 @@ { # Use libiberty.a from binutils. sed -i 's/install_to_$(INSTALL_DEST) //' \ - $PACKAGE-$VERSION/libiberty/Makefile.in || exit 1 + $PACKAGE-$VERSION/libiberty/Makefile.in || return 1 mkdir -p gcc-build && cd gcc-build $src/configure --enable-nls \ --enable-languages=c,c++,objc,fortran --enable-shared --with-system-zlib \ diff -r c3d23bc104d3 -r d8351aeb23da gens-gs/receipt --- a/gens-gs/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/gens-gs/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -5,7 +5,7 @@ CATEGORY="games" SHORT_DESC="An emulator for Sega Genesis, Sega CD and 32X." MAINTAINER="slaxemulator@gmail.com" -DEPENDS="gtk+ libsdl" +DEPENDS="gtk+ libsdl libglu-mesa" BUILD_DEPENDS="gtk+-dev libsdl libsdl-dev nasm autoconf automake" _VERSION=gs-r7 TARBALL="Gens-${_VERSION}.tar.gz" @@ -15,15 +15,11 @@ # Rules to configure and make the package. compile_rules() { - ln -s $WOK/$PACKAGE/gens-${_VERSION} $WOK/$PACKAGE/$PACKAGE-$VERSION cd $src + patch -Np1 -i ../stuff/gens-gtk.patch || return 1 chmod +x install-sh - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && - make && make DESTDIR=$PWD/_pkg install + ./configure && + make && make -j1 DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da gens-gs/stuff/gens-gtk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gens-gs/stuff/gens-gtk.patch Thu Feb 17 19:08:45 2011 +0100 @@ -0,0 +1,134 @@ +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp +--- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); ++ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)about_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); ++ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)bmf_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 +@@ -110,7 +110,7 @@ + gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); ++ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(dir_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 +@@ -138,7 +138,7 @@ + gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); + gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); ++ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)genopt_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 +@@ -157,9 +157,9 @@ + GSFT_UNUSED_PARAMETER(y); + GSFT_UNUSED_PARAMETER(user_data); + +- if (context->targets) ++ if (gdk_drag_context_list_targets(context)) + { +- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); ++ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); + gtk_drag_get_data(widget, context, target_type, time); + return true; + } +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 +@@ -75,7 +75,7 @@ + gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); ++ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(glres_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 +@@ -80,8 +80,7 @@ + // Callbacks. + static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); + static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data); ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); + static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); + static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); + +@@ -119,7 +118,7 @@ + gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); ++ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)pmgr_window, "delete_event", +@@ -559,11 +558,9 @@ + * @param page_num New notebook page index. + * @param user_data User data. + */ +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data) ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) + { + GSFT_UNUSED_PARAMETER(notebook); +- GSFT_UNUSED_PARAMETER(page); + GSFT_UNUSED_PARAMETER(user_data); + + // Activate the "cursor-changed" callback for the page. +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 +@@ -94,7 +94,7 @@ + gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); ++ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(selcd_window), "delete_event", +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 +@@ -111,7 +111,7 @@ + gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); ++ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); + + // Add the window icon. + GList *icon_list = NULL; diff -r c3d23bc104d3 -r d8351aeb23da get-google-earth/receipt --- a/get-google-earth/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/get-google-earth/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -5,7 +5,7 @@ CATEGORY="non-free" SHORT_DESC="Get Google Earth." MAINTAINER="pascal.bellard@slitaz.org" -DEPENDS="bzip2 xfree86-base-fonts" +DEPENDS="bzip2 xorg-base-fonts" WEB_SITE="http://earth.google.com/" TAGS="map visualization" diff -r c3d23bc104d3 -r d8351aeb23da gftp/receipt --- a/gftp/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/gftp/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -34,9 +34,8 @@ # Copy custom bookmarks file and remove license, big logo. cp -a stuff/bookmarks $fs/usr/share/gftp cp -a stuff/gftp $fs/usr/share - ln -s ../../../../../../../../usr/share/gftp/gftp-mini-logo.xpm \ + ln -sf /usr/share/gftp/gftp-mini-logo.xpm \ $fs/usr/share/gftp/gftp-logo.xpm rm -f $fs/usr/share/gftp/COPYING - rm -f $fs/usr/share/gftp/gftp-logo.xpm rm -f $fs/usr/share/gftp/gftp.xpm } diff -r c3d23bc104d3 -r d8351aeb23da ghostscript-dev/receipt --- a/ghostscript-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ghostscript-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="ghostscript-dev" -VERSION="9.00" +VERSION="9.01" CATEGORY="development" SHORT_DESC="Ghostscript devel file" MAINTAINER="jozee@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da ghostscript/receipt --- a/ghostscript/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ghostscript/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,16 +1,16 @@ # SliTaz package receipt. PACKAGE="ghostscript" -VERSION="9.00" +VERSION="9.01" CATEGORY="office" SHORT_DESC="Ghostscript tools and utilities." MAINTAINER="jozee@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tar.xz" +TARBALL="$PACKAGE-$VERSION.tar.bz2" DEPENDS="gtk+ expat fontconfig freetype gnutls jpeg libgcrypt libgpg-error \ libpng tiff zlib cups xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ -xorg-libXdmcp xorg-libXext xorg-libXt gcc-lib-base jasper" +xorg-libXdmcp xorg-libXext xorg-libXt gcc-lib-base jasper jbig2dec" # build depends are optional ; ghostscripts still build but does not compile in cups support -BUILD_DEPENDS="cairo-dev gtk+-dev xorg-dev expat-dev fontconfig-dev freetype-dev gnutls-dev jpeg-dev libgcrypt-dev libgpg-error-dev libpng-dev tiff-dev zlib-dev cups-dev jasper-dev" +BUILD_DEPENDS="cairo-dev gtk+-dev xorg-dev expat-dev fontconfig-dev freetype-dev gnutls-dev jpeg-dev libgcrypt-dev libgpg-error-dev libpng-dev tiff-dev zlib-dev cups-dev jbig2dec jasper-dev" WEB_SITE="http://pages.cs.wisc.edu/~ghost/" #WGET_URL="http://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs862/$TARBALL" WGET_URL="http://ghostscript.com/releases/$TARBALL" @@ -21,10 +21,7 @@ { cd $src # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat - - # fix build with system jasper - patch -Np1 -i ../stuff/ghostscript-system-jasper.patch + rm -rf jpeg libpng zlib jasper expat tiff # --disable-compile-inits is needed for linking with system-zlib diff -r c3d23bc104d3 -r d8351aeb23da git-gui/receipt --- a/git-gui/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/git-gui/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -6,25 +6,21 @@ MAINTAINER="ben@seawolfsanctuary.com" DEPENDS="tk git" BUILD_DEPENDS="$DEPENDS" -TARBALL="master.tar.gz" WEB_SITE="http://www.kernel.org/pub/software/scm/git/docs/git-gui.html" -WGET_URL="http://repo.or.cz/w/git-gui.git/snapshot/$TARBALL" +WGET_URL="git|http://repo.or.cz/r/git-gui.git" +BRANCH="gitgui-$VERSION" # Rules to configure and make the package. compile_rules() { - cd $PACKAGE + cd $src make clean make && make DESTDIR=$PWD/_pkg install - cd .. } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - # Need to create a shortcut; change with each release :-( - ln -s $PACKAGE $PACKAGE-$VERSION - mkdir -p $fs cp -a $_pkg/usr $fs/ diff -r c3d23bc104d3 -r d8351aeb23da git/receipt --- a/git/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/git/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="git" -VERSION="1.7.4" +VERSION="1.7.4.1" CATEGORY="development" SHORT_DESC="Fast version control system" MAINTAINER="b1+slitaz@nagel.org" diff -r c3d23bc104d3 -r d8351aeb23da glade3/receipt --- a/glade3/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/glade3/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -6,11 +6,11 @@ SHORT_DESC="Vector drawing application." MAINTAINER="pankso@slitaz.org" DEPENDS="gtk+ libglade xorg-libXdamage" -BUILD_DEPENDS="gtk+-dev libglade-dev intltool libxml2-dev expat-dev" +BUILD_DEPENDS="gtk+-dev libglade-dev intltool libxml2-dev expat-dev python" SUGGESTED="python" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://glade.gnome.org/" -WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL" +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" # Rules to configure and make the package. compile_rules() diff -r c3d23bc104d3 -r d8351aeb23da glew-dev/receipt --- a/glew-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/glew-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glew-dev" -VERSION="1.5.7" +VERSION="1.5.8" CATEGORY="development" SHORT_DESC="The OpenGL Extension Wrangler Library. (devel files)" MAINTAINER="pascal.bellard@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da glew/receipt --- a/glew/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/glew/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="glew" -VERSION="1.5.7" +VERSION="1.5.8" CATEGORY="x-window" SHORT_DESC="The OpenGL Extension Wrangler Library." MAINTAINER="pascal.bellard@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da gnome-menus/receipt --- a/gnome-menus/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/gnome-menus/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -5,8 +5,8 @@ CATEGORY="x-window" SHORT_DESC="GNOME menu libs and tools (without desktop files)." MAINTAINER="pankso@slitaz.org" -DEPENDS="python gamin glib" -BUILD_DEPENDS="perl perl-xml-parser python-dev glib glib-dev" +DEPENDS="python gamin glib libgio" +BUILD_DEPENDS="intltool" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.gnome.org/" WGET_URL="http://ftp.gnome.org/pub/GNOME/desktop/${VERSION%.*}/$VERSION/sources/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da gparted/receipt --- a/gparted/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/gparted/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="gparted" -VERSION="0.7.1" +VERSION="0.8.0" CATEGORY="system-tools" SHORT_DESC="GTK partition editor." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da grub2/receipt --- a/grub2/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/grub2/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -8,7 +8,7 @@ MAINTAINER="pascal.bellard@slitaz.org" TARBALL="$SOURCE-$VERSION.tar.gz" DEPENDS="zlib freetype ncurses libusb-compat libusb" -BUILD_DEPENDS="zlib-dev freetype-dev ncurses-dev libusb-compat-dev libusb-dev" +BUILD_DEPENDS="bison zlib-dev freetype-dev ncurses-dev libusb-compat-dev libusb-dev" WEB_SITE="http://www.gnu.org/software/grub/" WGET_URL="ftp://alpha.gnu.org/gnu/grub/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da gtkdialog/receipt --- a/gtkdialog/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/gtkdialog/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -16,7 +16,7 @@ { cd $src # Fix libgalde support - patch -p 0 < ../stuff/glade_support.patch || exit 1 + patch -p 0 < ../stuff/glade_support.patch || return 1 ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ diff -r c3d23bc104d3 -r d8351aeb23da guile/receipt --- a/guile/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/guile/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -16,7 +16,7 @@ cd $src # http://bugs.gentoo.org/show_bug.cgi?id=317175 - patch -p1 < ../stuff/guile-1.8.7-gcc45.u || exit 1 + patch -p1 < ../stuff/guile-1.8.7-gcc45.u || return 1 ./configure \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da hal/receipt --- a/hal/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/hal/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -27,8 +27,8 @@ { cd $src zcat /usr/share/misc/pci.ids.gz > /usr/share/misc/pci.ids && - patch -p1 < ../stuff/hal-scripts.u || exit 1 && - #patch -p1 < ../stuff/hal-udev.patch || exit 1 && + patch -p1 < ../stuff/hal-scripts.u || return 1 && + #patch -p1 < ../stuff/hal-udev.patch || return 1 && grep -qs 'define u8' hald/linux/probing/linux_dvd_rw_utils.c || sed -i 's|#include |#define u8 __u8\n&|' \ hald/linux/probing/linux_dvd_rw_utils.c diff -r c3d23bc104d3 -r d8351aeb23da hardinfo/receipt --- a/hardinfo/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/hardinfo/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -17,7 +17,7 @@ cd $src while read file; do [ -f done.$file ] && continue - patch -p0 < ../stuff/$file || exit 1 + patch -p0 < ../stuff/$file || return 1 touch done.$file done < /dev/null - mkdir slitaz + [ -d $WOK/$PACKAGE/slitaz ] && rm -rf $WOK/$PACKAGE/slitaz 2> /dev/null + mkdir $WOK/$PACKAGE/slitaz echo "$WGET_URL" > slitaz/url - cp ../stuff/gztazmod.sh ../stuff/list_modules.sh slitaz - cp ../stuff/bootloader.sh slitaz + cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/slitaz + cp $stuff/bootloader.sh $WOK/$PACKAGE/slitaz # Apply patches + report step "Applying patches" while read patch_file; do - echo "$patch_file" >> slitaz/patches - cp ../stuff/$patch_file slitaz + echo "$patch_file" >> $WOK/$PACKAGE/slitaz/patches + cp $stuff/$patch_file $WOK/$PACKAGE/slitaz if [ -f done.$patch_file ]; then echo "Skipping $patch_file" continue fi echo "Apply $patch_file" - patch -p1 < slitaz/$patch_file || exit 1 + patch -p1 < $WOK/$PACKAGE/slitaz/$patch_file || { report close-bloc; return 1; } touch done.$patch_file done < /dev/null mv arch/x86/boot/bzImage $PWD/_pkg/boot/vmlinuz-$VERSION-slitaz # Compress all modules. - $WOK/$PACKAGE/stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz + report step "Compressing all modules" + $stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz ln System.map System.map-modules ln Module.symvers Module.symvers-modules + report close-bloc } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -119,13 +115,14 @@ # Get the base modules export src export _pkg - $src/slitaz/list_modules.sh \ - $(cat stuff/modules-$VERSION.list) > $src/modules.list + mkdir $WOK/tmp + $WOK/$PACKAGE/stuff/list_modules.sh \ + $(cat stuff/modules-$VERSION.list) > $WOK/tmp/modules.list while read module; do dir=$(dirname $module) [ -d $path/$dir ] || mkdir -p $path/$dir cp -a $_pkg/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir - done < $src/modules.list + done < $WOK/tmp/modules.list # Remove unresolved links rm -f $fs/lib/modules/$VERSION-slitaz/build rm -f $fs/lib/modules/$VERSION-slitaz/source diff -r c3d23bc104d3 -r d8351aeb23da linux/stuff/check_modules.sh --- a/linux/stuff/check_modules.sh Thu Feb 17 15:35:13 2011 +0100 +++ b/linux/stuff/check_modules.sh Thu Feb 17 19:08:45 2011 +0100 @@ -4,48 +4,51 @@ # 20090618 # 20100528 # -WOK=$(cd `basedir $0` && pwd | sed 's/wok.*/wok/') +#. /etc/slitaz/slitaz.conf + +#WOK=$LOCAL_REPOSITORY/wok +WOK=$(cd `dirname $0` && pwd | sed 's/wok.*/wok/') VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` src="$WOK/linux/linux-$VERSION" cd $src -mkdir -p ../tmp -rm -f ../tmp/* +mkdir -p $WOK/tmp +rm -f $WOK/tmp/* echo -e "\nChecking for modules selected in .config but not in linux-* pkgs" echo "======================================================================" # create a packaged modules list -cat ../stuff/modules-"$VERSION".list >> ../tmp/pkgs-modules-"$VERSION".list +cat ../stuff/modules-"$VERSION".list >> $WOK/tmp/pkgs-modules-"$VERSION".list for i in $(cd $WOK; ls -d linux-*) do tazpath="taz/$i-$VERSION" for j in $(cat $WOK/$i/$tazpath/files.list | grep ".ko.gz") do - basename $j >> ../tmp/pkgs-modules-"$VERSION".list + basename $j >> $WOK/tmp/pkgs-modules-"$VERSION".list done done # get the original list in .config for i in $(find $_pkg -iname "*.ko.gz") do - basename $i >> ../tmp/originial-"$VERSION".list + basename $i >> $WOK/tmp/originial-"$VERSION".list done # compare original .config and pkged modules -for i in $(cat ../tmp/originial-$VERSION.list) +for i in $(cat $WOK/tmp/originial-$VERSION.list) do - if ! grep -qs "$i" ../tmp/pkgs-modules-"$VERSION".list ; then + if ! grep -qs "$i" $WOK/tmp/pkgs-modules-"$VERSION".list ; then modpath=`find $_pkg -iname "$i"` echo "Orphan module: $i" - echo "$i : $modpath" >> ../tmp/unpackaged-modules-"$VERSION".list + echo "$i : $modpath" >> $WOK/tmp/unpackaged-modules-"$VERSION".list fi done -if [ -f ../tmp/unpackaged-modules-"$VERSION".list ]; then +if [ -f $WOK/tmp/unpackaged-modules-"$VERSION".list ]; then echo "======================================================================" echo -e "Check linux/tmp/unpackaged-modules-$VERSION.list for mod path\n" else echo -e "\nAll modules are packaged\n" echo "======================================================================" echo "" - rm -rf ../tmp + rm -rf $WOK/tmp fi diff -r c3d23bc104d3 -r d8351aeb23da linux/stuff/linux-2.6.37-slitaz.config --- a/linux/stuff/linux-2.6.37-slitaz.config Thu Feb 17 15:35:13 2011 +0100 +++ b/linux/stuff/linux-2.6.37-slitaz.config Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.37 Kernel Configuration -# Sat Jan 22 20:57:39 2011 +# Mon Feb 14 03:03:39 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2312,96 +2312,97 @@ # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set CONFIG_HWMON=m -# CONFIG_HWMON_VID is not set +CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set # # Native drivers # -# CONFIG_SENSORS_ABITUGURU is not set -# CONFIG_SENSORS_ABITUGURU3 is not set -# CONFIG_SENSORS_AD7414 is not set -# CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1029 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ADT7411 is not set -# CONFIG_SENSORS_ADT7462 is not set -# CONFIG_SENSORS_ADT7470 is not set -# CONFIG_SENSORS_ADT7475 is not set -# CONFIG_SENSORS_ASC7621 is not set +CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ABITUGURU3=m +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +CONFIG_SENSORS_ADM1021=m +CONFIG_SENSORS_ADM1025=m +CONFIG_SENSORS_ADM1026=m +CONFIG_SENSORS_ADM1029=m +CONFIG_SENSORS_ADM1031=m +CONFIG_SENSORS_ADM9240=m +CONFIG_SENSORS_ADT7411=m +CONFIG_SENSORS_ADT7462=m +CONFIG_SENSORS_ADT7470=m +CONFIG_SENSORS_ADT7475=m +CONFIG_SENSORS_ASC7621=m CONFIG_SENSORS_K8TEMP=m -# CONFIG_SENSORS_K10TEMP is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_I5K_AMB is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_F71882FG is not set -# CONFIG_SENSORS_F75375S is not set -# CONFIG_SENSORS_FSCHMD is not set -# CONFIG_SENSORS_G760A is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_GPIO_FAN is not set +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_DS1621=m +CONFIG_SENSORS_I5K_AMB=m +CONFIG_SENSORS_F71805F=m +CONFIG_SENSORS_F71882FG=m +CONFIG_SENSORS_F75375S=m +CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m +CONFIG_SENSORS_GL518SM=m +CONFIG_SENSORS_GL520SM=m +CONFIG_SENSORS_GPIO_FAN=m CONFIG_SENSORS_CORETEMP=m -# CONFIG_SENSORS_PKGTEMP is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_JC42 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM73 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_LM93 is not set -# CONFIG_SENSORS_LTC4215 is not set -# CONFIG_SENSORS_LTC4245 is not set -# CONFIG_SENSORS_LTC4261 is not set -# CONFIG_SENSORS_LM95241 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_MAX6650 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_PC87427 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_SHT15 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMM665 is not set -# CONFIG_SENSORS_DME1737 is not set -# CONFIG_SENSORS_EMC1403 is not set -# CONFIG_SENSORS_EMC2103 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47M192 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_ADS7828 is not set -# CONFIG_SENSORS_AMC6821 is not set -# CONFIG_SENSORS_THMC50 is not set -# CONFIG_SENSORS_TMP102 is not set -# CONFIG_SENSORS_TMP401 is not set -# CONFIG_SENSORS_TMP421 is not set -# CONFIG_SENSORS_VIA_CPUTEMP is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_VT1211 is not set -# CONFIG_SENSORS_VT8231 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83791D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83793 is not set -# CONFIG_SENSORS_W83795 is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83L786NG is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_SENSORS_LIS3_I2C is not set -# CONFIG_SENSORS_APPLESMC is not set +CONFIG_SENSORS_PKGTEMP=m +CONFIG_SENSORS_IT87=m +CONFIG_SENSORS_JC42=m +CONFIG_SENSORS_LM63=m +CONFIG_SENSORS_LM73=m +CONFIG_SENSORS_LM75=m +CONFIG_SENSORS_LM77=m +CONFIG_SENSORS_LM78=m +CONFIG_SENSORS_LM80=m +CONFIG_SENSORS_LM83=m +CONFIG_SENSORS_LM85=m +CONFIG_SENSORS_LM87=m +CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_LM92=m +CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4215=m +CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LTC4261=m +CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_PC87360=m +CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_SHT15=m +CONFIG_SENSORS_SIS5595=m +CONFIG_SENSORS_SMM665=m +CONFIG_SENSORS_DME1737=m +CONFIG_SENSORS_EMC1403=m +CONFIG_SENSORS_EMC2103=m +CONFIG_SENSORS_SMSC47M1=m +CONFIG_SENSORS_SMSC47M192=m +CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_ADS7828=m +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_THMC50=m +CONFIG_SENSORS_TMP102=m +CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m +CONFIG_SENSORS_VIA_CPUTEMP=m +CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT1211=m +CONFIG_SENSORS_VT8231=m +CONFIG_SENSORS_W83781D=m +CONFIG_SENSORS_W83791D=m +CONFIG_SENSORS_W83792D=m +CONFIG_SENSORS_W83793=m +CONFIG_SENSORS_W83795=m +# CONFIG_SENSORS_W83795_FANCTRL is not set +CONFIG_SENSORS_W83L785TS=m +CONFIG_SENSORS_W83L786NG=m +CONFIG_SENSORS_W83627HF=m +CONFIG_SENSORS_W83627EHF=m +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_SENSORS_APPLESMC=m # # ACPI drivers @@ -3191,7 +3192,22 @@ # # Speakup console speech # -# CONFIG_SPEAKUP is not set +CONFIG_SPEAKUP=m +CONFIG_SPEAKUP_SYNTH_ACNTSA=m +CONFIG_SPEAKUP_SYNTH_ACNTPC=m +CONFIG_SPEAKUP_SYNTH_APOLLO=m +CONFIG_SPEAKUP_SYNTH_AUDPTR=m +CONFIG_SPEAKUP_SYNTH_BNS=m +CONFIG_SPEAKUP_SYNTH_DECTLK=m +CONFIG_SPEAKUP_SYNTH_DECEXT=m +CONFIG_SPEAKUP_SYNTH_DECPC=m +CONFIG_SPEAKUP_SYNTH_DTLK=m +CONFIG_SPEAKUP_SYNTH_KEYPC=m +CONFIG_SPEAKUP_SYNTH_LTLK=m +CONFIG_SPEAKUP_SYNTH_SOFT=m +CONFIG_SPEAKUP_SYNTH_SPKOUT=m +CONFIG_SPEAKUP_SYNTH_TXPRT=m +CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ASUS_LAPTOP=m diff -r c3d23bc104d3 -r d8351aeb23da linux/stuff/modules-2.6.37.list --- a/linux/stuff/modules-2.6.37.list Thu Feb 17 15:35:13 2011 +0100 +++ b/linux/stuff/modules-2.6.37.list Thu Feb 17 19:08:45 2011 +0100 @@ -6,7 +6,6 @@ drivers/char/rtc.ko.gz drivers/hwmon/coretemp.ko.gz drivers/hwmon/hwmon.ko.gz -drivers/hwmon/k8temp.ko.gz drivers/input/mouse/inport.ko.gz drivers/input/mouse/logibm.ko.gz drivers/input/mouse/pc110pad.ko.gz diff -r c3d23bc104d3 -r d8351aeb23da lmms/receipt --- a/lmms/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/lmms/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="lmms" -VERSION="0.4.9" +VERSION="0.4.10" CATEGORY="multimedia" SHORT_DESC="The Linux MultiMedia Studio" MAINTAINER="slaxemulator@gmail.com" diff -r c3d23bc104d3 -r d8351aeb23da lorcon/receipt --- a/lorcon/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/lorcon/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,18 +7,12 @@ MAINTAINER="slaxemulator@gmail.com" BUILD_DEPENDS="subversion" WEB_SITE="http://802.11ninja.net/lorcon/" +WGET_URL="subversion|http://802.11ninja.net/svn/lorcon/trunk" +BRANCH="$VERSION" # Rules to configure and make the package. compile_rules() { - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma - if [ -f $TARBALL ]; then - unlzma -c $TARBALL | tar xf - - else - svn checkout -r $VERSION \ - http://802.11ninja.net/svn/lorcon/trunk $PACKAGE-$VERSION - tar cf - $PACKAGE-$VERSION | lzma e $TARBALL -si - fi cd $src ./configure \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da lrzip/receipt --- a/lrzip/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/lrzip/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="lrzip" -VERSION="0.46" +VERSION="0.552" CATEGORY="utilities" SHORT_DESC="lrzip is a file compression program designed to do particularly well on very large files containing long distance redundancy" MAINTAINER="devel@slitaz.org" @@ -16,10 +16,9 @@ compile_rules() { cd $src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS && + ./configure && make && - make DESTDIR=$PWD/_pkg install + make DESTDIR=$DESTDIR install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da lvm2/receipt --- a/lvm2/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/lvm2/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -2,7 +2,7 @@ PACKAGE="lvm2" SOURCE="LVM2" -VERSION="2.02.82" +VERSION="2.02.84" CATEGORY="system-tools" SHORT_DESC="Linux Logical Volume Manager." MAINTAINER="guillaume.michon@laposte.net" diff -r c3d23bc104d3 -r d8351aeb23da lxml/receipt --- a/lxml/receipt Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="lxml" -VERSION="2.2.8" -CATEGORY="development" -SHORT_DESC="Python bindings for libxml2 and libxslt libraries." -MAINTAINER="pascal.bellard@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tgz" -WEB_SITE="http://codespeak.net/lxml/" -WGET_URL="http://launchpad.net/$PACKAGE/2.2/2.2.8/+download/$TARBALL" -DEPENDS="python libxml2 libxslt zlib" -BUILD_DEPENDS="python python-dev libxml2-dev libxslt-dev" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - python setup.py build && - python setup.py install --root=$PWD/_pkg -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $_pkg/usr $fs -} - diff -r c3d23bc104d3 -r d8351aeb23da mingw32-ada/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mingw32-ada/receipt Thu Feb 17 19:08:45 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 c3d23bc104d3 -r d8351aeb23da mingw32-g++/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mingw32-g++/receipt Thu Feb 17 19:08:45 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 c3d23bc104d3 -r d8351aeb23da mingw32-gcc-c/receipt --- a/mingw32-gcc-c/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mingw32-gcc-c/receipt Thu Feb 17 19:08:45 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" @@ -24,7 +24,7 @@ { if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string" - exit 1 + return 1 fi rm -f -r $src/binutils diff -r c3d23bc104d3 -r d8351aeb23da mingw32-gcc/receipt --- a/mingw32-gcc/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mingw32-gcc/receipt Thu Feb 17 19:08:45 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" @@ -25,37 +28,23 @@ { if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string" - exit 1 + 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" - exit 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 c3d23bc104d3 -r d8351aeb23da mingw32-runtime/receipt --- a/mingw32-runtime/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mingw32-runtime/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -23,7 +23,7 @@ { if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string" - exit 1 + return 1 fi rm -f -r $src/binutils diff -r c3d23bc104d3 -r d8351aeb23da mingw32-w32api/receipt --- a/mingw32-w32api/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mingw32-w32api/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -23,7 +23,7 @@ { if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string" - exit 1 + return 1 fi rm -f -r $src/binutils diff -r c3d23bc104d3 -r d8351aeb23da mlt/receipt --- a/mlt/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mlt/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -6,7 +6,7 @@ MAINTAINER="jozee@slitaz.org" SHORT_DESC="An open source multimedia framework" WEB_SITE="http://www.mltframework.org" -DEPENDS="libsdl-image libsamplerate libdv qt sox libxml2 gtk+ ffmpeg-svn frei0r-plugins" +DEPENDS="libsdl-image libsamplerate libdv qt4 sox libxml2 gtk+ ffmpeg-svn frei0r-plugins" BUILD_DEPENDS="libsamplerate-dev libdv-dev sox-dev Qt4-dev libxml2-dev gtk+-dev ffmpeg-svn-dev libsdl-image-dev frei0r-plugins-dev" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da mplayer-codecs/receipt --- a/mplayer-codecs/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mplayer-codecs/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,24 +7,15 @@ MAINTAINER="pankso@slitaz.org" DEPENDS="mplayer" WEB_SITE="http://www.mplayerhq.hu/design7/news.html" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-20071007.tar.bz2" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib/mplayer/codecs - if [ ! -f $SOURCES_REPOSITORY/all-20071007.tar.bz2 ]; then - wget -P $SOURCES_REPOSITORY \ - http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-20071007.tar.bz2 - fi - tar xjf $SOURCES_REPOSITORY/all-20071007.tar.bz2 \ - -C $WOK/$PACKAGE - cp -a all-20071007/* $fs/usr/lib/mplayer/codecs + cp -a $src/* $fs/usr/lib/mplayer/codecs # remove codec depending on libstdc++.so.5 rm -f $fs/usr/lib/mplayer/codecs/drvc.so rm -f $fs/usr/lib/mplayer/codecs/cook.so -} - -clean_wok() -{ - rm -rf all-20071007 -} +} \ No newline at end of file diff -r c3d23bc104d3 -r d8351aeb23da mplayer-svn/receipt --- a/mplayer-svn/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mplayer-svn/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -13,6 +13,8 @@ WEB_SITE="http://www.mplayerhq.hu/design7/news.html" PROVIDES="mplayer" TAGS="player movie audio video" +WGET_URL="subversion|svn://svn.mplayerhq.hu/mplayer/trunk" +BRANCH="$VERSION" # Rules to configure and make the package. # @@ -27,14 +29,6 @@ compile_rules() { - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.lzma - if [ -f $TARBALL ]; then - unlzma -c $TARBALL | tar xf - - else - svn checkout -r $VERSION \ - svn://svn.mplayerhq.hu/mplayer/trunk $PACKAGE-$VERSION && - tar cf - $PACKAGE-$VERSION | lzma e $TARBALL -si - fi cd $src KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` sed -i "s/uname -r/echo $KERNEL_VERSION-slitaz/" configure diff -r c3d23bc104d3 -r d8351aeb23da mupdf/receipt --- a/mupdf/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/mupdf/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,7 +7,7 @@ MAINTAINER="jozee@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.gz" DEPENDS="freetype jpeg zlib jbig2dec openjpeg" -BUILD_DEPENDS="freetype-dev jpeg-dev openjpeg-dev jbig2dec-dev zlib-dev pkg-config xorg-libX11-dev xorg-xextproto ftjam" +BUILD_DEPENDS="freetype-dev jpeg-dev openjpeg-dev jbig2dec-dev zlib-dev pkg-config xorg-libX11-dev xorg-libXext-dev xorg-xextproto ftjam" WEB_SITE="http://mupdf.com/" WGET_URL="http://mupdf.com/download/$TARBALL" diff -r c3d23bc104d3 -r d8351aeb23da nagios-nrpe/receipt --- a/nagios-nrpe/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/nagios-nrpe/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -18,7 +18,7 @@ cd $src while read patch_file; do if [ ! -f done.$patch_file ]; then - patch -p1 < ../stuff/$patch_file || exit 1 + patch -p1 < ../stuff/$patch_file || return 1 touch done.$patch_file fi done < $fs/usr/bin/tyrian < $fs/usr/bin/opentyrian < +Date: Thu, 4 Nov 2010 15:38:57 +1000 +Subject: [PATCH] Add Postgresql 8.x and 9 supports + +Change-Id: Ic740686ead768cc3e106703049d878549dfd3c6a +Task-number:QTBUG-14206 +Reviewed-by: Michael Goddard +--- + src/sql/drivers/psql/qsql_psql.cpp | 116 +++++++++++++++++++++--------- + src/sql/drivers/psql/qsql_psql.h | 6 ++- + tests/auto/qsqldatabase/tst_databases.h | 2 + + 3 files changed, 88 insertions(+), 36 deletions(-) + +diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp +index 2a4e595..bf9685f 100644 +--- a/src/sql/drivers/psql/qsql_psql.cpp ++++ b/src/sql/drivers/psql/qsql_psql.cpp +@@ -54,7 +54,6 @@ + #include + #include + +- + #include + #include + +@@ -619,6 +618,50 @@ static void setDatestyle(PGconn* connection) + PQclear(result); + } + ++static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin) ++{ ++ switch (vMaj) { ++ case 6: ++ return QPSQLDriver::Version6; ++ case 7: ++ { ++ switch (vMin) { ++ case 1: ++ return QPSQLDriver::Version71; ++ case 3: ++ return QPSQLDriver::Version73; ++ case 4: ++ return QPSQLDriver::Version74; ++ default: ++ return QPSQLDriver::Version7; ++ } ++ break; ++ } ++ case 8: ++ { ++ switch (vMin) { ++ case 1: ++ return QPSQLDriver::Version81; ++ case 2: ++ return QPSQLDriver::Version82; ++ case 3: ++ return QPSQLDriver::Version83; ++ case 4: ++ return QPSQLDriver::Version84; ++ default: ++ return QPSQLDriver::Version8; ++ } ++ break; ++ } ++ case 9: ++ return QPSQLDriver::Version9; ++ break; ++ default: ++ break; ++ } ++ return QPSQLDriver::VersionUnknown; ++} ++ + static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) + { + QPSQLDriver::Protocol serverVersion = QPSQLDriver::Version6; +@@ -626,50 +669,44 @@ static QPSQLDriver::Protocol getPSQLVersion(PGconn* connection) + int status = PQresultStatus(result); + if (status == PGRES_COMMAND_OK || status == PGRES_TUPLES_OK) { + QString val = QString::fromAscii(PQgetvalue(result, 0, 0)); ++ + QRegExp rx(QLatin1String("(\\d+)\\.(\\d+)")); + rx.setMinimal(true); // enforce non-greedy RegExp ++ + if (rx.indexIn(val) != -1) { + int vMaj = rx.cap(1).toInt(); + int vMin = rx.cap(2).toInt(); +- +- switch (vMaj) { +- case 7: +- switch (vMin) { +- case 0: +- serverVersion = QPSQLDriver::Version7; +- break; +- case 1: +- case 2: +- serverVersion = QPSQLDriver::Version71; +- break; +- default: +- serverVersion = QPSQLDriver::Version73; +- break; +- } +- break; +- case 8: +- switch (vMin) { +- case 0: +- serverVersion = QPSQLDriver::Version8; +- break; +- case 1: +- serverVersion = QPSQLDriver::Version81; +- break; +- case 2: +- default: +- serverVersion = QPSQLDriver::Version82; +- break; +- } +- break; +- default: +- break; ++ serverVersion = qMakePSQLVersion(vMaj, vMin); ++#ifdef PG_MAJORVERSION ++ if (rx.indexIn(QLatin1String(PG_MAJORVERSION)) != -1) { ++ vMaj = rx.cap(1).toInt(); ++ vMin = rx.cap(2).toInt(); ++ } ++ QPSQLDriver::Protocol clientVersion = qMakePSQLVersion(vMaj, vMin); ++ ++ if (serverVersion >= QPSQLDriver::Version9 && clientVersion < QPSQLDriver::Version9) { ++ //Client version before QPSQLDriver::Version9 only supports escape mode for bytea type, ++ //but bytea format is set to hex by default in PSQL 9 and above. So need to force the ++ //server use the old escape mode when connects to the new server with old client library. ++ result = PQexec(connection, "SET bytea_output=escape; "); ++ status = PQresultStatus(result); ++ } else if (serverVersion == QPSQLDriver::VersionUnknown) { ++ serverVersion = clientVersion; ++ if (serverVersion != QPSQLDriver::VersionUnknown) ++ qWarning("The server version of this PostgreSQL is unknown, falling back to the client version."); + } ++#endif + } + } + PQclear(result); + +- if (serverVersion < QPSQLDriver::Version71) ++ //keep the old behavior unchanged ++ if (serverVersion == QPSQLDriver::VersionUnknown) ++ serverVersion = QPSQLDriver::Version6; ++ ++ if (serverVersion < QPSQLDriver::Version71) { + qWarning("This version of PostgreSQL is not supported and may not work."); ++ } + + return serverVersion; + } +@@ -852,7 +889,10 @@ bool QPSQLDriver::commitTransaction() + // This hack can dissapear once there is an API to query this sort of information. + if (d->pro == QPSQLDriver::Version8 || + d->pro == QPSQLDriver::Version81 || +- d->pro == QPSQLDriver::Version82) { ++ d->pro == QPSQLDriver::Version82 || ++ d->pro == QPSQLDriver::Version83 || ++ d->pro == QPSQLDriver::Version84 || ++ d->pro == QPSQLDriver::Version9) { + transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0; + } + +@@ -963,6 +1003,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const + case QPSQLDriver::Version8: + case QPSQLDriver::Version81: + case QPSQLDriver::Version82: ++ case QPSQLDriver::Version83: ++ case QPSQLDriver::Version84: ++ case QPSQLDriver::Version9: + stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_class.relname " + "FROM pg_attribute, pg_class " +@@ -1046,6 +1089,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const + case QPSQLDriver::Version8: + case QPSQLDriver::Version81: + case QPSQLDriver::Version82: ++ case QPSQLDriver::Version83: ++ case QPSQLDriver::Version84: ++ case QPSQLDriver::Version9: + stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, " + "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, " + "pg_attrdef.adsrc " +diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h +index 22871ff..107da87 100644 +--- a/src/sql/drivers/psql/qsql_psql.h ++++ b/src/sql/drivers/psql/qsql_psql.h +@@ -97,6 +97,7 @@ class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver + Q_OBJECT + public: + enum Protocol { ++ VersionUnknown = -1, + Version6 = 6, + Version7 = 7, + Version71 = 8, +@@ -104,7 +105,10 @@ public: + Version74 = 10, + Version8 = 11, + Version81 = 12, +- Version82 = 13 ++ Version82 = 13, ++ Version83 = 14, ++ Version84 = 15, ++ Version9 = 16, + }; + + explicit QPSQLDriver(QObject *parent=0); + +-- +1.6.1 + diff -r c3d23bc104d3 -r d8351aeb23da qt4/stuff/fix-multisampling-with-ati-card.patch --- a/qt4/stuff/fix-multisampling-with-ati-card.patch Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -From e48e50c460434c451c67403390d98f7418c77cce Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Wed, 25 Aug 2010 14:07:40 +1000 -Subject: [PATCH] Fix OpenGL multisampling for some graphics drivers - ---- - src/opengl/qgl_win.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp -index 5ab944a..8eb6177 100644 ---- a/src/opengl/qgl_win.cpp -+++ b/src/opengl/qgl_win.cpp -@@ -1042,7 +1042,7 @@ int QGLContext::choosePixelFormat(void* dummyPfd, HDC pdc) - iAttributes[i++] = WGL_DRAW_TO_WINDOW_ARB; - iAttributes[i++] = TRUE; - iAttributes[i++] = WGL_COLOR_BITS_ARB; -- iAttributes[i++] = 32; -+ iAttributes[i++] = 24; - iAttributes[i++] = WGL_DOUBLE_BUFFER_ARB; - iAttributes[i++] = d->glFormat.doubleBuffer(); - if (d->glFormat.stereo()) { --- -1.7.2.1 - diff -r c3d23bc104d3 -r d8351aeb23da qt4/stuff/fix-qtbug-15857.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/stuff/fix-qtbug-15857.patch Thu Feb 17 19:08:45 2011 +0100 @@ -0,0 +1,32 @@ +From 6ae84f1183e91c910ca92a55e37f8254ace805c0 Mon Sep 17 00:00:00 2001 +From: Jiang Jiang +Date: Mon, 6 Dec 2010 13:07:36 +0100 +Subject: [PATCH] Fix QTextEdit::selectAll crash from textChanged() + +Doing selectAll() after the entire block of text has been removed +will cause this crash, because we didn't check if the block we +found is valid or not. + +Task-number: QTBUG-15857 +Reviewed-by: Eskil +--- + src/gui/text/qtextcursor.cpp | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp +index 769ab2f..f73cc4b 100644 +--- a/src/gui/text/qtextcursor.cpp ++++ b/src/gui/text/qtextcursor.cpp +@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor + bool adjustX = true; + QTextBlock blockIt = block(); + ++ if (!blockIt.isValid()) ++ return false; ++ + if (op >= QTextCursor::Left && op <= QTextCursor::WordRight + && blockIt.textDirection() == Qt::RightToLeft) { + if (op == QTextCursor::Left) +-- +1.6.1 + diff -r c3d23bc104d3 -r d8351aeb23da qt4/stuff/fix-scroll-when-last-item-is-removed.patch --- a/qt4/stuff/fix-scroll-when-last-item-is-removed.patch Thu Feb 17 15:35:13 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -From 6da6b7099d4e0b49329793e4b90703ec3d868048 Mon Sep 17 00:00:00 2001 -From: Frank Reininghaus -Date: Wed, 22 Sep 2010 10:19:59 +0200 -Subject: [PATCH] QTreeView: do not scroll to top if last item is removed - -When the last item is the current item and is removed, -QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's -viewItems member is cleared. This commit makes sure that viewItems is -restored by calling QTreeView::doItemsLayout() in this case, preventing -that the scroll bar range is set to zero temporarily and the view is -scrolled to the top unexpectedly (this was a regression in 4.7.0: -QTBUG-13567). - -Merge-request: 2481 -Reviewed-by: Olivier Goffart ---- - src/gui/itemviews/qtreeview.cpp | 4 ++++ - tests/auto/qtreeview/tst_qtreeview.cpp | 22 ++++++++++++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index b797776..40b51fe 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() - if (!viewportSize.isValid()) - viewportSize = QSize(0, 0); - -+ if (viewItems.isEmpty()) { -+ q->doItemsLayout(); -+ } -+ - int itemsInViewport = 0; - if (uniformRowHeights) { - if (defaultItemHeight <= 0) --- -1.6.1 - diff -r c3d23bc104d3 -r d8351aeb23da qtconfig/receipt --- a/qtconfig/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/qtconfig/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -13,7 +13,6 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" mkdir -p $fs/usr/bin $fs/usr/share/qt/translations cp -a $_pkg/usr/bin/qtconfig $fs/usr/bin cp -a $_pkg/usr/share/qt/translations/qtconfig*.qm $fs/usr/share/qt/translations diff -r c3d23bc104d3 -r d8351aeb23da rage/receipt --- a/rage/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/rage/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,28 +1,21 @@ # SliTaz package receipt. PACKAGE="rage" -VERSION="42165" +VERSION="55225" CATEGORY="multimedia" SHORT_DESC="E17 rage media center." MAINTAINER="pankso@slitaz.org" DEPENDS="eet evas ecore embryo edje emotion eina libcurl openssl" BUILD_DEPENDS="eet-dev evas-dev ecore-dev embryo-dev edje-dev emotion-dev \ -emotion eina-dev curl-dev openssl-dev" +emotion eina-dev curl-dev openssl-dev subversion" WEB_SITE="http://www.enlightenment.org/" +WGET_URL="subversion|http://svn.enlightenment.org/svn/e/trunk/$PACKAGE" +BRANCH="$VERSION" TAGS="mp3 ogg video e17 audio music" # Rules to configure and make the package. compile_rules() { - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-svn-$VERSION.tar.gz - if [ -f $TARBALL ]; then - tar xzf $TARBALL - else - svn co http://svn.enlightenment.org/svn/e/trunk/$PACKAGE \ - -r $VERSION $PACKAGE-$VERSION && - tar czf $TARBALL $PACKAGE-$VERSION - fi cd $src ./autogen.sh \ --prefix=/usr \ diff -r c3d23bc104d3 -r d8351aeb23da remmina/receipt --- a/remmina/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/remmina/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,7 +9,7 @@ WEB_SITE="http://$PACKAGE.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" DEPENDS="gtk+" -BUILD_DEPENDS="gtk+-dev" +BUILD_DEPENDS="gtk+-dev intltool" SUGGESTED="remmina-plugins" TAGS="rdp vnc" diff -r c3d23bc104d3 -r d8351aeb23da rsync/receipt --- a/rsync/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/rsync/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -11,7 +11,7 @@ WEB_SITE="http://rsync.samba.org/" WGET_URL="http://rsync.samba.org/ftp/rsync/$TARBALL" TAGS="sync" -CONFIG_FILES="/etc/rsyncd.conf /etc/rsyncd.secrets /etc/rsyncd.motd" +CONFIG_FILES="/etc/rsyncd.conf /etc/rsyncd.secrets" # Rules to configure and make the package. compile_rules() diff -r c3d23bc104d3 -r d8351aeb23da ruby-pkgconfig/receipt --- a/ruby-pkgconfig/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/ruby-pkgconfig/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ SOURCE="pkg-config" TARBALL="$SOURCE-$VERSION.gem" WEB_SITE="http://github.com/rcairo/pkg-config" -WGET="http://gems.rubyforge.org/gems/$TARBALL" +WGET_URL="http://gems.rubyforge.org/gems/$TARBALL" +COOK_OPT="!repack_src" # Rules to configure and make the package. compile_rules() { - if [ -f $SOURCES_REPOSITORY/$TARBALL ]; then - tar xjf $SOURCES_REPOSITORY/$TARBALL - else - [ -L /usr/bin/wget ] && tazpkg get-install wget --forced - wget -O $SOURCES_REPOSITORY/$TARBALL "$WGET" - tar xjf $SOURCES_REPOSITORY/$TARBALL - fi mkdir -p $src cd $src local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" diff -r c3d23bc104d3 -r d8351aeb23da sane-backends-dev/receipt --- a/sane-backends-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/sane-backends-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="sane-backends-dev" -VERSION="1.0.21" +VERSION="1.0.22" CATEGORY="development" SHORT_DESC="Sane devel files." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da sane-backends/receipt --- a/sane-backends/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/sane-backends/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="sane-backends" -VERSION="1.0.21" +VERSION="1.0.22" CATEGORY="system-tools" SHORT_DESC="Scanner Access Now Easy." MAINTAINER="pankso@slitaz.org" @@ -22,13 +22,17 @@ $CONFIGURE_ARGS && make && make -j 1 DESTDIR=$PWD/_pkg install + + # copy the missing udev rule + [ ! -d $PWD/_pkg/etc/udev/rules.d ] && mkdir -p $PWD/_pkg/etc/udev/rules.d + cp -a $src/tools/udev/libsane.rules $PWD/_pkg/etc/udev/rules.d/55-sane.rules } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/etc/udev/rules.d $fs/usr/lib $fs/usr/share \ - $fs/var/lock/sane + mkdir -p $fs/usr/lib $fs/usr/share \ + $fs/var/lock/sane $fs/etc/sane.d cp -a $_pkg/etc/sane.d $fs/etc cp -a $_pkg/usr/bin $fs/usr @@ -37,16 +41,12 @@ cp -a $_pkg/usr/lib/sane $fs/usr/lib cp -a $_pkg/usr/share/sane $fs/usr/share - # copy the missing udev rule - cp -a $src/tools/udev/libsane.rules $fs/etc/udev/rules.d/55-sane.rules - # fix groups/permissions on /var/lock/sane ; add it to scanner group - chmod 775 "$fs/var/lock/sane" - chgrp 96 "$fs/var/lock/sane" + chmod 775 "$fs/var/lock/sane" + chgrp 96 "$fs/var/lock/sane" - # fix hp officejets - echo "hpaio" >> "$fs/etc/sane.d/dll.conf" - + # fix hp officejets + echo "hpaio" >> "$fs/etc/sane.d/dll.conf" } post_install() diff -r c3d23bc104d3 -r d8351aeb23da sc/receipt --- a/sc/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/sc/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -15,7 +15,7 @@ compile_rules() { cd $src - patch -p1 < ../stuff/7.16.patch || exit 1 + patch -p1 < ../stuff/7.16.patch || return 1 make } diff -r c3d23bc104d3 -r d8351aeb23da screen/receipt --- a/screen/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/screen/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -18,15 +18,16 @@ { cd $src ./configure && make && make -j1 DESTDIR=$DESTDIR install || return 1 - mkdir -p _pkg/usr/share/terminfo - tic -o $PWD/_pkg/usr/share/terminfo terminfo/screeninfo.src + mkdir -p $DESTDIR/usr/share/terminfo + tic -o $DESTDIR/usr/share/terminfo terminfo/screeninfo.src + mkdir -p $DESTDIR/etc + cp $src/etc/screenrc $DESTDIR/etc } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/share $fs/etc - cp $src/etc/screenrc $fs/etc + mkdir -p $fs/usr/bin $fs/usr/share cp -a $_pkg/usr/bin/screen-$VERSION $fs/usr/bin/screen cp -a $_pkg/usr/share/screen $fs/usr/share } diff -r c3d23bc104d3 -r d8351aeb23da scummvm/receipt --- a/scummvm/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/scummvm/receipt Thu Feb 17 19:08:45 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 c3d23bc104d3 -r d8351aeb23da seamonkey/receipt --- a/seamonkey/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/seamonkey/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -14,11 +14,11 @@ # Rules to configure and make the package. compile_rules() { - #mv mozilla $PACKAGE-$VERSION 2>/dev/null || exit 1 + #mv mozilla $PACKAGE-$VERSION 2>/dev/null || return 1 mv comm-1.9.1 $PACKAGE-$VERSION 2>/dev/null cp -a stuff/seamonkey.mozconfig $src/.mozconfig cd $src - patch -p1 -i ../stuff/google-breakpad.u || exit 1 + patch -p1 -i ../stuff/google-breakpad.u || return 1 cat >> layout/build/Makefile.in << "EOF" ifdef MOZ_ENABLE_CANVAS EXTRA_DSO_LDOPTS += $(XLDFLAGS) -lX11 -lXrender diff -r c3d23bc104d3 -r d8351aeb23da setserial/receipt --- a/setserial/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/setserial/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -17,7 +17,7 @@ # http://bugs.gentoo.org/309883 # & remove warnings - patch -p1 < ../stuff/setserial-2.17.u || exit 1 + patch -p1 < ../stuff/setserial-2.17.u || return 1 ./configure --prefix=/usr --infodir=/usr/share/info \ --mandir=/usr/share/man $CONFIGURE_ARGS && diff -r c3d23bc104d3 -r d8351aeb23da shell-fm/receipt --- a/shell-fm/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/shell-fm/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -8,21 +8,12 @@ DEPENDS="libmad libao taglib zlib" BUILD_DEPENDS="libmad-dev libao-dev libao git pkg-config" WEB_SITE="http://nex.scrapping.cc/shell-fm/" +WGET_URL="git|git://github.com/jkramer/shell-fm.git" +BRANCH="v${VERSION}" # Rules to configure and make the package. compile_rules() { - [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.gz - if [ -f $TARBALL ]; then - tar xzf $TARBALL - else - echo "Cloning revision $VERSION from git repository..." - git clone git://github.com/jkramer/shell-fm.git $PACKAGE-$VERSION - cd $PACKAGE-$VERSION && git checkout v${VERSION} - cd $WOK/$PACKAGE && tar czf $TARBALL $PACKAGE-$VERSION - fi - cd $src make && make DESTDIR=$PWD/_pkg install diff -r c3d23bc104d3 -r d8351aeb23da sip-dev/receipt --- a/sip-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/sip-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="sip-dev" -VERSION="4.12" +VERSION="4.12.1" CATEGORY="development" SHORT_DESC="sip devel" MAINTAINER="allan316@gmail.com" diff -r c3d23bc104d3 -r d8351aeb23da sip/receipt --- a/sip/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/sip/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="sip" -VERSION="4.12" +VERSION="4.12.1" CATEGORY="development" SHORT_DESC="needed for PyQt" MAINTAINER="allan316@gmail.com" diff -r c3d23bc104d3 -r d8351aeb23da slang-dev/receipt --- a/slang-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/slang-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,16 +1,14 @@ # SliTaz package receipt. PACKAGE="slang-dev" -VERSION="2.2.2" +VERSION="2.2.3" CATEGORY="development" SHORT_DESC="S-Lang library dev files" MAINTAINER="erjo@slitaz.org" DEPENDS="slang" WANTED="slang" -TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.s-lang.org/index.html" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r c3d23bc104d3 -r d8351aeb23da slang/receipt --- a/slang/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/slang/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="slang" -VERSION="2.2.2" +VERSION="2.2.3" CATEGORY="development" SHORT_DESC="S-Lang library" MAINTAINER="erjo@slitaz.org" @@ -16,10 +16,10 @@ { cd $src ./configure --prefix=/usr $CONFIGURE_ARGS && - make && \ - make elf && \ - make static && - make DESTDIR=$PWD/_pkg -j1 install install-static + make -j1 && \ + make -j1 elf && \ + make -j1 static && + make -j1 DESTDIR=$PWD/_pkg install install-static } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da slim/receipt --- a/slim/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/slim/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -21,7 +21,7 @@ compile_rules() { cd $src - patch -p1 < ../stuff/NoPwdForCmd.patch || exit 1 + patch -p1 < ../stuff/NoPwdForCmd.patch || return 1 make && make DESTDIR=$src/_pkg install } diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/receipt --- a/slitaz-menus/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/slitaz-menus/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="slitaz-menus" -VERSION="1.7" +VERSION="1.8" CATEGORY="x-window" SHORT_DESC="SliTaz i18n Freedesktop menus." MAINTAINER="pankso@slitaz.org" @@ -12,6 +12,7 @@ { mkdir -p $fs/usr/share $fs/etc/xdg cp -a stuff/desktop-directories $fs/usr/share + cp -a stuff/icons $fs/usr/share cp -a stuff/menus $fs/etc/xdg } diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/stuff/desktop-directories/Education.directory --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-menus/stuff/desktop-directories/Education.directory Thu Feb 17 19:08:45 2011 +0100 @@ -0,0 +1,93 @@ +[Desktop Entry] +Name=Education +Name[af]=Opvoeding +Name[ar]=تعليمي +Name[as]=শিক্ষাবিষয়ক বস্তু +Name[ast]=Educación +Name[be]=Адукацыя +Name[be@latin]=Adukacyja +Name[bg]=Обучение +Name[bn]=শিক্ষা +Name[bn_IN]=শিক্ষাবিষয়ক বস্তু +Name[br]=Deskadurezh +Name[ca]=Educació +Name[cs]=Vzdělávání +Name[cy]=Addysg +Name[da]=Læringsprogrammer +Name[de]=Bildung +Name[dz]=ཤེས་རིག +Name[el]=Εκπαίδευση +Name[en_CA]=Education +Name[en_GB]=Education +Name[eo]=Edukado +Name[es]=Educación +Name[et]=Õppeprogrammid +Name[eu]=Hezkuntza +Name[fa]=آموزش +Name[fi]=Opetusohjelmat +Name[fr]=Éducation +Name[fur]=Istruzion +Name[ga]=Oideachas +Name[gl]=Educación +Name[gn]=Arandu +Name[gu]=શિક્ષણ +Name[he]=לימוד +Name[hi]=शिक्षा +Name[hr]=Edukacija +Name[hu]=Oktatás +Name[hy]=Ուսուցում +Name[id]=Pendidikan +Name[io]=Edukado +Name[is]=Menntun +Name[it]=Istruzione +Name[ja]=教育・教養 +Name[ka]=განათლება +Name[kk]=Білім программалары +Name[kn]=ಶಿಕ್ಷಣ +Name[ko]=교육 +Name[ku]=Perwerdehî +Name[ky]=Билим берүү иштемелери +Name[lt]=Švietimas +Name[lv]=Izglītības +Name[mai]=शिक्षा +Name[mg]=Fanabeazana +Name[mk]=Едукација +Name[ml]=വിദ്യാഭ്യാസം +Name[mn]=Боловсрол +Name[mr]=शिक्षण +Name[ms]=Pendidikan +Name[nb]=Opplæring +Name[ne]=शिक्षा +Name[nl]=Educatie +Name[nn]=Utdanning +Name[oc]=Educacion +Name[or]=ଶିକ୍ଷା +Name[pa]=ਸਿੱਖਿਆ +Name[pl]=Nauka +Name[ps]=زدکړه +Name[pt]=Educação +Name[pt_BR]=Educativo +Name[ro]=Educație +Name[ru]=Образовательные +Name[si]=අධ්‍යාපනිකපනික +Name[sk]=Vzdelávanie +Name[sl]=Izobraževanje +Name[sq]=Edukim +Name[sr]=Образовање +Name[sr@latin]=Obrazovanje +Name[sv]=Utbildning +Name[ta]=கல்வி +Name[te]=విద్య +Name[th]=การศึกษา +Name[tr]=Eğitim +Name[ug]=ئوقۇتۇش +Name[uk]=Навчання +Name[ur]=تعلیم +Name[ur_PK]=تعلیم +Name[uz@cyrillic]=Таълим +Name[vi]=Giáo dục +Name[zh_CN]=教育 +Name[zh_HK]=教育 +Name[zh_TW]=教育 +Icon=/usr/share/icons/SliTaz/16x16/categories/applications-science.png +Type=Directory diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/stuff/icons/SliTaz/16x16/categories/applications-engineering.png Binary file slitaz-menus/stuff/icons/SliTaz/16x16/categories/applications-engineering.png has changed diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/stuff/icons/SliTaz/16x16/categories/applications-science.png Binary file slitaz-menus/stuff/icons/SliTaz/16x16/categories/applications-science.png has changed diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/stuff/icons/SliTaz/32x32/categories/applications-engineering.png Binary file slitaz-menus/stuff/icons/SliTaz/32x32/categories/applications-engineering.png has changed diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/stuff/icons/SliTaz/32x32/categories/applications-science.png Binary file slitaz-menus/stuff/icons/SliTaz/32x32/categories/applications-science.png has changed diff -r c3d23bc104d3 -r d8351aeb23da slitaz-menus/stuff/menus/applications.menu --- a/slitaz-menus/stuff/menus/applications.menu Thu Feb 17 15:35:13 2011 +0100 +++ b/slitaz-menus/stuff/menus/applications.menu Thu Feb 17 19:08:45 2011 +0100 @@ -39,6 +39,17 @@ + + + Education + Education.directory + + + Education + + + + Games diff -r c3d23bc104d3 -r d8351aeb23da snort-dev/receipt --- a/snort-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/snort-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="snort-dev" -VERSION="2.9.0.3" +VERSION="2.9.0.4" CATEGORY="development" SHORT_DESC="Network intrusion prevention and detection system, development files." MAINTAINER="pascal.bellard@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da snort/receipt --- a/snort/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/snort/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,30 +1,22 @@ # SliTaz package receipt. PACKAGE="snort" -VERSION="2.9.0.3" +VERSION="2.9.0.4" CATEGORY="network" SHORT_DESC="Network intrusion prevention and detection system (IDS/IPS)." MAINTAINER="pascal.bellard@slitaz.org" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.snort.org/" -WGET="http://www.snort.org/downloads/637" +WGET_URL="http://www.snort.org/downloads/637" DEPENDS="pcre libdnet libdaq" -BUILD_DEPENDS="pcre-dev libpcap-dev libdaq-dev libdnet-dev" +BUILD_DEPENDS="pcre-dev libpcap-dev libdaq-dev libdnet-dev wget" # Rules to configure and make the package. compile_rules() { - # this is needed even if tazwok support https - if [ -f $SOURCES_REPOSITORY/$TARBALL ]; then - tar xzf $SOURCES_REPOSITORY/$TARBALL - else - [ -L /usr/bin/wget ] && tazpkg get-install wget --forced - wget -O $SOURCES_REPOSITORY/$TARBALL --no-check-certificate "$WGET" - tar xzf $SOURCES_REPOSITORY/$TARBALL - fi cd $src ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man \ + --mandir=/usr/share/man \ $CONFIGURE_ARGS && make && make DESTDIR=$PWD/_pkg install diff -r c3d23bc104d3 -r d8351aeb23da spandsp/receipt --- a/spandsp/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/spandsp/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,31 +1,32 @@ # SliTaz package receipt. -PACKAGE="spandsp" -VERSION="0.0.5" -CATEGORY="system-tools" -SHORT_DESC="library of DSP functions for telephony." +PACKAGE="remmina" +VERSION="0.9.3" +CATEGORY="network" +SHORT_DESC="Remote desktop client written in GTK+" MAINTAINER="pascal.bellard@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tgz" -WEB_SITE="http://www.soft-switch.org/" -WGET_URL="${WEB_SITE}downloads/$PACKAGE/$TARBALL" -DEPENDS="tiff zlib jpeg" -BUILD_DEPENDS="tiff-dev zlib-dev jpeg-dev" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WEB_SITE="http://$PACKAGE.sourceforge.net/" +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" +DEPENDS="gtk+" +BUILD_DEPENDS="gtk+-dev intltool" +SUGGESTED="remmina-plugins" +TAGS="rdp vnc" # Rules to configure and make the package. compile_rules() { - [ -e $src ] || ln -s ${PACKAGE}-* $src cd $src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS - make + ./configure --prefix=/usr \ + $CONFIGURE_ARGS && + make && make DESTDIR=$PWD/_pkg install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $_pkg/usr/lib/*.so* $fs/usr/lib + mkdir -p $fs/usr + cp -a $_pkg/usr/share $fs/usr + cp -a $_pkg/usr/bin $fs/usr } - diff -r c3d23bc104d3 -r d8351aeb23da speex/receipt --- a/speex/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/speex/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -17,7 +17,7 @@ ./configure --prefix=/usr --infodir=/usr/share/info \ --mandir=/usr/share/man $CONFIGURE_ARGS && make && - make DESTDIR=$PWD/_pkg install + make -j1 DESTDIR=$PWD/_pkg install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da spidermonkey-dev/receipt --- a/spidermonkey-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/spidermonkey-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -12,7 +12,6 @@ genpkg_rules() { mkdir -p $fs/usr/lib $fs/usr/include/js - _pkg=$WOK/$WANTED/js/_pkg cp -a $_pkg/usr/include/* $fs/usr/include/js cp -a $_pkg/usr/lib/*.*a $fs/usr/lib/ } diff -r c3d23bc104d3 -r d8351aeb23da spidermonkey/receipt --- a/spidermonkey/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/spidermonkey/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -5,7 +5,7 @@ CATEGORY="multimedia" SHORT_DESC="Mozilla C implementation of Javascript" MAINTAINER="jozee@slitaz.org" -DEPENDS="" +DEPENDS="nspr" BUILD_DEPENDS="" SOURCE="js" TARBALL="$SOURCE-$VERSION.tar.gz" @@ -16,9 +16,19 @@ # Rules to configure and make the package. compile_rules() { - cd $src/src - make -f Makefile.ref DIST=../_pkg/usr all export + cd $src/src + # Fix from Archlinux + # http://projects.archlinux.org/svntogit/community.git/tree/spidermonkey/trunk/PKGBUILD + patch -p0 < $stuff/spidermonkey-Makefile.patch || return 1 + sed -i 's|include|include/js|' rules.mk || return 1 + # patch Makefile for threadsafe support with native nspr + patch -p2 -i $stuff/spidermonkey-1.7-threadsafe.patch || return 1 + # FS#16673 + export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8" + # build - threadsafe + make -j1 -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 \ + DIST=$DESTDIR/usr all export } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da splix/receipt --- a/splix/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/splix/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -18,9 +18,9 @@ cd $src sed -i 's/Value::Value &val/Value \&val/' src/ppdfile.cpp make && - make CUPSFILTER=$PWD/_pkg/`cups-config --serverbin`/filter \ - CUPSPPD=$PWD/_pkg/`cups-config --datadir`/model \ - install + make CUPSFILTER=/`cups-config --serverbin`/filter \ + CUPSPPD=/`cups-config --datadir`/model \ + install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da squidguard/receipt --- a/squidguard/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/squidguard/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -20,7 +20,7 @@ # Security patches while read patch_file; do echo "Apply $patch_file" - tar xvzf ../stuff/$patch_file || exit 1 + tar xvzf ../stuff/$patch_file || return 1 cp -a $(basename $patch_file .tar.gz)/* src done </dev/null - [ -d $PACKAGE-$VERSION ] || (echo "src not found, exiting" ; exit 1) + [ -d $PACKAGE-$VERSION ] || (echo "src not found, exiting" ; return 1) status # add config cp -a stuff/thunderbird.mozconfig.conf $src/.mozconfig diff -r c3d23bc104d3 -r d8351aeb23da tightvnc/receipt --- a/tightvnc/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/tightvnc/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -8,7 +8,7 @@ TARBALL="$PACKAGE-${VERSION}_unixsrc.tar.bz2" WEB_SITE="http://www.tightvnc.com/" WGET_URL="$SF_MIRROR/vnc-tight/$TARBALL" -DEPENDS="xfree86-base-fonts jpeg zlib" +DEPENDS="xorg-base-fonts jpeg zlib" BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-cf-files xorg-libXp \ xorg-libXaw-dev xorg-libXt-dev xorg-xproto xorg-libXau-dev xorg-libXdmcp-dev \ xorg-libXmu-dev xorg-xextproto xorg-printproto xorg-kbproto xorg-inputproto \ diff -r c3d23bc104d3 -r d8351aeb23da tilda/receipt --- a/tilda/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/tilda/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -7,10 +7,7 @@ SHORT_DESC="Linux terminal based on classic terminals from first person shooter games." WEB_SITE="http://tilda.sourceforge.net" DEPENDS="vte libconfuse libglade" -BUILD_DEPENDS="gawk vte vte-dev libglade-dev libconfuse pkg-config \ -glib glib-dev gtk+-dev pango-dev cairo-dev freetype-dev fontconfig-dev \ -libpng-dev atk-dev libgio-dev libxml2-dev xorg-libXrandr-dev \ -xorg-xrandr xorg-randrproto" +BUILD_DEPENDS="flex" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" TAGS="terminal" @@ -20,10 +17,7 @@ compile_rules() { cd $src - ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS && - make && - make DESTDIR=$PWD/_pkg install + ./configure && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r c3d23bc104d3 -r d8351aeb23da tinyproxy/receipt --- a/tinyproxy/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/tinyproxy/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -5,22 +5,14 @@ CATEGORY="network" SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems." MAINTAINER="slaxemulator@gmail.com" +BUILD_DEPENDS="wget" TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="https://banu.com/tinyproxy/" -WGET="https://banu.com/pub/$PACKAGE/${VERSION%.*}/$TARBALL" +WGET_URL="https://banu.com/pub/$PACKAGE/${VERSION%.*}/$TARBALL" # Rules to configure and make the package. compile_rules() { - # Download using real wget since the link is https and we need - # --no-check-certificate that works - if [ -f $SOURCES_REPOSITORY/$TARBALL ]; then - tar xjf $SOURCES_REPOSITORY/$TARBALL - else - [ -L /usr/bin/wget ] && tazpkg get-install wget --forced - wget -O $SOURCES_REPOSITORY/$TARBALL --no-check-certificate "$WGET" - tar xjf $SOURCES_REPOSITORY/$TARBALL - fi cd $src patch -Np1 -i ../stuff/no-docs-and-tests.diff ./configure \ diff -r c3d23bc104d3 -r d8351aeb23da tty-clock/receipt --- a/tty-clock/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/tty-clock/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,12 +9,11 @@ BUILD_DEPENDS="ncurses-dev git" WEB_SITE="http://github.com/Karnash/tty-clock" TAGS="clock" +WGET_URL="git|http://github.com/Karnash/tty-clock.git" # Rules to configure and make the package. compile_rules() { - git clone http://github.com/Karnash/tty-clock.git - mv $PACKAGE $PACKAGE-$VERSION 2>/dev/null cd $src make } diff -r c3d23bc104d3 -r d8351aeb23da tyrian/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tyrian/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -0,0 +1,30 @@ +# SliTaz package receipt. + +PACKAGE="tyrian" +VERSION="21" +CATEGORY="non-free" +SHORT_DESC="Tyrian is a the DOS shoot-em-up;you need open-tyrian to run it." +MAINTAINER="mallory@skyrock.com" +BUILD_DEPENDS="wget" +TARBALL="$PACKAGE$VERSION.zip" +WEB_SITE="http://code.google.com/p/opentyrian/" +WGET_URL="https://sites.google.com/a/camanis.net/opentyrian/tyrian/$TARBALL" + +# Rules to configure and make the package. +compile_rules() +{ + : +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/games/opentyrian + cd $src + for file in *; do + [ "$file" = "${file%.exe}" ] || continue + [ "$file" = "${file%.doc}" ] || continue + cp $file $fs/usr/games/opentyrian + done +} + diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-armv4eb/receipt --- a/uclibc-cross-compiler-armv4eb/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-armv4eb/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-armv4l/receipt --- a/uclibc-cross-compiler-armv4l/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-armv4l/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-armv4tl/receipt --- a/uclibc-cross-compiler-armv4tl/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-armv4tl/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-armv5l/receipt --- a/uclibc-cross-compiler-armv5l/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-armv5l/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-armv6l/receipt --- a/uclibc-cross-compiler-armv6l/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-armv6l/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-i486/receipt --- a/uclibc-cross-compiler-i486/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-i486/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,12 +10,6 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $src -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-mips/receipt --- a/uclibc-cross-compiler-mips/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-mips/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-mips64/receipt --- a/uclibc-cross-compiler-mips64/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-mips64/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-mipsel/receipt --- a/uclibc-cross-compiler-mipsel/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-mipsel/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-powerpc-440fp/receipt --- a/uclibc-cross-compiler-powerpc-440fp/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-powerpc-440fp/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/powerpc-${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-powerpc/receipt --- a/uclibc-cross-compiler-powerpc/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-powerpc/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-sh4/receipt --- a/uclibc-cross-compiler-sh4/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-sh4/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da uclibc-cross-compiler-sparc/receipt --- a/uclibc-cross-compiler-sparc/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/uclibc-cross-compiler-sparc/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -10,18 +10,12 @@ WEB_SITE="http://impactlinux.com/aboriginal" WGET_URL="$WEB_SITE/downloads/binaries/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $SOURCE -} - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share $fs/usr/bin - cp -a $SOURCE $fs/usr/share/$PACKAGE - for i in $(cd $SOURCE ; ls bin/${PACKAGE##*-}-*); do + cp -a $src $fs/usr/share/$PACKAGE + for i in $(cd $src ; ls bin/${PACKAGE##*-}-*); do file=$(basename $i) ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file done diff -r c3d23bc104d3 -r d8351aeb23da udev-dev/receipt --- a/udev-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/udev-dev/receipt Thu Feb 17 19:08:45 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 c3d23bc104d3 -r d8351aeb23da udev/receipt --- a/udev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/udev/receipt Thu Feb 17 19:08:45 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." diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-blkid-dev/receipt --- a/util-linux-ng-blkid-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-blkid-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-blkid-dev" -VERSION="2.18" +VERSION="2.19" CATEGORY="development" SHORT_DESC="The blkid devel files from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-blkid/receipt --- a/util-linux-ng-blkid/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-blkid/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-blkid" -VERSION="2.18" +VERSION="2.19" CATEGORY="base-system" SHORT_DESC="The blkid utility and library from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-cfdisk/receipt --- a/util-linux-ng-cfdisk/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-cfdisk/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-cfdisk" -VERSION="2.18" +VERSION="2.19" CATEGORY="system-tools" SHORT_DESC="The cfdisk utility from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-getopt/receipt --- a/util-linux-ng-getopt/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-getopt/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-getopt" -VERSION="2.18" +VERSION="2.19" CATEGORY="base-system" SHORT_DESC="The getopt utility from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-partx/receipt --- a/util-linux-ng-partx/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-partx/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-partx" -VERSION="2.18" +VERSION="2.19" CATEGORY="system-tools" SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-setterm/receipt --- a/util-linux-ng-setterm/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-setterm/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt PACKAGE="util-linux-ng-setterm" -VERSION="2.18" +VERSION="2.19" CATEGORY="base-system" SHORT_DESC="The setterm utility from Util linux NG." MAINTAINER="devel@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-sfdisk/receipt --- a/util-linux-ng-sfdisk/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-sfdisk/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-sfdisk" -VERSION="2.18" +VERSION="2.19" CATEGORY="system-tools" SHORT_DESC="The sfdisk utility from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-uuid-dev/receipt --- a/util-linux-ng-uuid-dev/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-uuid-dev/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-uuid-dev" -VERSION="2.18" +VERSION="2.19" CATEGORY="development" SHORT_DESC="The uuid devel files from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng-uuid/receipt --- a/util-linux-ng-uuid/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng-uuid/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="util-linux-ng-uuid" -VERSION="2.18" +VERSION="2.19" CATEGORY="base-system" SHORT_DESC="The uuid utility and library from Util linux NG." MAINTAINER="pankso@slitaz.org" diff -r c3d23bc104d3 -r d8351aeb23da util-linux-ng/receipt --- a/util-linux-ng/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/util-linux-ng/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -1,15 +1,16 @@ # SliTaz package receipt. PACKAGE="util-linux-ng" -VERSION="2.18" +VERSION="2.19" CATEGORY="meta" SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)." MAINTAINER="pankso@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tar.bz2" +SOURCE="util-linux" +TARBALL="$SOURCE-$VERSION.tar.bz2" DEPENDS="glibc-base" BUILD_DEPENDS="slitaz-toolchain ncurses-dev zlib-dev" WEB_SITE="http://kernel.org/~kzak/util-linux-ng/" -WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v${VERSION%*}/$TARBALL" +WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v${VERSION}/$TARBALL" LOCALE="" # Rules to configure and make the package. diff -r c3d23bc104d3 -r d8351aeb23da v4l-dvb/receipt --- a/v4l-dvb/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/v4l-dvb/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -9,18 +9,10 @@ BUILD_DEPENDS="python mercurial coreutils-operations" WEB_SITE="http://linuxtv.org/hg/v4l-dvb/" TAGS="webcam" +WGET_URL="mercurial|$WEB_SITE" # Rules to configure and make the package. compile_rules() { - TARBALL=$SOURCES_REPOSITORY/$PACKAGE-hg-$VERSION.tar.gz - if [ -d $PACKAGE-$VERSION ]; then - true - elif [ -f $TARBALL ]; then - tar xzf $TARBALL - else - hg clone $WEB_SITE $PACKAGE-$VERSION && - tar czf $TARBALL $PACKAGE-$VERSION - fi cd $src sed -i 's/0 | xargs -0n 255 ln -sf --target-directory=\./ | while read file; do ln -sf $file . ; done/' v4l/Makefile grep -rl /sbin/depmod * | xargs sed -i 's|/sbin/depmod|/bin/echo|' diff -r c3d23bc104d3 -r d8351aeb23da valgrind/receipt --- a/valgrind/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/valgrind/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -21,7 +21,7 @@ # Fix build with glibc 2.11 #http://www.linuxfromscratch.org/patches/downloads/valgrind/valgrind-3.5.0-glibc-2.11.patch - patch -p1 < ../stuff/valgrind-3.6.0-glibc211.u || exit 1 + patch -p1 < ../stuff/valgrind-3.6.0-glibc211.u || return 1 autoconf ./configure \ diff -r c3d23bc104d3 -r d8351aeb23da visualboyadvance-gtk/receipt --- a/visualboyadvance-gtk/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/visualboyadvance-gtk/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -14,7 +14,6 @@ { mkdir -p $fs/usr/bin $fs/usr/games $fs/usr/share/applications cp -a stuff/*.desktop $fs/usr/share/applications - _pkg=${_pkg/$WANTED-$VERSION/VisualBoyAdvance-$VERSION} cp -a $_pkg/usr/bin/gvba $fs/usr/bin cp -a $_pkg/usr/games/* $fs/usr/games } diff -r c3d23bc104d3 -r d8351aeb23da vzctl/receipt --- a/vzctl/receipt Thu Feb 17 15:35:13 2011 +0100 +++ b/vzctl/receipt Thu Feb 17 19:08:45 2011 +0100 @@ -23,7 +23,7 @@ continue fi echo "Apply $patch_file" - patch -p1 < ../stuff/$patch_file || exit 1 + patch -p1 < ../stuff/$patch_file || return 1 touch done.$patch_file done <