[oe-commits] Martin Jansa : qt4: enable xmlpatterns (needed for navit-gui-qml), fix missing lib with xmlpatterns in 4.7.0-beta1

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 54bf7423e8e767e9d4a2edbc889ff4155df5864e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=54bf7423e8e767e9d4a2edbc889ff4155df5864e

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jun 26 13:23:46 2010 +0200

qt4: enable xmlpatterns (needed for navit-gui-qml), fix missing lib with xmlpatterns in 4.7.0-beta1

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 recipes/qt4/qt-4.6.2+4.7.0-beta1.inc               |    1 +
 .../qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch |   22 ++++++++++++++++++++
 recipes/qt4/qt4-x11-free.inc                       |    2 +-
 recipes/qt4/qt4.inc                                |    4 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
index 35eb4b3..d2d196b 100644
--- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
@@ -16,6 +16,7 @@ SRC_URI = "\
 	file://0007-Disable-demos-qtdemos.patch \
 	file://0008-Disable-examples-declarative.patch \
 	file://demos.browser.add.mediaservices.lib.patch \
+	file://add.xmlpatterns.lib.patch \
 	file://g++.conf \
 	file://linux.conf \
            "
diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch
new file mode 100644
index 0000000..57ba4f1
--- /dev/null
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch
@@ -0,0 +1,22 @@
+diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro
+--- qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro	2010-06-26 13:15:06.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro	2010-06-26 13:18:17.000000000 +0200
+@@ -1,6 +1,6 @@
+ TEMPLATE = app
+ TARGET = browser
+-QT += webkit network mediaservices
++QT += webkit network mediaservices xmlpatterns
+ 
+ CONFIG += qt warn_on
+ contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools
+diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
+--- qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro	2010-05-04 02:43:18.000000000 +0200
++++ qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro	2010-06-26 13:17:42.000000000 +0200
+@@ -1,6 +1,6 @@
+ 
+ FORMS       += forms/mainwindow.ui
+-QT +=       xmlpatterns webkit
++QT +=       xmlpatterns webkit mediaservices
+ SOURCES     += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
+ HEADERS     += qobjectxmlmodel.h  mainwindow.h ../shared/xmlsyntaxhighlighter.h
+ RESOURCES   = queries.qrc
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index f4fa83e..c7fabe9 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 = "r17"
+INC_PR = "r18"
 
 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 1009014..13d0561 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -10,7 +10,7 @@ QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \
                     -shared -no-nas-sound -no-sm -no-nis \
                     -qt-gif -system-libjpeg -system-libpng -system-zlib \
                     -no-sql-ibase -plugin-sql-mysql -no-sql-odbc -plugin-sql-psql -plugin-sql-sqlite -plugin-sql-sqlite2 \
-                    -no-pch -qdbus -stl -glib -phonon -webkit"
+                    -no-pch -qdbus -stl -glib -phonon -webkit -xmlpatterns"
 
 EXTRA_OEMAKE = "-e"
 
@@ -23,7 +23,7 @@ EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
 export QT_CONF_PATH="${WORKDIR}/qt.conf"
 
 # Library packages
-QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml phonon QtMultimedia QtOpenVG QtMediaServices"
+QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner QtDesignerComponents QtGui QtHelp QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns phonon QtMultimedia QtOpenVG QtMediaServices"
 
 QT_EXTRA_LIBS = "pvrQWSWSEGL"