[oe-commits] org.oe.dev packages/{qt, qte, uicmoc, qmake}: Update to Qt(opiaCore) 4.3.2
freyther commit
openembedded-commits at lists.openembedded.org
Tue Oct 23 16:39:01 UTC 2007
packages/{qt,qte,uicmoc,qmake}: Update to Qt(opiaCore) 4.3.2
-Update PREFERRED_VERSION
-Update checksums
-Update patches
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 730545b38a3f93aa84767feb0e823edcd31ab0b5
ViewMTN: http://monotone.openembedded.org/revision/info/730545b38a3f93aa84767feb0e823edcd31ab0b5
Files:
1
packages/qt/qt4-x11-free-4.3.0
packages/qt/qt4-x11-free-4.3.2
packages/qt/qt4-x11-free_4.3.0.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/qte/qtopia-core_4.3.1.bb
packages/qte/qtopia-core_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/qmake/qmake2-native_2.10a.bb
packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
Diffs:
#
# mt diff -re1fe65a4b3c3e1cb2e165b49decd7446cb230240 -r730545b38a3f93aa84767feb0e823edcd31ab0b5
#
#
#
# rename "packages/qt/qt4-x11-free-4.3.0"
# to "packages/qt/qt4-x11-free-4.3.2"
#
# rename "packages/qt/qt4-x11-free_4.3.0.bb"
# to "packages/qt/qt4-x11-free_4.3.2.bb"
#
# rename "packages/qte/qtopia-core_4.3.1.bb"
# to "packages/qte/qtopia-core_4.3.2.bb"
#
# add_file "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# content [83b84a6976c32c4c094913143c9ed28a2b37c610]
#
# patch "conf/checksums.ini"
# from [75d2658af051ce6ee032da90880a92b443c0b2cf]
# to [78e9ab72ee5a554ef253871c127648c291eb7aca]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [4740958999af1bfaa846c5bee18b22b6ffa9d73d]
# to [fc4044ff28a727b46e467b4d2e6ce4223496be10]
#
# patch "packages/qmake/qmake2-native_2.10a.bb"
# from [ee62f0cd510bf9374ee05aecd30c84f2f88ce94d]
# to [4e99113b60782b4965c8f34d69ca62a338f36078]
#
# patch "packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch"
# from [c3afeaba18e291233ac487a7a527fffb07d2af3d]
# to [df1a4142fcb80ad473de37338a9f39993018ce92]
#
# patch "packages/qte/qtopia-core_4.3.2.bb"
# from [318931809588acb33cdc77b0acb027a9d326485c]
# to [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
#
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.2.bb 83b84a6976c32c4c094913143c9ed28a2b37c610
+++ packages/uicmoc/uicmoc4-native_4.3.2.bb 83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -0,0 +1,60 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-nis -no-cups -no-exceptions \
+ -no-accessibility -no-libjpeg \
+ -no-nas-sound -no-sm \
+ -no-xshape -no-xinerama \
+ -no-xcursor -no-xrandr \
+ -no-xrender -no-fontconfig \
+ -no-tablet -no-xkb \
+ -no-libpng \
+ -verbose -release -fast -static \
+ -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+"
+
+do_compile() {
+ unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_stage() {
+ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+ install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+ install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+ install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+ install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- conf/checksums.ini 75d2658af051ce6ee032da90880a92b443c0b2cf
+++ conf/checksums.ini 78e9ab72ee5a554ef253871c127648c291eb7aca
@@ -1286,6 +1286,10 @@ sha256=8fdbc7da376b22796879d6e3b756f71a8
md5=9519eccf0638c9962f73a7b20da77e0e
sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
+[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz]
+md5=70b729dd5dd8b2b432d685918e1971f1
+sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963
+
[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
md5=1f0193358e92559ec0f598b09ccbc0ec
sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 4740958999af1bfaa846c5bee18b22b6ffa9d73d
+++ conf/distro/include/angstrom-2007-preferred-versions.inc fc4044ff28a727b46e467b4d2e6ce4223496be10
@@ -1618,7 +1618,7 @@ PREFERRED_VERSION_qt-x11-free-native ?=
PREFERRED_VERSION_qsvn ?= "0.3.0"
PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
-PREFERRED_VERSION_qt4-x11-free ?= "4.3.0"
+PREFERRED_VERSION_qt4-x11-free ?= "4.3.2"
PREFERRED_VERSION_qtplot ?= "0.2"
PREFERRED_VERSION_quagga ?= "0.99.8"
PREFERRED_VERSION_quake1 ?= "0.0.1"
@@ -1894,7 +1894,7 @@ PREFERRED_VERSION_uicmoc3-native ?= "3.3
PREFERRED_VERSION_ufraw ?= "0.12"
PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
-PREFERRED_VERSION_uicmoc4-native ?= "4.3.1"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.2"
PREFERRED_VERSION_uim ?= "1.3.1"
PREFERRED_VERSION_uim-native ?= "1.3.1"
PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
============================================================
--- packages/qmake/qmake2-native_2.10a.bb ee62f0cd510bf9374ee05aecd30c84f2f88ce94d
+++ packages/qmake/qmake2-native_2.10a.bb 4e99113b60782b4965c8f34d69ca62a338f36078
@@ -1,11 +1,11 @@ LICENSE = "GPL"
DESCRIPTION = "TrollTech Makefile Generator"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
-QTVER = "qtopia-core-opensource-src-4.3.1"
+QTVER = "qtopia-core-opensource-src-4.3.2"
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
============================================================
--- packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch c3afeaba18e291233ac487a7a527fffb07d2af3d
+++ packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch df1a4142fcb80ad473de37338a9f39993018ce92
@@ -7,11 +7,11 @@ Subject: [PATCH] cross compile
configure | 137 ++----------------------------------------------------------
1 files changed, 5 insertions(+), 132 deletions(-)
-diff --git a/configure b/configure
-index 6b3ccd2..b3c2a52 100755
---- a/configure
-+++ b/configure
-@@ -733,7 +733,7 @@ while [ "$#" -gt 0 ]; do
+Index: qt-x11-opensource-src-4.3.2/configure
+===================================================================
+--- qt-x11-opensource-src-4.3.2.orig/configure 2007-10-01 15:06:03.000000000 +0200
++++ qt-x11-opensource-src-4.3.2/configure 2007-10-23 09:32:25.000000000 +0200
+@@ -735,7 +735,7 @@
UNKNOWN_ARG=yes
fi
;;
@@ -20,7 +20,7 @@ index 6b3ccd2..b3c2a52 100755
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL="$1"
-@@ -1109,6 +1109,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1124,6 +1124,9 @@
xplatform)
XPLATFORM="$VAL"
;;
@@ -30,7 +30,7 @@ index 6b3ccd2..b3c2a52 100755
debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
-@@ -2092,137 +2095,7 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+@@ -2119,149 +2122,7 @@
echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
fi
@@ -116,7 +116,7 @@ index 6b3ccd2..b3c2a52 100755
- ARCH=i386
- ;;
- *:*:x86_64|*:*:amd64)
-- if [ "$PLATFORM" = "linux-g++-32" ]; then
+- if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32 bit on 64-bit AMD 80x86 (i386)"
- fi
@@ -146,6 +146,18 @@ index 6b3ccd2..b3c2a52 100755
- fi
- ARCH=s390
- ;;
+- *:*:arm*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " ARM (arm)"
+- fi
+- ARCH=arm
+- ;;
+- Linux:*:sparc*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " Linux on SPARC"
+- fi
+- ARCH=sparc
+- ;;
- *:*:*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Trying '$UNAME_MACHINE'..."
@@ -169,6 +181,3 @@ index 6b3ccd2..b3c2a52 100755
if [ "$OPT_VERBOSE" = "yes" ]; then
echo "System architecture: '$ARCH'"
---
-1.5.0.7
-
============================================================
--- packages/qte/qtopia-core_4.3.1.bb 318931809588acb33cdc77b0acb027a9d326485c
+++ packages/qte/qtopia-core_4.3.2.bb 132f2ff144e5483dcf628cf56459ce7b81f52b0f
@@ -5,7 +5,7 @@ DEPENDS = "freetype tslib"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS = "freetype tslib"
-PR = "r1"
+PR = "r0"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
file://linux-oe-qmake.conf"
More information about the Openembedded-commits
mailing list