1 files changed, 81 insertions, 90 deletions
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index c338291abe..ab115ac292 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -19,14 +19,14 @@ TARGET_FPU ?= "soft"
 PARALLEL_INSTALL_MODULES = "1"
-FEED_URIS += " \
+#FEED_URIS += " \
-           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
+#           upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
+#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
+#            machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
+#               base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
+#               libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
+#            console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
+#              devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
 ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
 OEINCLUDELOGS = "yes"
@@ -39,110 +39,101 @@ KERNEL_CONSOLE = "ttyS0"
 #
 # Core Versions
 #
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
 PREFERRED_VERSION_gcc-cross ?= "3.4.4"
 PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
 PREFERRED_VERSION_hostap-modules ?= "0.3.9"
 #
-# Opie and E Image preferred verions
-# Use our own instead of GPE
-#
-OPIE_VERSION = "1.2.1"
-include conf/distro/preferred-opie-versions.inc
-#include conf/distro/preferred-e-versions.inc
-#
 # Preferred providers:
 #
 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"
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
 #fix some iconv issues, needs to be adjusted when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv=glibc
+PREFERRED_PROVIDER_virtual/libiconv ?= glibc
-PREFERRED_PROVIDER_virtual/libintl=glibc
+PREFERRED_PROVIDER_virtual/libintl ?= glibc
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
-PREFERRED_PROVIDER_x11 = "diet-x11"
+PREFERRED_PROVIDER_x11 ?= "diet-x11"
-PREFERRED_PROVIDER_gconf=gconf-dbus
+PREFERRED_PROVIDER_gconf ?= gconf-dbus
-PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
+PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
-PREFERRED_VERSION_gnome-vfs-dbus = "2.12.0+cvs${SRCDATE}"
+PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
 #
 # CVS Dates to use:
 #
-#SRCDATE_gnome-vfs-dbus = "20051215"
+#SRCDATE_gnome-vfs-dbus ?= "20051215"
-SRCDATE_gconf-dbus = "20060119"
+SRCDATE_gconf-dbus ?= "20060119"
-SRCDATE_gnome-vfs-dbus = "20060119"
+SRCDATE_gnome-vfs-dbus ?= "20060119"
-SRCDATE_contacts = "20060207"
+SRCDATE_contacts ?= "20060207"
-SRCDATE_dates = "20060214"
+SRCDATE_dates ?= "20060323"
-SRCDATE_gtkhtml2 = "20060213"
+SRCDATE_gtkhtml2 ?= "20060323"
-SRCDATE_eds-dbus = "20060126"
+SRCDATE_web ?= "20060325"
-SRCDATE_minimo = "20050401"
+SRCDATE_eds-dbus ?= "20060126"
-SRCDATE_ipkg-utils-native = "20050930"
+SRCDATE_minimo ?= "20050401"
-SRCDATE_ipkg-link-1 = "20050930"
+SRCDATE_ipkg-utils-native ?= "20050930"
-SRCDATE_ipkg-utils = "20050930"
+SRCDATE_ipkg-link-1 ?= "20050930"
-SRCDATE_ipkg-link = "20050930"
+SRCDATE_ipkg-utils ?= "20050930"
-SRCDATE_matchbox-common = "20051101"
+SRCDATE_ipkg-link ?= "20050930"
-SRCDATE_matchbox-config-gtk = "20051101"
+SRCDATE_matchbox-common ?= "20051101"
-SRCDATE_matchbox-desktop = "20060120"
+SRCDATE_matchbox-config-gtk ?= "20051101"
-SRCDATE_matchbox-keyboard = "20051101"
+SRCDATE_matchbox-desktop ?= "20060120"
-SRCDATE_matchbox-panel = "20051101"
+SRCDATE_matchbox-keyboard ?= "20051101"
-SRCDATE_matchbox-panel-manager = "20051101"
+SRCDATE_matchbox-panel ?= "20051101"
-SRCDATE_matchbox-stroke = "20051101"
+SRCDATE_matchbox-panel-manager ?= "20051101"
-SRCDATE_matchbox-themes-extra = "20051101"
+SRCDATE_matchbox-stroke ?= "20051101"
-SRCDATE_matchbox-wm = "20060120"
+SRCDATE_matchbox-themes-extra ?= "20051101"
-SRCDATE_libmatchbox = "20060120"
+SRCDATE_matchbox-wm ?= "20060120"
-SRCDATE_tslib = "20051101"
+SRCDATE_libmatchbox ?= "20060120"
-SRCDATE_xext = "20051101"
+SRCDATE_tslib ?= "20051101"
-SRCDATE_renderext = "20051101"
+SRCDATE_xext ?= "20051101"
-SRCDATE_libxrender = "20051101"
+SRCDATE_renderext ?= "20051101"
-SRCDATE_fixesext = "20051101"
+SRCDATE_libxrender ?= "20051101"
-SRCDATE_damageext = "20051101"
+SRCDATE_fixesext ?= "20051101"
-SRCDATE_compositeext = "20051101"
+SRCDATE_damageext ?= "20051101"
-SRCDATE_xcalibrateext = "20051101"
+SRCDATE_compositeext ?= "20051101"
-SRCDATE_recordext = "20051101"
+SRCDATE_xcalibrateext ?= "20051101"
-SRCDATE_libfakekey = "20051101"
+SRCDATE_recordext ?= "20051101"
-SRCDATE_xmodmap = "20051101"
+SRCDATE_libfakekey ?= "20051101"
-SRCDATE_xrandr = "20051101"
+SRCDATE_xmodmap ?= "20051101"
-SRCDATE_xtst = "20051101"
+SRCDATE_xrandr ?= "20051101"
-SRCDATE_xcalibrate = "20051101"
+SRCDATE_xtst ?= "20051101"
-SRCDATE_xmu = "20051115"
+SRCDATE_xcalibrate ?= "20051101"
-SRCDATE_xdpyinfo = "20051115"
+SRCDATE_xmu ?= "20051115"
-SRCDATE_xauth = "20060120"
+SRCDATE_xdpyinfo ?= "20051115"
+SRCDATE_xauth ?= "20060120"
 #
 # Preferred Versions:
 #
