From 689e31831953d5e817525447664c915f0b1377e1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 30 Mar 2006 14:11:45 +0000 Subject: [PATCH] qt-x11-free: upgrade to 3.3.6 and 4.1.1 respectively --- .../.mtn2git_empty | 0 .../cross-compile.patch | 0 .../fix-resinit-declaration.patch | 0 .../no-tools.patch | 0 packages/qt/qt-x11-free/gcc4_1-HACK.patch | 28 +++++++++++++++++++ ...x11-free_3.3.5.bb => qt-x11-free_3.3.6.bb} | 7 +++-- ...x11-free_4.0.1.bb => qt-x11-free_4.1.1.bb} | 0 7 files changed, 32 insertions(+), 3 deletions(-) rename packages/qt/{qt-x11-free-4.0.1 => qt-x11-free-4.1.1}/.mtn2git_empty (100%) rename packages/qt/{qt-x11-free-4.0.1 => qt-x11-free-4.1.1}/cross-compile.patch (100%) rename packages/qt/{qt-x11-free-4.0.1 => qt-x11-free-4.1.1}/fix-resinit-declaration.patch (100%) rename packages/qt/{qt-x11-free-4.0.1 => qt-x11-free-4.1.1}/no-tools.patch (100%) create mode 100644 packages/qt/qt-x11-free/gcc4_1-HACK.patch rename packages/qt/{qt-x11-free_3.3.5.bb => qt-x11-free_3.3.6.bb} (94%) rename packages/qt/{qt-x11-free_4.0.1.bb => qt-x11-free_4.1.1.bb} (100%) diff --git a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty b/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty similarity index 100% rename from packages/qt/qt-x11-free-4.0.1/.mtn2git_empty rename to packages/qt/qt-x11-free-4.1.1/.mtn2git_empty diff --git a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch b/packages/qt/qt-x11-free-4.1.1/cross-compile.patch similarity index 100% rename from packages/qt/qt-x11-free-4.0.1/cross-compile.patch rename to packages/qt/qt-x11-free-4.1.1/cross-compile.patch diff --git a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch b/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch similarity index 100% rename from packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch rename to packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch diff --git a/packages/qt/qt-x11-free-4.0.1/no-tools.patch b/packages/qt/qt-x11-free-4.1.1/no-tools.patch similarity index 100% rename from packages/qt/qt-x11-free-4.0.1/no-tools.patch rename to packages/qt/qt-x11-free-4.1.1/no-tools.patch diff --git a/packages/qt/qt-x11-free/gcc4_1-HACK.patch b/packages/qt/qt-x11-free/gcc4_1-HACK.patch new file mode 100644 index 0000000000..818bced4ee --- /dev/null +++ b/packages/qt/qt-x11-free/gcc4_1-HACK.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch ++++ qt-x11-free-3.3.6/src/tools/qstring.h +@@ -60,7 +60,7 @@ + #endif + #endif + +- ++#define Q_NO_PACKED_REFERENCE + /***************************************************************************** + QString class + *****************************************************************************/ +@@ -194,9 +194,9 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort*)&ucs); } + #else +- ushort &unicode() { return ucs; } ++ ushort &unicode() { return (ushort)ucs; } + #endif + #ifndef QT_NO_CAST_ASCII + // like all ifdef'd code this is undocumented diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.6.bb similarity index 94% rename from packages/qt/qt-x11-free_3.3.5.bb rename to packages/qt/qt-x11-free_3.3.6.bb index 0f57314971..f92414ac73 100644 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Qt/X11 Version ${PV}" +DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" SECTION = "x11/libs" PRIORITY = "optional" LICENSE = "GPL QPL" @@ -6,11 +6,12 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "uicmoc3-native freetype libx11 xft libxext libxrender libxrandr libxcursor mysql" PROVIDES = "qt3x11" -PR = "r10" +PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ - file://no-examples.patch;patch=1" + file://no-examples.patch;patch=1 \ + file://gcc4_1-HACK.patch;patch=1" S = "${WORKDIR}/qt-x11-free-${PV}" inherit qmake-base qt3x11 diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.1.1.bb similarity index 100% rename from packages/qt/qt-x11-free_4.0.1.bb rename to packages/qt/qt-x11-free_4.1.1.bb -- 2.39.5