[oe-commits] org.oe.dev packages/qt4/: Share some more patches (no host includes, cross-compile) between Embedded and X11

[freyther commit]

packages/qt4/: Share some more patches (no host includes, cross-compile) between Embedded and X11
    -Use the CROSSARCH hack/patch on QtopiaCore as well
    -Do not search /usr/include for freetype and openssl on Qt as well
    -Do not build a qmake version (needed a diversion due different configure scripts)

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 680bcf9aacd5e8883bede83f1092c98db56e4258
ViewMTN: http://monotone.openembedded.org/revision/info/680bcf9aacd5e8883bede83f1092c98db56e4258
Files:
1
packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch
packages/qt4/files/0001-cross-compile.patch
packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch
packages/qt4/files/0003-no-tools.patch
packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch
packages/qt4/files/0005-fix-mkspecs.patch
packages/qt4/files
packages/qt4/qtopia-core-4.3.3
packages/qt4/qtopia-core/0004-no-qmake.patch
packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
packages/qt4/qtopia-core.inc
packages/qt4/qtopia-core_4.3.3.bb
Diffs:

#
# mt diff -rc70e0edf55d8daad66cd664301fbfc27f2386625 -r680bcf9aacd5e8883bede83f1092c98db56e4258
#
# 
# 
# rename "packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch"
#     to "packages/qt4/files/0001-cross-compile.patch"
# 
# rename "packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch"
#     to "packages/qt4/files/0003-no-tools.patch"
# 
# rename "packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch"
#     to "packages/qt4/files/0005-fix-mkspecs.patch"
# 
# add_dir "packages/qt4/files"
# 
# add_dir "packages/qt4/qtopia-core-4.3.3"
# 
# add_file "packages/qt4/qtopia-core/0004-no-qmake.patch"
#  content [3161380072937eb18db9e2b0e7ab732d8a1ad0e8]
# 
# add_file "packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch"
#  content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
# 
# add_file "packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch"
#  content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
# 
# patch "packages/qt4/qtopia-core.inc"
#  from [43362ed93891f96b27e12fea9a81198cc5d99b6d]
#    to [c605dfa8ddd60b666adaff640392f113671a47d3]
# 
# patch "packages/qt4/qtopia-core_4.3.3.bb"
#  from [d4c7ad00be94df45470607e15d0af953b69f996b]
#    to [79b0ab4f4981a89ecb7eecc8556f7d53c2e6d671]
# 
============================================================
--- packages/qt4/qtopia-core/0004-no-qmake.patch	3161380072937eb18db9e2b0e7ab732d8a1ad0e8
+++ packages/qt4/qtopia-core/0004-no-qmake.patch	3161380072937eb18db9e2b0e7ab732d8a1ad0e8
@@ -0,0 +1,25 @@
+From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Sat, 2 Jun 2007 16:06:59 +0200
+Subject: [PATCH] no qmake
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index b3c2a52..1901e57 100755
+--- a/configure
++++ b/configure
+@@ -3517,7 +3517,7 @@ END {
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.5.0.7
+
============================================================
--- packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch	3570223a649acdeb59d0a0d14207bea417a9c8b5
+++ packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch	3570223a649acdeb59d0a0d14207bea417a9c8b5
@@ -0,0 +1,23 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 84974bf..ab9a6f2 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         p = $$join(p, "", "", "/freetype2")
+         exists($$p):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
============================================================
--- packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch	a1b4e6415d9a946ffd9c11915b871187c76f8245
+++ packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch	a1b4e6415d9a946ffd9c11915b871187c76f8245
@@ -0,0 +1,23 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
+index 756e5fe..19b4061 100644
+--- a/config.tests/unix/openssl/openssl.pri
++++ b/config.tests/unix/openssl/openssl.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         pp = $$join(p, "", "", "/openssl")
+         exists($$pp):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
============================================================
--- packages/qt4/qtopia-core.inc	43362ed93891f96b27e12fea9a81198cc5d99b6d
+++ packages/qt4/qtopia-core.inc	c605dfa8ddd60b666adaff640392f113671a47d3
@@ -6,6 +6,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
 DEPENDS += "tslib"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch;patch=1 \
            file://0003-no-tools.patch;patch=1 \
            file://0004-no-qmake.patch;patch=1 \
            file://0005-fix-mkspecs.patch;patch=1"
============================================================
--- packages/qt4/qtopia-core_4.3.3.bb	d4c7ad00be94df45470607e15d0af953b69f996b
+++ packages/qt4/qtopia-core_4.3.3.bb	79b0ab4f4981a89ecb7eecc8556f7d53c2e6d671
@@ -1 +1,4 @@ require qtopia-core.inc
 require qtopia-core.inc
+SRC_URI += " \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0007-openssl-host-includes.patch;patch=1 "