-PREFERRED_VERSION_matchbox = "0.9.1"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
-PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
-PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"
+PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
-PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"
+PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}"
-#PREFERRED_VERSION_atk = "1.10.0"
+#PREFERRED_VERSION_atk ?= "1.10.0"
-#PREFERRED_VERSION_cairo = "1.0.0"
+#PREFERRED_VERSION_cairo ?= "1.0.0"
-PREFERRED_VERSION_glib-2.0 = "2.8.1"
+PREFERRED_VERSION_glib-2.0 ?= "2.8.1"
-#PREFERRED_VERSION_gtk+ = "2.8.9"
+#PREFERRED_VERSION_gtk+ ?= "2.8.9"
-#PREFERRED_VERSION_pango = "1.10.0"
+#PREFERRED_VERSION_pango ?= "1.10.0"
-PREFERRED_VERSION_atk = "1.9.0"
+PREFERRED_VERSION_atk ?= "1.9.0"
-#PREFERRED_VERSION_glib-2.0 = "2.6.4"
+#PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
-PREFERRED_VERSION_gtk+ = "2.6.7"
+PREFERRED_VERSION_gtk+ ?= "2.6.7"
-PREFERRED_VERSION_pango = "1.10.0"
+PREFERRED_VERSION_pango ?= "1.10.0"
-PREFERRED_VERSION_dbus = "0.60"
+PREFERRED_VERSION_dbus ?= "0.60"
 PREFERRED_VERSION_diet-x11 ?= "6.2.1"
 PREFERRED_VERSION_dillo2 ?= "0.6.6"

diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf index c338291abe..ab115ac292 100644 --- a/openembedded/conf/distro/poky.conf +++ b/openembedded/conf/distro/poky.conf
@@ -19,14 +19,14 @@ TARGET_FPU ?= "soft"
19		19
20	PARALLEL_INSTALL_MODULES = "1"	20	PARALLEL_INSTALL_MODULES = "1"
21		21
22	FEED_URIS += " \	22	#FEED_URIS += " \
23	upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \	23	# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
24	upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \	24	#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
25	machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \	25	# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
26	base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \	26	# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
27	libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \	27	# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
28	console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \	28	# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
29	devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"	29	# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
30		30
31	ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"	31	ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95"
32	OEINCLUDELOGS = "yes"	32	OEINCLUDELOGS = "yes"
@@ -39,110 +39,101 @@ KERNEL_CONSOLE = "ttyS0"
39	#	39	#
40	# Core Versions	40	# Core Versions
41	#	41	#
42	PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"	42	PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
43	PREFERRED_VERSION_gcc-cross ?= "3.4.4"	43	PREFERRED_VERSION_gcc-cross ?= "3.4.4"
44	PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"	44	PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
45	PREFERRED_VERSION_hostap-modules ?= "0.3.9"	45	PREFERRED_VERSION_hostap-modules ?= "0.3.9"
46		46
47		47
48	#	48	#
49	# Opie and E Image preferred verions
50	# Use our own instead of GPE
51	#
52	OPIE_VERSION = "1.2.1"
53	include conf/distro/preferred-opie-versions.inc
54	#include conf/distro/preferred-e-versions.inc
55
56
57	#
58	# Preferred providers:	49	# Preferred providers:
59	#	50	#
60	PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"	51	PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
61	PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"	52	PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
62	PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"	53	PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
63	PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
64	#fix some iconv issues, needs to be adjusted when doing uclibc builds	54	#fix some iconv issues, needs to be adjusted when doing uclibc builds
65	PREFERRED_PROVIDER_virtual/libiconv=glibc	55	PREFERRED_PROVIDER_virtual/libiconv ?= glibc
66	PREFERRED_PROVIDER_virtual/libintl=glibc	56	PREFERRED_PROVIDER_virtual/libintl ?= glibc
67	PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"	57	PREFERRED_PROVIDER_virtual/xserver ?= xserver-kdrive
68	PREFERRED_PROVIDER_x11 = "diet-x11"	58	PREFERRED_PROVIDER_x11 ?= "diet-x11"
69	PREFERRED_PROVIDER_gconf=gconf-dbus	59	PREFERRED_PROVIDER_gconf ?= gconf-dbus
70	PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus	60	PREFERRED_PROVIDER_gnome-vfs ?= gnome-vfs-dbus
71		61
72	PREFERRED_VERSION_gnome-vfs-dbus = "2.12.0+cvs${SRCDATE}"	62	PREFERRED_VERSION_gnome-vfs-dbus ?= "2.12.0+cvs${SRCDATE}"
73		63
74		64
75	#	65	#
76	# CVS Dates to use:	66	# CVS Dates to use:
77	#	67	#
78	#SRCDATE_gnome-vfs-dbus = "20051215"	68	#SRCDATE_gnome-vfs-dbus ?= "20051215"
79	SRCDATE_gconf-dbus = "20060119"	69	SRCDATE_gconf-dbus ?= "20060119"
80	SRCDATE_gnome-vfs-dbus = "20060119"	70	SRCDATE_gnome-vfs-dbus ?= "20060119"
81	SRCDATE_contacts = "20060207"	71	SRCDATE_contacts ?= "20060207"
82	SRCDATE_dates = "20060214"	72	SRCDATE_dates ?= "20060323"
83	SRCDATE_gtkhtml2 = "20060213"	73	SRCDATE_gtkhtml2 ?= "20060323"
84	SRCDATE_eds-dbus = "20060126"	74	SRCDATE_web ?= "20060325"
85	SRCDATE_minimo = "20050401"	75	SRCDATE_eds-dbus ?= "20060126"
86	SRCDATE_ipkg-utils-native = "20050930"	76	SRCDATE_minimo ?= "20050401"
87	SRCDATE_ipkg-link-1 = "20050930"	77	SRCDATE_ipkg-utils-native ?= "20050930"
88	SRCDATE_ipkg-utils = "20050930"	78	SRCDATE_ipkg-link-1 ?= "20050930"
89	SRCDATE_ipkg-link = "20050930"	79	SRCDATE_ipkg-utils ?= "20050930"
90	SRCDATE_matchbox-common = "20051101"	80	SRCDATE_ipkg-link ?= "20050930"
91	SRCDATE_matchbox-config-gtk = "20051101"	81	SRCDATE_matchbox-common ?= "20051101"
92	SRCDATE_matchbox-desktop = "20060120"	82	SRCDATE_matchbox-config-gtk ?= "20051101"
93	SRCDATE_matchbox-keyboard = "20051101"	83	SRCDATE_matchbox-desktop ?= "20060120"
94	SRCDATE_matchbox-panel = "20051101"	84	SRCDATE_matchbox-keyboard ?= "20051101"
95	SRCDATE_matchbox-panel-manager = "20051101"	85	SRCDATE_matchbox-panel ?= "20051101"
96	SRCDATE_matchbox-stroke = "20051101"	86	SRCDATE_matchbox-panel-manager ?= "20051101"
97	SRCDATE_matchbox-themes-extra = "20051101"	87	SRCDATE_matchbox-stroke ?= "20051101"
98	SRCDATE_matchbox-wm = "20060120"	88	SRCDATE_matchbox-themes-extra ?= "20051101"
99	SRCDATE_libmatchbox = "20060120"	89	SRCDATE_matchbox-wm ?= "20060120"
100	SRCDATE_tslib = "20051101"	90	SRCDATE_libmatchbox ?= "20060120"
101	SRCDATE_xext = "20051101"	91	SRCDATE_tslib ?= "20051101"
102	SRCDATE_renderext = "20051101"	92	SRCDATE_xext ?= "20051101"
103	SRCDATE_libxrender = "20051101"	93	SRCDATE_renderext ?= "20051101"
104	SRCDATE_fixesext = "20051101"	94	SRCDATE_libxrender ?= "20051101"
105	SRCDATE_damageext = "20051101"	95	SRCDATE_fixesext ?= "20051101"
106	SRCDATE_compositeext = "20051101"	96	SRCDATE_damageext ?= "20051101"
107	SRCDATE_xcalibrateext = "20051101"	97	SRCDATE_compositeext ?= "20051101"
108	SRCDATE_recordext = "20051101"	98	SRCDATE_xcalibrateext ?= "20051101"
109	SRCDATE_libfakekey = "20051101"	99	SRCDATE_recordext ?= "20051101"
110	SRCDATE_xmodmap = "20051101"	100	SRCDATE_libfakekey ?= "20051101"
111	SRCDATE_xrandr = "20051101"	101	SRCDATE_xmodmap ?= "20051101"
112	SRCDATE_xtst = "20051101"	102	SRCDATE_xrandr ?= "20051101"
113	SRCDATE_xcalibrate = "20051101"	103	SRCDATE_xtst ?= "20051101"
114	SRCDATE_xmu = "20051115"	104	SRCDATE_xcalibrate ?= "20051101"
115	SRCDATE_xdpyinfo = "20051115"	105	SRCDATE_xmu ?= "20051115"
116	SRCDATE_xauth = "20060120"	106	SRCDATE_xdpyinfo ?= "20051115"
		107	SRCDATE_xauth ?= "20060120"
