wok-current rev 7710

merge
author fireflyoo <lufeng369@gmail.com>
date Sun Dec 19 23:29:00 2010 +0800 (2010-12-19)
parents 08443e33c783 3c1dfda82c43
children 6ce472884aeb
files
line diff
     1.1 --- a/openssl/receipt	Sun Dec 19 23:26:42 2010 +0800
     1.2 +++ b/openssl/receipt	Sun Dec 19 23:29:00 2010 +0800
     1.3 @@ -16,9 +16,16 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 +	
     1.8 +	# MAKEFLAGS make openssl build fail.
     1.9 +	unset MAKEFLAGS
    1.10  
    1.11 -	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2
    1.12 -	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile
    1.13 +	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
    1.14 +	# marked as not requiring an executable stack (compatibility improvement).
    1.15 +	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2 \
    1.16 +		-Wa,--noexecstack &&
    1.17 +	
    1.18 +	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
    1.19  	make &&
    1.20  	make INSTALL_PREFIX=$PWD/_pkg MANDIR=$PWD/_pkg/usr/share/man install
    1.21  }
     2.1 --- a/qt4/receipt	Sun Dec 19 23:26:42 2010 +0800
     2.2 +++ b/qt4/receipt	Sun Dec 19 23:29:00 2010 +0800
     2.3 @@ -9,10 +9,14 @@
     2.4  DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
     2.5  libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
     2.6  libQtOpenGL libQtSql libQtWebkit gstreamer"
     2.7 -BUILD_DEPENDS="xorg-libX11-dev dbus-dev slitaz-dev-pkgs gstreamer \
     2.8 +BUILD_DEPENDS="xorg-libX11-dev dbus-dev gstreamer \
     2.9  gstreamer-dev gst-python-dev libmng-dev cups-dev mysql-dev unixODBC-dev \
    2.10  mesa-dev fontconfig-dev libegl-mesa libglu-mesa libglw-mesa postgresql-dev glibc-locale \
    2.11 -gtk+-dev gst-plugins-base-dev"
    2.12 +gtk+-dev gst-plugins-base-dev atk autoconf automake bash binutils bison bzip2 cairo \
    2.13 +coreutils expat flex fontconfig freetype gcc gettext glib jpeg libIDL \
    2.14 +libcap libpng libtool libxml2 linux-api-headers m4 make mercurial ncurses openssl \
    2.15 +pango patch pcre perl perl-xml-parser perl-xml-simple pixman pkg-config tiff \
    2.16 +xorg xorg-dev-proto zip zlib"
    2.17  TARBALL="$SOURCE-$VERSION.tar.gz"
    2.18  WEB_SITE="http://qt.nokia.com/"
    2.19  WGET_URL="ftp://ftp.qt.nokia.com/qt/source/$TARBALL"
     3.1 --- a/xfce4/receipt	Sun Dec 19 23:26:42 2010 +0800
     3.2 +++ b/xfce4/receipt	Sun Dec 19 23:29:00 2010 +0800
     3.3 @@ -7,7 +7,8 @@
     3.4  MAINTAINER="erjo@slitaz.org"
     3.5  DEPENDS="libxfce4util xfconf libxfcegui4 libxfce4menu libexo 
     3.6   xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman
     3.7 - thunar-archive-plugin xfce-utils xfce4-slitaz-config"
     3.8 + thunar-archive-plugin xfce-utils"
     3.9 +SUGGESTED="xfce4-slitaz-config"
    3.10  WEB_SITE="http://www.xfce.org"
    3.11  
    3.12  # Rules to gen a SliTaz package suitable for Tazpkg.
     4.1 --- a/xorg-xproto/receipt	Sun Dec 19 23:26:42 2010 +0800
     4.2 +++ b/xorg-xproto/receipt	Sun Dec 19 23:29:00 2010 +0800
     4.3 @@ -5,7 +5,7 @@
     4.4  CATEGORY="development"
     4.5  SHORT_DESC="Xorg server module."
     4.6  MAINTAINER="pankso@slitaz.org"
     4.7 -BUILD_DEPENDS="xorg-util-macro"
     4.8 +BUILD_DEPENDS="xorg-util-macros"
     4.9  SOURCE="xproto"
    4.10  TARBALL="$SOURCE-$VERSION.tar.bz2"
    4.11  WEB_SITE="http://www.x.org/"