From: Rene Wagner <rw@handhelds.org>
Date: Thu, 12 Aug 2004 14:38:44 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17694
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0472eaea8ac8d96a650e2f78190921abddd5db;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into sugarcube.dyndns.org:/home/oe/oe/packages

2004/08/12 16:38:43+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/08/12 16:38:35+02:00 uni-frankfurt.de!mickey
apply the qgfxraster patch from TrollTech to repair fonts w/ gcc 3.4.x
alphablending still broken though

BKrev: 411b80f4LFPR2aR_niSCU9jeQuPZRQ
---

diff --git a/qte/qte-2.3.7/fix-qgfxraster.patch b/qte/qte-2.3.7/fix-qgfxraster.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index f448a5d233..7f58831e2f 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 = "r10"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
 	   file://qpe.patch;patch=1 \
@@ -15,6 +15,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \
 	   file://tslib.patch;patch=1 \
 	   file://c700-hardware.patch;patch=1 \
 	   file://encoding.patch;patch=1 \
+	   file://fix-qgfxraster.patch;patch=1 \
 	   file://update-qtfontdir \
 	   file://sharp_char.h \
 	   file://switches.h "