117		108
118	#	109	#
119	# Preferred Versions:	110	# Preferred Versions:
120	#	111	#
121	PREFERRED_VERSION_matchbox = "0.9.1"	112	PREFERRED_VERSION_matchbox ?= "0.9.1"
122	PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"	113	PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
123	PREFERRED_VERSION_matchbox-applet-startup-monitor = "0.1"	114	PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
124	PREFERRED_VERSION_matchbox-common = "0.9.1+svn${SRCDATE}"	115	PREFERRED_VERSION_matchbox-common ?= "0.9.1+svn${SRCDATE}"
125	PREFERRED_VERSION_matchbox-config-gtk = "0.0+svn${SRCDATE}"	116	PREFERRED_VERSION_matchbox-config-gtk ?= "0.0+svn${SRCDATE}"
126	PREFERRED_VERSION_matchbox-desktop = "0.9.1+svn${SRCDATE}"	117	PREFERRED_VERSION_matchbox-desktop ?= "0.9.1+svn${SRCDATE}"
127	PREFERRED_VERSION_matchbox-keyboard = "0.0+svn${SRCDATE}"	118	PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
128	PREFERRED_VERSION_matchbox-panel = "0.9.2+svn${SRCDATE}"	119	PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
129	PREFERRED_VERSION_matchbox-stroke = "0.0+svn${SRCDATE}"	120	PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
130	PREFERRED_VERSION_matchbox-themes-extra = "0.3+svn${SRCDATE}"	121	PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
131	PREFERRED_VERSION_matchbox-wm = "0.9.5+svn${SRCDATE}"	122	PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}"
132	PREFERRED_VERSION_libmatchbox = "1.7+svn${SRCDATE}"	123	PREFERRED_VERSION_libmatchbox ?= "1.7+svn${SRCDATE}"
133		124
134	#PREFERRED_VERSION_atk = "1.10.0"	125	#PREFERRED_VERSION_atk ?= "1.10.0"
135	#PREFERRED_VERSION_cairo = "1.0.0"	126	#PREFERRED_VERSION_cairo ?= "1.0.0"
136	PREFERRED_VERSION_glib-2.0 = "2.8.1"	127	PREFERRED_VERSION_glib-2.0 ?= "2.8.1"
137	#PREFERRED_VERSION_gtk+ = "2.8.9"	128	#PREFERRED_VERSION_gtk+ ?= "2.8.9"
138	#PREFERRED_VERSION_pango = "1.10.0"	129	#PREFERRED_VERSION_pango ?= "1.10.0"
139		130
140	PREFERRED_VERSION_atk = "1.9.0"	131	PREFERRED_VERSION_atk ?= "1.9.0"
141	#PREFERRED_VERSION_glib-2.0 = "2.6.4"	132	#PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
142	PREFERRED_VERSION_gtk+ = "2.6.7"	133	PREFERRED_VERSION_gtk+ ?= "2.6.7"
143	PREFERRED_VERSION_pango = "1.10.0"	134	PREFERRED_VERSION_pango ?= "1.10.0"
144		135
145	PREFERRED_VERSION_dbus = "0.60"	136	PREFERRED_VERSION_dbus ?= "0.60"
146		137
147	PREFERRED_VERSION_diet-x11 ?= "6.2.1"	138	PREFERRED_VERSION_diet-x11 ?= "6.2.1"
148	PREFERRED_VERSION_dillo2 ?= "0.6.6"	139	PREFERRED_VERSION_dillo2 ?= "0.6.6"