[oe-commits] Koen Kooi : qt4: switch to mysql5 to avoid header clashes in staging
git version control
git at git.openembedded.org
Mon Jan 3 10:53:09 UTC 2011
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 83134fa0312694008bf024170c70e526b821ae4d
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=83134fa0312694008bf024170c70e526b821ae4d
Author: Koen Kooi <koen at openembedded.org>
Date: Mon Jan 3 11:50:25 2011 +0100
qt4: switch to mysql5 to avoid header clashes in staging
Signed-off-by: Koen Kooi <koen at openembedded.org>
---
recipes/qt4/qt4-embedded.inc | 2 +-
recipes/qt4/qt4-x11-free.inc | 2 +-
recipes/qt4/qt4.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 60eb179..87b19d4 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r25"
+INC_PR = "r26"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index ff4e454..ae79d58 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com"
LICENSE = "GPL QPL"
DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r21"
+INC_PR = "r22"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
file://0001-cross-compile.patch \
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 3bebd46..ac1fc83 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -1,6 +1,6 @@
inherit qmake_base
-DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base mysql postgresql sqlite sqlite3"
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base mysql5 postgresql sqlite sqlite3"
require qt4_arch.inc
QT_ARCH := "${@qt_arch(d)}"
More information about the Openembedded-commits
mailing list