From: Holger Freyther Date: Sun, 23 Dec 2007 22:35:09 +0000 (+0000) Subject: Move Qt/X11 and Qt/Embedded (known as QtopiaCore) to a qt4 directory. We will see... X-Git-Tag: Release-2010-05/1~8080^2~38 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5133e67e43c7022e7c6f4c2ad4d9d784153758b;p=openembedded.git Move Qt/X11 and Qt/Embedded (known as QtopiaCore) to a qt4 directory. We will see a great unification in this directory. Besides the name Qt/X11 and Qt/Emebedded (QtopiaCore) are the same package with a different configure script. The aim is to share configuring, compiling, staging and packaging between these modules and making it more easy to try a bleeding qt snapshot. --- diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt4/.mtn2git_empty similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty rename to packages/qt4/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.3/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/.mtn2git_empty rename to packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch rename to packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/cross-compile.patch rename to packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch rename to packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch rename to packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch rename to packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch rename to packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/no-qmake.patch rename to packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.1.2/no-tools.patch rename to packages/qt4/qt4-x11-free-4.1.2/no-tools.patch diff --git a/packages/qte/qtopia-core/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty similarity index 100% rename from packages/qte/qtopia-core/.mtn2git_empty rename to packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.3/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0001-cross-compile.patch rename to packages/qt4/qt4-x11-free-4.3.3/0001-cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch rename to packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.3.3/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0003-no-tools.patch rename to packages/qt4/qt4-x11-free-4.3.3/0003-no-tools.patch diff --git a/packages/qt/qt4-x11-free-4.3.3/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0004-no-qmake.patch rename to packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch rename to packages/qt4/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch diff --git a/packages/qt/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch rename to packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch diff --git a/packages/qt/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch similarity index 100% rename from packages/qt/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch rename to packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb similarity index 100% rename from packages/qt/qt4-x11-free_4.1.2.bb rename to packages/qt4/qt4-x11-free_4.1.2.bb diff --git a/packages/qt/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb similarity index 100% rename from packages/qt/qt4-x11-free_4.3.3.bb rename to packages/qt4/qt4-x11-free_4.3.3.bb diff --git a/packages/qt/qt4_arch.inc b/packages/qt4/qt4_arch.inc similarity index 100% rename from packages/qt/qt4_arch.inc rename to packages/qt4/qt4_arch.inc diff --git a/packages/qt4/qte-functions.inc b/packages/qt4/qte-functions.inc new file mode 100644 index 0000000000..f0ffb0e612 --- /dev/null +++ b/packages/qt4/qte-functions.inc @@ -0,0 +1,11 @@ +def qte_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + diff --git a/packages/qt4/qtopia-core/.mtn2git_empty b/packages/qt4/qtopia-core/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qte/qtopia-core/linux-oe-qmake.conf b/packages/qt4/qtopia-core/linux-oe-qmake.conf similarity index 100% rename from packages/qte/qtopia-core/linux-oe-qmake.conf rename to packages/qt4/qtopia-core/linux-oe-qmake.conf diff --git a/packages/qte/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb similarity index 100% rename from packages/qte/qtopia-core_4.2.0.bb rename to packages/qt4/qtopia-core_4.2.0.bb diff --git a/packages/qte/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb similarity index 100% rename from packages/qte/qtopia-core_4.3.3.bb rename to packages/qt4/qtopia-core_4.3.3.bb