merge of 476ae0428965694f00e9493316ccf44da4a20828

     and dad0aed1e62cdb5bd930bc9fe478376ea112fb92

3 files changed, 120 insertions, 31 deletions

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 3bff27763d..e668c3ce38 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -8,33 +8,41 @@ DISTRO_VERSION = "donkey"
 
 export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
 
-# No uniroot
+#<>----------------------------------------------------------------->
+#<> No uniroot
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
-#<>
+
+#<>----------------------------------------------------------------->
 #<> We will set CVS DATE when things are known to work.
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
+
+#<>----------------------------------------------------------------->
 #<> We want this so we can crosscompile the kernel using gcc 3.4.3
 #<> Also, select version of modules (and kernel)
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel"
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
 
-#<>
+
+#<>----------------------------------------------------------------->
 #<>We want kdrive as our default X-Server.
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_PROVIDER_xserver          = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/xserver  = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/libx11    = "libx11"
+PREFERRED_VERSION_liblbxutil         = "X11R7.0-1.0.0"
+require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 
-#<>
+#<>----------------------------------------------------------------->
 #<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
-#<>
+#<>-----------------------------------------------------------------<
 PREFERRED_VERSION_binutils = "2.17"
 PREFERRED_VERSION_binutils-cross = "2.17"
 PREFERRED_VERSION_binutils-cross-sdk = "2.16.91.0.7"
@@ -44,76 +52,101 @@ PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
 PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"                                             		    
 PREFERRED_VERSION_glibc = "2.4"
 PREFERRED_VERSION_glibc-intermediate = "2.4"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
 
 
-#<>
-#<>Setting Preferred glib-2.0,glib-1.2
-#<>
+#<>------------------------------------------------------------------>
+#<>Setting Preferred glib, dbus, db-native
+#<>------------------------------------------------------------------<
 PREFERRED_VERSION_glib-2.0-native = "2.6.5"
 PREFERRED_VERSION_glib-1.2-native = "1.2.10"
-PREFERRED_VERSION_glib-2.0 = "2.10.0"
+PREFERRED_VERSION_glib-2.0 = "2.12.0"
 PREFERRED_VERSION_glib-1.2 = "1.2.10"
+PREFERRED_VERSION_pango = "1.12.0"
+PREFERRED_VERSION_dbus = "0.61"
+PREFERRED_VERSION_dbus-native = "0.61"
+PREFERRED_PROVIDER_dbus-glib = "dbus"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
 
+#<>------------------------------------------------------------------>
 #<>
 #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
-#<>
+#<>------------------------------------------------------------------<
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
 PREFERRED_PROVIDER_tslib         = "tslib"
-PREFRRED_VERSION_cairo           = "1.0.4"
-#<>
+
+
+#<>------------------------------------------------------------------>
 #<>Other Specific stuff.
 #<>
 #<>
 #<>We want to be able to build this for all jornadas so
 #<>to not mess up the folders we need to make them dynamic.
 #<>It will use different folders depending on Arch (set in local.conf)
+#<>------------------------------------------------------------------<
 SRC_DIST_LOCAL = "copy"
 INHERIT += "package_ipk package_tar multimachine src_distribute_local"
 BBINCLUDELOGS = "yes"
 IMAGE_FSTYPES = "tar.bz2"
 TARGET_OS = "linux"
 
+
+#<>------------------------------------------------------------------>
 #<>What we want on the bootstrap image (extra) 
 #<>                                            
-#<>
+#<>------------------------------------------------------------------<
 BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools  \
                              udev e2tools e2fsprogs kernel-modules keymaps \
 			     wget"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<>What Qte, libqte.. versions should we use.
-#<>
+#<>------------------------------------------------------------------<
 QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
 OPIE_VERSION = "1.2.2"
 require conf/distro/include/preferred-opie-versions.inc
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<> Lets decide on a GPE versipns
-#<>
+#<> And lets override GTK to something that builds
+#<>------------------------------------------------------------------<
 require conf/distro/include/preferred-gpe-versions-2.7.inc
+PREFERRED_VERSION_gtk+ = "2.8.16"
+PREFERRED_VERSION_pango = "1.12.0"
+PREFERRED_VERSION_cairo = "1.2.2"
+PREFERRED_VERSION_gtk-engines = "2.7.4"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<> We want pcmciautils, not pcmcia-cs
-#<>
+#<>------------------------------------------------------------------<
 PCMCIA_MANAGER = "pcmciautils"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<> We are using gcc 4.1.1 so lets keep optimizations low
-#<> 
+#<>------------------------------------------------------------------< 
 FULL_OPTIMIZATION = "-O1"
 
-#<>
+
+#<>------------------------------------------------------------------>
 #<>Our Image files should look abit better.
 #<>
-#<>
+#<>------------------------------------------------------------------<
 IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
 
+
+#<>------------------------------------------------------------------>
 #<>
 #<>
+#<> General non-essential programs with known working versions
 #<>
-#<> General non-essential programs
-#<>
-#<>
-PREFERRED_VERSION_irssi = "0.8.10"
\ No newline at end of file
+#<>------------------------------------------------------------------<
+PREFERRED_VERSION_irssi = "0.8.10"
+PREFERRED_VERSION_mc = "4.6.1"
+PREFERRED_VERSION_nano = "1.3.9"
+PREFERRED_VERSION_ncurses = "5.4"
+PREFERRED_VERSION_ncftp = "3.1.9"
\ No newline at end of file
diff --git a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
new file mode 100644
index 0000000000..afa34712e2
--- /dev/null
+++ b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
@@ -0,0 +1,54 @@
+diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac
+--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac	2005-12-15 00:24:36.000000000 +0000
++++ liblbxutil-X11R7.0-1.0.0/configure.ac	2006-08-21 18:32:04.000000000 +0000
+@@ -60,4 +60,5 @@
+ 
+ AC_OUTPUT([Makefile
+ 	   src/Makefile
++	   src/image/Makefile
+ 	   lbxutil.pc])
+diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am
+--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am	2005-10-16 02:07:10.000000000 +0000
++++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am	2006-08-21 18:32:04.000000000 +0000
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+ 
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES =				\
+-	$(srcdir)/image/mkg3states.c
++SUBDIRS = image
+ 
+ liblbxutil_la_SOURCES =				\
+ 	$(srcdir)/lbx_zlib/reqstats.h		\
+@@ -28,9 +25,8 @@
+ 
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+ 
+-g3states.h: mkg3states
+-	-rm -f g3states.h
+-	./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++	./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+ 
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0
+ 
+diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am
+--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am	1970-01-01 00:00:00.000000000 +0000
++++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am	2006-08-21 18:32:04.000000000 +0000
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES =				\
++	mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
index df8b267601..57b2987968 100644
--- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
@@ -1,5 +1,7 @@
 require xorg-lib-common.inc
 
+SRC_URI += "file://mkg3states-1.0.0.patch;patch=0"
+
 DESCRIPTION = "XFIXES Extension"
 
 DEPENDS += " xextproto xproto zlib"