Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/03 21:18:23+01:00 uni-frankfurt.de!mickeyl
oz-3.5.3: bump cvsdate and use cvs libopie2 for now

2005/01/03 21:04:48+01:00 uni-frankfurt.de!mickeyl
add uic and moc for Qt(Embedded) 4.x

BKrev: 41d9ada7SbgMRvJTDBHxq3TQ_91lXQ

diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index b59c31e..b9e7707 100644 (file)
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -11,7 +11,7 @@ FEED_URIS += " \
        console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
        devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = 20041227
+CVSDATE = "20050103"
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
@@ -28,6 +28,11 @@ TARGET_FPU = "soft"
 #DEBUG_BUILD = "1"
 #INHIBIT_PACKAGE_STRIP = "1"
 
+#
+# Base
+#
+
+CVSDATE_ipkg-utils-native = "20041215"
 PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
 PREFERRED_VERSION_libtool-native = "1.5.6"
 PREFERRED_VERSION_libtool-cross= "1.5.6"
@@ -42,6 +47,7 @@ PREFERRED_VERSION_bluez-utils-dbus = "2.11"
 
 OPIE_VERSION = "1.1.8"
 include conf/distro/preferred-opie-versions.inc
+PREFERRED_VERSION_libopie2 = "the-latest-please"
 
 #
 # GPE

diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch b/packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb
new file mode 100644 (file)
index 0000000..e69de29