-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Holger fixed qt4 so the feed script doesn't have to rebuild it everytime
and even better: qt4-x11 and qt-e4 can co-exist now in staging and deploy.
mtn log packages/qt4 --no-merges --no-graph --to
9374f52664bf8a853a6627bbfbfb8a205b757138 --from
79d45e73d2895ffcdc7d64585b097a492ffdd6d9 --diffs
- -----------------------------------------------------------------
Revision: 2c1b6fa0891e86d61e015c51b2b0fc0690789b70
Ancestor: 16d9e54aa5518e5cf7f8c86dcf394a34ca1e771d
Author: [EMAIL PROTECTED]
Date: 2007-12-27T16:58:58
Branch: org.openembedded.dev
Modified files:
~ packages/qt4/qt_staging.inc
ChangeLog:
packages/qt4/qt_staging.inc: Stage the .prl and semi private Qt libraries.
============================================================
- --- packages/qt4/qt_staging.inc 1e20c2e834a2fdefaabe874c5cb9f9602a6325ef
+++ packages/qt4/qt_staging.inc 7cfc32182e50d232e37d0c6ff7a596d8ec467cc7
@@ -20,8 +20,17 @@ do_stage() {
~ do
~ sed -i s,installed=yes,installed=no, $i
~ cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/
+ cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl
${STAGING_LIBDIR}/${QT_DIR_NAME}
~ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la)
${STAGING_LIBDIR}/${QT_DIR_NAME}
~ done
+ for i in libQtAssistantClient${QT_LIBINFIX}
libQtDesignerComponents${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX}
libQtUiTools${QT_LIBINFIX} libQtDesigner${QT_LIBINFIX}
+ do
+ cp ${STAGE_TEMP}/${libdir}/$i.prl
${STAGING_LIBDIR}/${QT_DIR_NAME} || true
+ cp ${STAGE_TEMP}/${libdir}/$i.la
${STAGING_LIBDIR}/${QT_DIR_NAME} || true
+ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i
${STAGING_LIBDIR}/${QT_DIR_NAME} || true
+ oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i
${STAGING_LIBDIR}/${QT_DIR_NAME} || true
+ done
+
~ rm -rf ${STAGE_TEMP}
~ }
- -----------------------------------------------------------------
Revision: 16d9e54aa5518e5cf7f8c86dcf394a34ca1e771d
Ancestor: 334c3fe81497cd0c121f6445b9053dc3b6b40a2e
Author: [EMAIL PROTECTED]
Date: 2007-12-27T16:46:54
Branch: org.openembedded.dev
Modified files:
~ packages/qt4/files/0008-backport-qt-lib-infix.patch
~ packages/qt4/qt_packaging.inc
ChangeLog:
packages/qt4/qt_packaging.inc: Fix packaging of the QtUiTools${QT_LIBINFIX}
============================================================
- --- packages/qt4/files/0008-backport-qt-lib-infix.patch
38b864fb3010c2de2fe5c5a47fa3bae0247094b0
+++ packages/qt4/files/0008-backport-qt-lib-infix.patch
4d071a20c1c343cfcae88bbb9c4c6ff6153db11f
@@ -1,8 +1,8 @@
- -diff --git a/configure b/configure
- -index c5bdc34..a52607f 100755
- ---- a/configure
- -+++ b/configure
- -@@ -782,6 +782,11 @@ while [ "$#" -gt 0 ]; do
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27
17:26:19.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27
17:26:19.000000000 +0100
+@@ -782,6 +782,11 @@
~ VAR=endian
~ VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"`
~ ;;
@@ -14,7 +14,7 @@ index c5bdc34..a52607f 100755
~ -D?*|-D)
~ VAR="add_define"
~ if [ "$1" = "-D" ]; then
- -@@ -903,6 +908,9 @@ while [ "$#" -gt 0 ]; do
+@@ -903,6 +908,9 @@
~ libdir)
~ QT_INSTALL_LIBS="$VAL"
~ ;;
@@ -24,7 +24,7 @@ index c5bdc34..a52607f 100755
~ translationdir)
~ QT_INSTALL_TRANSLATIONS="$VAL"
~ ;;
- -@@ -2606,6 +2614,8 @@ fi
+@@ -2606,6 +2614,8 @@
~ -no-sse ............ Do not compile with use of SSE instructions.
~ -no-sse2 ........... Do not compile with use of SSE2 instructions.
@@ -33,7 +33,7 @@ index c5bdc34..a52607f 100755
~ -D <string> ........ Add an explicit define to the preprocessor.
~ -I <string> ........ Add an explicit include path.
~ -L <string> ........ Add an explicit library path.
- -@@ -5273,6 +5283,8 @@ QT_MAJOR_VERSION = $QT_MAJOR_VERSION
+@@ -5273,6 +5283,8 @@
~ QT_MINOR_VERSION = $QT_MINOR_VERSION
~ QT_PATCH_VERSION = $QT_PATCH_VERSION
@@ -42,11 +42,11 @@ index c5bdc34..a52607f 100755
~ EOF
~ if [ "$CFG_RPATH" = "yes" ]; then
~ echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
- -diff --git a/mkspecs/features/qt_functions.prf
b/mkspecs/features/qt_functions.prf
- -index 32a7fd5..48d584f 100644
- ---- a/mkspecs/features/qt_functions.prf
- -+++ b/mkspecs/features/qt_functions.prf
- -@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) {
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/features/qt_functions.prf
+===================================================================
+---
qtopia-core-opensource-src-4.3.3.orig/mkspecs/features/qt_functions.prf
2007-12-04 18:07:53.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/features/qt_functions.prf
2007-12-27 17:26:19.000000000 +0100
+@@ -28,7 +28,7 @@
~ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
~ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
~ }
@@ -55,7 +55,7 @@ index 32a7fd5..48d584f 100644
~ } else:!qt_no_framework { #detection
~ for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR
$$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
~ exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
- -@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) {
+@@ -46,15 +46,15 @@
~ }
~ isEmpty(LINKAGE) {
~ CONFIG(debug, debug|release) {
@@ -75,11 +75,11 @@ index 32a7fd5..48d584f 100644
~ }
~ LIBS += $$LINKAGE
~ export(LIBS)
- -diff --git a/src/qbase.pri b/src/qbase.pri
- -index 4db7e70..278e011 100644
- ---- a/src/qbase.pri
- -+++ b/src/qbase.pri
- -@@ -138,7 +138,7 @@ DEFINES += QT_NO_CAST_TO_ASCII
QT_ASCII_CAST_WARNINGS QT_44_API_QSQLQUERY_FINISH
+Index: qtopia-core-opensource-src-4.3.3/src/qbase.pri
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/src/qbase.pri 2007-12-04
18:08:13.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/src/qbase.pri 2007-12-27
17:26:19.000000000 +0100
+@@ -138,7 +138,7 @@
~ contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT
~ DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code
in our generated code
@@ -88,11 +88,11 @@ index 4db7e70..278e011 100644
~ moc_dir.name = moc_location
~ moc_dir.variable = QMAKE_MOC
- -diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
- -index c121f28..83c3ed7 100644
- ---- a/tools/assistant/lib/lib.pro
- -+++ b/tools/assistant/lib/lib.pro
- -@@ -52,7 +52,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
+Index: qtopia-core-opensource-src-4.3.3/tools/assistant/lib/lib.pro
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/tools/assistant/lib/lib.pro
2007-12-04 18:08:19.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/tools/assistant/lib/lib.pro
2007-12-27 17:26:19.000000000 +0100
+@@ -52,7 +52,7 @@
~ }
~ }
@@ -101,19 +101,19 @@ index c121f28..83c3ed7 100644
~ target.path=$$[QT_INSTALL_LIBS]
~ INSTALLS += target
- -diff --git a/tools/designer/src/components/component.pri
b/tools/designer/src/components/component.pri
- -index 15c0cf2..78b075d 100644
- ---- a/tools/designer/src/components/component.pri
- -+++ b/tools/designer/src/components/component.pri
+Index:
qtopia-core-opensource-src-4.3.3/tools/designer/src/components/component.pri
+===================================================================
+---
qtopia-core-opensource-src-4.3.3.orig/tools/designer/src/components/component.pri
2007-12-04 18:08:43.000000000 +0100
++++
qtopia-core-opensource-src-4.3.3/tools/designer/src/components/component.pri
2007-12-27 17:26:19.000000000 +0100
~ @@ -1,2 +1,2 @@
~ -TARGET = $$qtLibraryTarget($$TARGET)
~ +TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX)
- -diff --git a/tools/qdbus/src/src.pro b/tools/qdbus/src/src.pro
- -index 47ef100..0669a46 100644
- ---- a/tools/qdbus/src/src.pro
- -+++ b/tools/qdbus/src/src.pro
- -@@ -70,7 +70,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
+Index: qtopia-core-opensource-src-4.3.3/tools/qdbus/src/src.pro
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/tools/qdbus/src/src.pro
2007-12-04 18:08:18.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/tools/qdbus/src/src.pro 2007-12-27
17:26:19.000000000 +0100
+@@ -70,7 +70,7 @@
~ }
~ }
@@ -122,11 +122,11 @@ index 47ef100..0669a46 100644
~ # Input
- -diff --git a/tools/qtestlib/src/src.pro b/tools/qtestlib/src/src.pro
- -index 5120a29..7d2082e 100644
- ---- a/tools/qtestlib/src/src.pro
- -+++ b/tools/qtestlib/src/src.pro
- -@@ -61,7 +61,7 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
+Index: qtopia-core-opensource-src-4.3.3/tools/qtestlib/src/src.pro
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/tools/qtestlib/src/src.pro
2007-12-04 18:08:18.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/tools/qtestlib/src/src.pro
2007-12-27 17:26:19.000000000 +0100
+@@ -61,7 +61,7 @@
~ }
~ }
@@ -135,3 +135,32 @@ index 5120a29..7d2082e 100644
~ # Input
~ HEADERS = qtest_global.h qtestcase.h qtestdata.h qtesteventloop.h
+Index:
qtopia-core-opensource-src-4.3.3/tools/designer/src/uitools/uitools.pro
+===================================================================
+---
qtopia-core-opensource-src-4.3.3.orig/tools/designer/src/uitools/uitools.pro
2007-12-04 18:08:43.000000000 +0100
++++
qtopia-core-opensource-src-4.3.3/tools/designer/src/uitools/uitools.pro
2007-12-27 17:26:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = $$qtLibraryTarget(QtUiTools$$QT_LIBINFIX)
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+Index: qtopia-core-opensource-src-4.3.3/mkspecs/features/uitools.prf
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/features/uitools.prf
2007-12-27 17:32:57.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/mkspecs/features/uitools.prf
2007-12-27 17:33:56.000000000 +0100
+@@ -2,10 +2,10 @@
+ qt:load(qt)
+
+ # Include the correct version of the UiLoader library
+-QTUITOOLS_LINKAGE = -lQtUiTools
++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ CONFIG(debug, debug|release) {
+- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+
============================================================
- --- packages/qt4/qt_packaging.inc fe6ac1892555890ed97bb2e3b8cb75239b6a442b
+++ packages/qt4/qt_packaging.inc 49645ec215cac92b25eb2867013540ce7d7bd328
@@ -109,7 +109,7 @@ FILES_${QT_BASE_LIB}opengl4-dbg
~ FILES_${QT_BASE_LIB}opengl4 =
"${libdir}/libQtOpenGL${QT_LIBINFIX}.so.*"
~ FILES_${QT_BASE_LIB}opengl4-dev =
"[EMAIL PROTECTED]('OpenGL')}"
~ FILES_${QT_BASE_LIB}opengl4-dbg =
"${libdir}/.debug/libQtOpenGL*"
- -FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools*
${includedir}/${QT_DIR_NAME}/QtUiTools*
${libdir}/pkgconfig/${QT_LIBRARY_NAME}UiTools.pc"
+FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools*
${includedir}/${QT_DIR_NAME}/QtUiTools*
${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc"
~ FILES_${QT_BASE_NAME}-plugins-accessible =
"${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so"
- -----------------------------------------------------------------
Revision: 334c3fe81497cd0c121f6445b9053dc3b6b40a2e
Ancestor: fc6211a28427a6d82895be30299c901ec3e85868
Author: [EMAIL PROTECTED]
Date: 2007-12-27T16:17:05
Branch: org.openembedded.dev
Added files:
~ packages/qt4/qtopia-core/build-tools.patch
Modified files:
~ packages/qt4/qtopia-core.inc
ChangeLog:
packages/qt4/qtopia-core: Force building of tools, demos and examples
============================================================
- --- packages/qt4/qtopia-core/build-tools.patch
6612f0ee0a17e0dbc12ea3bed6fa66232e887240
+++ packages/qt4/qtopia-core/build-tools.patch
6612f0ee0a17e0dbc12ea3bed6fa66232e887240
@@ -0,0 +1,28 @@
+Do not disable tools, examples and demos for the QWS build. Use brute-force
+to do this.
+
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27
16:30:36.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27
16:30:52.000000000 +0100
+@@ -2265,13 +2265,13 @@
+ CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+
+ # don't build tools by default when cross-compiling
+- if [ "$PLATFORM" != "$XPLATFORM" ]; then
+- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+- fi
+-fi
+-for nobuild in $CFG_NOBUILD_PARTS; do
+- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+-done
++ #if [ "$PLATFORM" != "$XPLATFORM" ]; then
++ # CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
++ #fi
++fi
++#for nobuild in $CFG_NOBUILD_PARTS; do
++# CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
++#done
+ if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+ # echo
+ # echo "WARNING: libs is a required part of the build."
============================================================
- --- packages/qt4/qtopia-core.inc 27e955f9b1f75f8581de52f9d083dd2df2ec13fa
+++ packages/qt4/qtopia-core.inc afdef9632312a739952146a0359c30d1fc64c12f
@@ -10,7 +10,8 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/so
~ 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"
+ file://0005-fix-mkspecs.patch;patch=1 \
+ file://build-tools.patch;patch=1"
~ S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
- -----------------------------------------------------------------
Revision: c6fac7ea20ca568a16a2b76aae0eb280f2faf7a3
Ancestor: 1b7a0ce636b3aecd3b458daaf269477093c9ffca
Author: [EMAIL PROTECTED]
Date: 2007-12-27T12:59:27
Branch: org.openembedded.dev
Modified files:
~ packages/qt4/qt_staging.inc
ChangeLog:
packages/qt4/qt_staging.inc: Manually fix the .la files to say installed=no
============================================================
- --- packages/qt4/qt_staging.inc 138e3742b0fa71c3307af21a755fcc6e6f9c90da
+++ packages/qt4/qt_staging.inc 1e20c2e834a2fdefaabe874c5cb9f9602a6325ef
@@ -18,6 +18,7 @@ do_stage() {
~ for i in ${STAGE_TEMP}/${libdir}/*.la
~ do
+ sed -i s,installed=yes,installed=no, $i
~ cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/
~ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la)
${STAGING_LIBDIR}/${QT_DIR_NAME}
~ done
BACKPORTS.txt bookkeeping:
2c1b6fa0891e86d61e015c51b2b0fc0690789b70 QT4 fixes (koen)
16d9e54aa5518e5cf7f8c86dcf394a34ca1e771d "
334c3fe81497cd0c121f6445b9053dc3b6b40a2e "
c6fac7ea20ca568a16a2b76aae0eb280f2faf7a3 "
regards,
Koen
- --
[EMAIL PROTECTED] will go go away in december 2007, please
use [EMAIL PROTECTED] instead.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFHiyxeMkyGM64RGpERAgFLAJ4mKm7Yjmr3JkO8WnrRyxU1So+y6gCeJNKC
/3taOGhtb9Y+QZfXsqevMRU=
=p7vF
-----END PGP SIGNATURE-----
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
