From: Phil Blundell <philb@gnu.org>
Date: Fri, 13 Aug 2004 17:49:51 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17679
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cda6f847c00b45000d3d77a8c4b9887a1fb088b;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages

2004/08/13 19:17:44+02:00 dyndns.org!oe
base-files: export HISTFILE="" causes busybox sh to segfault on certain stuff

2004/08/13 18:21:30+02:00 uni-frankfurt.de!mickey
enable depth 32 to get alphablending working in Qt/Embedded

BKrev: 411cff3fXRvH6hCMt3dIMzrinPpOnw
---

diff --git a/base-files/base-files/etc/profile b/base-files/base-files/etc/profile
index b5e70c00ee..d5936dbcc4 100644
--- a/base-files/base-files/etc/profile
+++ b/base-files/base-files/etc/profile
@@ -26,4 +26,5 @@ export PATH PS1 OPIEDIR QPEDIR QTDIR
 umask 022
 
 # disable history writing
-export HISTFILE=""
+# causes busybox sh to segfault on certain stuff...
+#export HISTFILE=""
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 7f58831e2f..03d3431bcc 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL/QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
 	   file://qpe.patch;patch=1 \
@@ -47,7 +47,7 @@ QTE_ARCH := "${@qte_arch(d)}"
 
 EXTRA_OECONF_CONFIG = "-qconfig qpe"
 EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \
-		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG}"
+		-xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 16,32"
 EXTRA_OEMAKE = "-e"
 
 #