summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-03 20:40:07 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-03 20:40:07 +0000
commit5da1e3ed33935a23e880351640b925295c88f83b (patch)
tree62dadb829e4736441a15da608805a8e31338d08f
parent27e742bf4404d88757a9ad47a1463eae7a0a5768 (diff)
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
-rw-r--r--conf/distro/openzaurus-3.5.3.conf8
-rw-r--r--packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch0
-rw-r--r--packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch0
-rw-r--r--packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch0
-rw-r--r--packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch0
-rw-r--r--packages/uicmoc/uicmoc4-native_4.0.0-b1.bb0
6 files changed, 7 insertions, 1 deletions
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index b59c31e2c5..b9e7707edc 100644
--- 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
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-mkspecs.patch
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
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwidget.patch
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
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native-4.0.0-b1/fix-qwsmanager.patch
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
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native-4.0.0-b1/gcc34.patch
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
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb