* Re: Qt4 recipe fix -- updated
[not found] <mailman.190.1280416788.17151.openembedded-devel@lists.openembedded.org>
@ 2010-07-29 20:20 ` Jay Snyder
0 siblings, 0 replies; only message in thread
From: Jay Snyder @ 2010-07-29 20:20 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
I did a git pull today (my working directory from was 2010-06-23), and
have updated the recipe to also update the .inc file for Qt 4.6.3
I have NOT, however, tested my patch with the Beta for Qt 4.7.0 yet, so
I did not change the files for that.
Regards,
Jay
[-- Attachment #2: Qt4-recipe-compiler-fix.patch --]
[-- Type: text/x-diff, Size: 4543 bytes --]
diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch
--- /home/oe/2010-07-29/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch 1969-12-31 19:00:00.000000000 -0500
+++ /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch 2010-07-28 09:42:06.000000000 -0400
@@ -0,0 +1,12 @@
+Index qt-everywhere-opensource-src-4.6.0.orig/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.6.0/configure.orig 2009-12-10 15:49:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.6.0/configure 2009-12-10 15:50:20.000000000 -0500
+@@ -2917,6 +2917,7 @@
+ fi
+
+ QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
++eval QMAKE_CONF_COMPILER=$(echo $QMAKE_CONF_COMPILER | sed "s/(/{/" | sed "s/)/}/")
+ TEST_COMPILER="$CC"
+ [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+
diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.0.inc /home/oe/local/recipes/qt4/qt-4.6.0.inc
--- /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.0.inc 2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.0.inc 2010-07-28 09:43:19.000000000 -0400
@@ -3,6 +3,7 @@
FILESPATHPKG .= ":qt-${PV}"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://configure-conf_compiler-fix.patch \
file://0001-cross-compile.patch \
file://0002-fix-resinit-declaration.patch \
file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.2.inc /home/oe/local/recipes/qt4/qt-4.6.2.inc
--- /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.2.inc 2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.2.inc 2010-07-28 09:43:16.000000000 -0400
@@ -3,6 +3,7 @@
FILESPATHPKG .= ":qt-${PV}"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://configure-conf_compiler-fix.patch \
file://0001-cross-compile.patch \
file://0002-fix-resinit-declaration.patch \
file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.3.inc /home/oe/local/recipes/qt4/qt-4.6.3.inc
--- /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.3.inc 2010-07-29 13:49:47.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.3.inc 2010-07-29 16:15:45.000000000 -0400
@@ -3,6 +3,7 @@
FILESPATHPKG .= ":qt-${PV}"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://configure-conf_compiler-fix.patch \
file://0001-cross-compile.patch \
file://0002-fix-resinit-declaration.patch \
file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/qt4-embedded.inc /home/oe/local/recipes/qt4/qt4-embedded.inc
--- /home/oe/2010-07-29/openembedded/recipes/qt4/qt4-embedded.inc 2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt4-embedded.inc 2010-07-29 08:23:23.000000000 -0400
@@ -4,7 +4,7 @@
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r20"
+INC_PR = "r21"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
@@ -12,6 +12,7 @@
QT_LIBINFIX = "E"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+ file://configure-conf_compiler-fix.patch \
file://0001-cross-compile.patch \
file://0002-fix-resinit-declaration.patch \
file://0003-no-tools.patch \
diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/qt4-x11-free.inc /home/oe/local/recipes/qt4/qt4-x11-free.inc
--- /home/oe/2010-07-29/openembedded/recipes/qt4/qt4-x11-free.inc 2010-06-29 16:11:40.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt4-x11-free.inc 2010-07-29 08:23:19.000000000 -0400
@@ -5,9 +5,10 @@
LICENSE = "GPL QPL"
DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r18"
+INC_PR = "r19"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+ file://configure-conf_compiler-fix.patch \
file://0001-cross-compile.patch \
file://0002-fix-resinit-declaration.patch \
file://0003-no-tools.patch \
^ permalink raw reply [flat|nested] only message in thread