# HG changeset patch
# User fireflyoo <lufeng369@gmail.com>
# Date 1292772540 -28800
# Node ID 755555d8f51e97ab674467b487a5bdff16a6dc74
# Parent  08443e33c783f516bdf09dde3c4d7e93bb31ca21# Parent  3c1dfda82c435f241aa21e80f6ac04cf641b6e07
merge

diff -r 08443e33c783 -r 755555d8f51e openssl/receipt
--- a/openssl/receipt	Sun Dec 19 23:26:42 2010 +0800
+++ b/openssl/receipt	Sun Dec 19 23:29:00 2010 +0800
@@ -16,9 +16,16 @@
 compile_rules()
 {
 	cd $src
+	
+	# MAKEFLAGS make openssl build fail.
+	unset MAKEFLAGS
 
-	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2
-	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile
+	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
+	# marked as not requiring an executable stack (compatibility improvement).
+	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2 \
+		-Wa,--noexecstack &&
+	
+	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
 	make &&
 	make INSTALL_PREFIX=$PWD/_pkg MANDIR=$PWD/_pkg/usr/share/man install
 }
diff -r 08443e33c783 -r 755555d8f51e qt4/receipt
--- a/qt4/receipt	Sun Dec 19 23:26:42 2010 +0800
+++ b/qt4/receipt	Sun Dec 19 23:29:00 2010 +0800
@@ -9,10 +9,14 @@
 DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
 libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
 libQtOpenGL libQtSql libQtWebkit gstreamer"
-BUILD_DEPENDS="xorg-libX11-dev dbus-dev slitaz-dev-pkgs gstreamer \
+BUILD_DEPENDS="xorg-libX11-dev dbus-dev gstreamer \
 gstreamer-dev gst-python-dev libmng-dev cups-dev mysql-dev unixODBC-dev \
 mesa-dev fontconfig-dev libegl-mesa libglu-mesa libglw-mesa postgresql-dev glibc-locale \
-gtk+-dev gst-plugins-base-dev"
+gtk+-dev gst-plugins-base-dev atk autoconf automake bash binutils bison bzip2 cairo \
+coreutils expat flex fontconfig freetype gcc gettext glib jpeg libIDL \
+libcap libpng libtool libxml2 linux-api-headers m4 make mercurial ncurses openssl \
+pango patch pcre perl perl-xml-parser perl-xml-simple pixman pkg-config tiff \
+xorg xorg-dev-proto zip zlib"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://qt.nokia.com/"
 WGET_URL="ftp://ftp.qt.nokia.com/qt/source/$TARBALL"
diff -r 08443e33c783 -r 755555d8f51e xfce4/receipt
--- a/xfce4/receipt	Sun Dec 19 23:26:42 2010 +0800
+++ b/xfce4/receipt	Sun Dec 19 23:29:00 2010 +0800
@@ -7,7 +7,8 @@
 MAINTAINER="erjo@slitaz.org"
 DEPENDS="libxfce4util xfconf libxfcegui4 libxfce4menu libexo 
  xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman
- thunar-archive-plugin xfce-utils xfce4-slitaz-config"
+ thunar-archive-plugin xfce-utils"
+SUGGESTED="xfce4-slitaz-config"
 WEB_SITE="http://www.xfce.org"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 08443e33c783 -r 755555d8f51e xorg-xproto/receipt
--- a/xorg-xproto/receipt	Sun Dec 19 23:26:42 2010 +0800
+++ b/xorg-xproto/receipt	Sun Dec 19 23:29:00 2010 +0800
@@ -5,7 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="Xorg server module."
 MAINTAINER="pankso@slitaz.org"
-BUILD_DEPENDS="xorg-util-macro"
+BUILD_DEPENDS="xorg-util-macros"
 SOURCE="xproto"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"