From 9337de0503a8541762f6110e1244f0d7f2b9a2b4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 10 Sep 2005 15:17:53 +0000 Subject: Update Qt3 from Qt3.3.x to Qt3.3.5 packages/qt/qt-x11-free-native: -update from 3.3.2 to 3.3.5 packages/qt/qt-x11-free: -update from 3.3.3 to 3.3.5 packages/qte-fonts-common/qte-fonts-common: -update from 3.3.3 to 3.3.5 packages/uicmoc/uicmoc3-native: -update from 3.3.2 to 3.3.5 -build not the complete Qt3 but only most parts -use ${PV} instead of hardcondig version packages/qmake/qmake-native_1.07: -update from 3.3.3 to 3.3.5 --- .../uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty | 0 .../uicmoc/uicmoc3-native-3.3.2/no-examples.patch | 16 ------- .../uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty | 0 .../uicmoc/uicmoc3-native-3.3.5/no-examples.patch | 16 +++++++ packages/uicmoc/uicmoc3-native_3.3.2.bb | 43 ------------------- packages/uicmoc/uicmoc3-native_3.3.5.bb | 49 ++++++++++++++++++++++ 6 files changed, 65 insertions(+), 59 deletions(-) delete mode 100644 packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty delete mode 100644 packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch create mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty create mode 100644 packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch delete mode 100644 packages/uicmoc/uicmoc3-native_3.3.2.bb create mode 100644 packages/uicmoc/uicmoc3-native_3.3.5.bb (limited to 'packages/uicmoc') diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty b/packages/uicmoc/uicmoc3-native-3.3.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch b/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch deleted file mode 100644 index b0ee6374ef..0000000000 --- a/packages/uicmoc/uicmoc3-native-3.3.2/no-examples.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200 -+++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty b/packages/uicmoc/uicmoc3-native-3.3.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch b/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch new file mode 100644 index 0000000000..b0ee6374ef --- /dev/null +++ b/packages/uicmoc/uicmoc3-native-3.3.5/no-examples.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200 ++++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200 +@@ -11,7 +11,7 @@ + install: FORCE + @$(MAKE) qt.install + +-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples ++all: symlinks src-qmake src-moc sub-src sub-tools + @echo + @echo "The Qt library is now built in ./lib" + @echo "The Qt examples are built in the directories in ./examples" diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb deleted file mode 100644 index f7024f90ba..0000000000 --- a/packages/uicmoc/uicmoc3-native_3.3.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x" -SECTION = "devel" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r1" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \ - file://no-examples.patch;patch=1" - -S = "${WORKDIR}/qt-embedded-free-3.3.2" - -inherit native qmake-base qt3e - -export QTDIR = "${S}" -export OE_QMAKE_LINK="${CXX}" -CXXFLAGS += " -DQWS" - -QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound \ - -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr -no-xrender -no-xft -no-tablet \ - -no-xkb -no-dlopen-opengl -no-freetype -no-thread \ - -no-nis -no-cups -prefix ${prefix} \ - -xplatform ${OE_QMAKE_PLATFORM} \ - -platform ${OE_QMAKE_PLATFORM}" - -do_configure() { - oe_qmake_mkspecs - echo "yes" | ./configure ${QT_CONFIG_FLAGS} -} - -do_stage() { - install -d ${OE_QMAKE_INCDIR_QT} - install -d ${OE_QMAKE_LIBDIR_QT} - - install -m 0755 bin/moc ${OE_QMAKE_MOC} - install -m 0755 bin/uic ${OE_QMAKE_UIC} - install -m 0655 lib/*.a ${OE_QMAKE_LIBDIR_QT} - - for f in include/*.h - do - install -m 0644 $f ${OE_QMAKE_INCDIR_QT}/ - done -} diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb new file mode 100644 index 0000000000..6354377bcf --- /dev/null +++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x" +SECTION = "devel" +PRIORITY = "optional" +LICENSE = "GPL QPL" +PR = "r1" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \ + file://no-examples.patch;patch=1" + +S = "${WORKDIR}/qt-embedded-free-${PV}" + +inherit native qmake-base qt3e + +export QTDIR = "${S}" +export OE_QMAKE_LINK="${CXX}" +CXXFLAGS += " -DQWS" + +QT_CONFIG_FLAGS = "-release -static -depths 8,16 -qt-zlib -no-nas-sound \ + -no-sm -no-libjpeg -no-libmng -no-gif -no-xshape -no-xinerama \ + -no-xcursor -no-xrandr -no-xrender -no-xft -no-tablet \ + -no-xkb -no-dlopen-opengl -no-freetype -no-thread \ + -no-nis -no-cups -prefix ${prefix} \ + -xplatform ${OE_QMAKE_PLATFORM} \ + -platform ${OE_QMAKE_PLATFORM}" + +do_configure() { + oe_qmake_mkspecs + echo "yes" | ./configure ${QT_CONFIG_FLAGS} +} + +do_compile() { + oe_runmake symlinks || die "Can't symlink include files" + oe_runmake src-moc || die "Building moc failed" + oe_runmake sub-tools || die "Building tools failed" +} + +do_stage() { + install -d ${OE_QMAKE_INCDIR_QT} + install -d ${OE_QMAKE_LIBDIR_QT} + + install -m 0755 bin/moc ${OE_QMAKE_MOC} + install -m 0755 bin/uic ${OE_QMAKE_UIC} + install -m 0655 lib/*.a ${OE_QMAKE_LIBDIR_QT} + + for f in include/*.h + do + install -m 0644 $f ${OE_QMAKE_INCDIR_QT}/ + done +} -- cgit v1.2.3