[oe-commits] org.oe.dev merge of '489882b57f4904cc20dd33cf8852288fb4785ead'
svolpe commit
openembedded-commits at lists.openembedded.org
Mon Sep 24 18:12:43 UTC 2007
merge of '489882b57f4904cc20dd33cf8852288fb4785ead'
and '9194b2f0a205c1d8e217aeb58797ab88ca972a45'
Author: svolpe at openembedded.org
Branch: org.openembedded.dev
Revision: d4815037189353e6445b917ec6b4bd64777c3c0d
ViewMTN: http://monotone.openembedded.org/revision/info/d4815037189353e6445b917ec6b4bd64777c3c0d
Files:
1
packages/cairo/cairo-directfb_1.4.8.bb
packages/pointercal/files/nokia800/pointercal
packages/pointercal/files/nokia800/pointercal.broken
packages/pimlico/tasks-0.12
packages/hal/hal-info_20070618.bb
packages/linux/linux-davinci/binutils-buildid-arm.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch
packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb
packages/pimlico/tasks-0.12/tasks-owl.diff
conf/distro/include/preferred-opie-versions-1.2.3.inc
conf/distro/include/preferred-xorg-versions-X11R7.3.inc
conf/distro/include/sane-srcrevs.inc
packages/abiword/abiword-2.5.inc
packages/abiword/abiword_2.5.1.bb
packages/abiword/abiword_2.5.2.bb
packages/ezx/ezxd_svn.bb
packages/gtk-webcore/osb-jscore_svn.bb
packages/gtk-webcore/osb-nrcit_svn.bb
packages/gtk-webcore/osb-nrcore_svn.bb
packages/hal/hal-info_git.bb
packages/linux/ixp4xx-kernel.inc
packages/linux/linux-davinci/davinci-dvevm/defconfig
packages/linux/linux-davinci_2.6.x+git-davinci.bb
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/meta/slugos-packages.bb
packages/networkmanager/networkmanager.inc
packages/opie-taskbar/opie-taskbar-images.inc
packages/pimlico/tasks_svn.bb
packages/pointercal/pointercal_0.0.bb
packages/ppp/ppp_2.4.3.bb
packages/redboot-utils/fis_1.0.bb
Diffs:
#
# mt diff -r489882b57f4904cc20dd33cf8852288fb4785ead -rd4815037189353e6445b917ec6b4bd64777c3c0d
#
#
#
# patch "packages/cairo/cairo-directfb_1.4.8.bb"
# from [dde2408a5b6f4173c1643b3f9a941bec4811782c]
# to [5887a10b7088e2070a3b744287a0b188a32f9124]
#
============================================================
--- packages/cairo/cairo-directfb_1.4.8.bb dde2408a5b6f4173c1643b3f9a941bec4811782c
+++ packages/cairo/cairo-directfb_1.4.8.bb 5887a10b7088e2070a3b744287a0b188a32f9124
@@ -1,5 +1,5 @@ require cairo.inc
require cairo.inc
-
+RCONFLICTS = "cairo"
DEPENDS = "directfb libsm libpng fontconfig"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +12,6 @@ CFLAGS_append += " -I${STAGING_INCDIR}/
LDFLAGS_append += " -ldirectfb"
CFLAGS_append += " -I${STAGING_INCDIR}/directfb"
-PR = "r0"
+PR = "r1"
S = "${WORKDIR}/cairo-${PV}"
#
# mt diff -r9194b2f0a205c1d8e217aeb58797ab88ca972a45 -rd4815037189353e6445b917ec6b4bd64777c3c0d
#
#
#
# rename "packages/pointercal/files/nokia800/pointercal"
# to "packages/pointercal/files/nokia800/pointercal.broken"
#
# add_dir "packages/pimlico/tasks-0.12"
#
# add_file "packages/hal/hal-info_20070618.bb"
# content [ff74677aefdf255f44b07ef35ce06e9e7012c226]
#
# add_file "packages/linux/linux-davinci/binutils-buildid-arm.patch"
# content [450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1]
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch"
# content [8ccf6439d54d53fbffa4fc7d13ada938f1c9bbfc]
#
# add_file "packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch"
# content [dc00c58df5f70ebeb53fd7a8983874cfd1802187]
#
# add_file "packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb"
# content [ad2ba78ed368bbd20cdb67653fec0f64b6bba864]
#
# add_file "packages/pimlico/tasks-0.12/tasks-owl.diff"
# content [6d8a6a6ced01ab3acb9930399830fb021446e9fd]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3.inc"
# from [9a067222c36557f64b1ad239657000b6669f1f41]
# to [22eae7904db1714ab869c44a5359c3c968f94c4f]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.3.inc"
# from [e17728838422c7e739af9d24b6c0fd5a4d84811f]
# to [d71fcfba9c26f2bea8c29b29484b3c8788baced4]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [ddaac7ee320dd8ad4baff5a250bd943c0a5c9e96]
# to [514bd631097bb91cffd2b7ec4aa8019b8993d3f0]
#
# patch "packages/abiword/abiword-2.5.inc"
# from [e523d1c593851bbd008dc514dd17073707fc961a]
# to [6306c0ee364ca356a51f977e4df1f5fc309610a7]
#
# patch "packages/abiword/abiword_2.5.1.bb"
# from [a3d8ed34e897eaee21387d1b1b4a9899feba167e]
# to [1146ebe526b93b0c25021b93dc4fcf01077dea2b]
#
# patch "packages/abiword/abiword_2.5.2.bb"
# from [c6c5fd771ef0b03717df37cac565bd8ff8d4c2f1]
# to [a3d8ed34e897eaee21387d1b1b4a9899feba167e]
#
# patch "packages/ezx/ezxd_svn.bb"
# from [b56176292b0c3556aa88055dc138488378e86453]
# to [da9cb81d38e8d11e3e0ab84d48abfb9575ddf6aa]
#
# patch "packages/gtk-webcore/osb-jscore_svn.bb"
# from [b9e84c178b8314578103df9fe9f70faa86e25b62]
# to [08f95478338a78dcf9ef0956930f2d682324b32f]
#
# patch "packages/gtk-webcore/osb-nrcit_svn.bb"
# from [d2946241f9a427b0631ba309b8c8408ff33bebf7]
# to [e20892177009024e3e4fe7bf662ff4c3a5dab077]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [8a2e36e22d6546437b3ebec3bc6df6aa17c82174]
# to [f0272ef1ec3ef2b2fac6ec34f6c9398aff1b4974]
#
# patch "packages/hal/hal-info_git.bb"
# from [f0a832db129be212bf9eb0aa44e1e80b35b070b0]
# to [ea0dfd0d1392763f6b62901fb50a78c466243aca]
#
# patch "packages/linux/ixp4xx-kernel.inc"
# from [b22efce3723a42731a6940b02489811fb8a36033]
# to [7fdde9d51b8e3fe0cc0eb9518098902d6281e3da]
#
# patch "packages/linux/linux-davinci/davinci-dvevm/defconfig"
# from [700f7637aad2ceed20402bf3f304dd821c9c3584]
# to [e3c93d6a955ae965000ed3c42dfed0f5c5683ad8]
#
# patch "packages/linux/linux-davinci_2.6.x+git-davinci.bb"
# from [a2e2d6cadc00a708a4cd317c62d1ff26b75131fc]
# to [f614af9ca537b37ba933022bb6296aad44872583]
#
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
# from [cbd74a97e0ff2c2a00cbd2111d4cb5ffd564fd6d]
# to [fddca45c3c4d0ac194de7c1de4883a7324bc04b7]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-core.patch"
# from [385081750e254e3e68c9e42d96e0ea03ec1ae356]
# to [abdddce8584aa8035eeacc9956b7a3c28e066379]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch"
# from [08a4e592d7b7f3c689b3e8366522a8364be174a7]
# to [6e82f1f852bda74b86e74926f3f99bf90d00a041]
#
# patch "packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch"
# from [ddc0a46af51fb941a7c75ad20385ff9471c649d2]
# to [089118fa3197fc6b29442d89458fb49d89449165]
#
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
# from [2fcdbfacbc7633f1338125153055119f08e7d52b]
# to [8da1a6604826ab49b5cc93a4a419b9f35ad201b6]
#
# patch "packages/linux/linux-ezx_2.6.21.bb"
# from [2ea2f1e711b98603012a3a8f2a2b5d673859fad6]
# to [5cd726a272b15df1119bf3c7f55ea7b2cdf6403c]
#
# patch "packages/meta/slugos-packages.bb"
# from [738a66a4cd05dd74381dce0949ddcd547be2497f]
# to [3e624519aa3c29fb9c243930483b6363f1b191b9]
#
# patch "packages/networkmanager/networkmanager.inc"
# from [d09f3129b2af07e182c0baace78a8a5bd5595f43]
# to [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
#
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
# from [fa74199fe1a5102d17da7ed6417c493736dc2272]
# to [d97156ba4d20fe66cfadc440227deb97dec1fc1a]
#
# patch "packages/pimlico/tasks_svn.bb"
# from [6b25011b2bc6be784f63ec8ea00efbc736b7298c]
# to [6f444d0caa32c1ef1f193f39ed7a93f4bd1c5eae]
#
# patch "packages/pointercal/pointercal_0.0.bb"
# from [b8790bb4f4ba0f5d19f857367be5e221745356d0]
# to [a8a3e606c0d9cb9d7156407a1729b9d398ff5545]
#
# patch "packages/ppp/ppp_2.4.3.bb"
# from [1026e1ac955e35a3de0bc3a078e33248c865739b]
# to [428359231946bc0fb68ffdb13936715597dd1267]
#
# patch "packages/redboot-utils/fis_1.0.bb"
# from [423fde1a30e871e390b48542349b88efb3a07ac9]
# to [16fa3c9f589d8b24e84de8555dad50affd97b735]
#
============================================================
--- packages/hal/hal-info_20070618.bb ff74677aefdf255f44b07ef35ce06e9e7012c226
+++ packages/hal/hal-info_20070618.bb ff74677aefdf255f44b07ef35ce06e9e7012c226
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hardware Abstraction Layer device information"
+HOMEPAGE = "http://freedesktop.org/Software/hal"
+SECTION = "unknown"
+LICENSE = "GPL AFL"
+
+SRC_URI = "http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-recall --disable-video"
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "${datadir}/hal/"
============================================================
--- packages/linux/linux-davinci/binutils-buildid-arm.patch 450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1
+++ packages/linux/linux-davinci/binutils-buildid-arm.patch 450eaeee5ad06f6a335498a5d3c8cf6a0d6465d1
@@ -0,0 +1,12 @@
+diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
+index 5ff5406..538fcb5 100644
+--- a/arch/arm/kernel/vmlinux.lds.S
++++ b/arch/arm/kernel/vmlinux.lds.S
+@@ -94,6 +94,7 @@ SECTIONS
+ TEXT_TEXT
+ SCHED_TEXT
+ LOCK_TEXT
++ *(.note.*)
+ #ifdef CONFIG_MMU
+ *(.fixup)
+ #endif
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch 8ccf6439d54d53fbffa4fc7d13ada938f1c9bbfc
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-flip.patch 8ccf6439d54d53fbffa4fc7d13ada938f1c9bbfc
@@ -0,0 +1,47 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c 2007-09-23 13:28:02.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-09-23 13:31:40.000000000 -0300
+@@ -16,6 +16,7 @@
+ #include <linux/mmc/host.h>
+ #include <linux/irq.h>
+ #include <linux/input.h>
++#include <linux/gpio_keys.h>
+
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -343,11 +344,34 @@
+ .num_resources = ARRAY_SIZE(pcap_ts_resources),
+ .resource = pcap_ts_resources,
+ };
++/* Flip */
++#undef GPIO_FLIP_PIN
++#define GPIO_FLIP_PIN 15 /* FIXME */
++static struct gpio_keys_button a1200flip_buttons[] = {
++ [0] = {
++ .keycode = KEY_SLEEP,
++ .gpio = GPIO_FLIP_PIN,
++ .desc = "A1200 flip",
++ },
++};
++
++static struct gpio_keys_platform_data a1200flip_platform_data = {
++ .buttons = a1200flip_buttons,
++ .nbuttons = 1,
++};
++static struct platform_device a1200flip_device = {
++ .name = "gpio-keys",
++ .id = -1,
++ .dev = {
++ .platform_data = &a1200flip_platform_data,
++ },
++};
+
+ static struct platform_device *devices[] __initdata = {
+ &a1200_pcap_device,
+ &a1200_eoc_device,
+ &pcap_ts_device,
++ &a1200flip_device,
+ };
+
+ static void __init a1200_init(void)
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch dc00c58df5f70ebeb53fd7a8983874cfd1802187
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-kbd.patch dc00c58df5f70ebeb53fd7a8983874cfd1802187
@@ -0,0 +1,99 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c 2007-09-23 11:48:10.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-09-23 13:24:58.000000000 -0300
+@@ -15,6 +15,7 @@
+ #include <linux/fb.h>
+ #include <linux/mmc/host.h>
+ #include <linux/irq.h>
++#include <linux/input.h>
+
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -23,12 +24,14 @@
+ #include <asm/arch/ezx.h>
+ #include <asm/arch/ezx-pcap.h>
+ #include <asm/arch/mmc.h>
++#include <asm/arch/kbd.h>
+
+ #include "generic.h"
+ #include "ezx-eoc.h"
+
+ extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
+ extern void ezx_backlight_power(int);
++extern void __init pxa_set_kbd_info(struct pxakbd_platform_data *);
+
+ #ifdef CONFIG_EZX_PCAP
+ extern int ezx_pcap_mmcsd_power(int);
+@@ -284,6 +287,63 @@
+ .resource = pcap_ts_resources,
+ };
+
++/* Keypad */
++static unsigned char a1200_keycode[] = {
++ /* row 0 */
++ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
++ /* row 1 */
++ KEY_RIGHT, KEY_DOWN, KEY_KPENTER, KEY_UP, KEY_LEFT,
++ /* row 2 */
++ KEY_PAGEDOWN, KEY_CAMERA, KEY_RECORD, KEY_HOME, KEY_PAGEUP,
++ /* row 3 */
++ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
++ /* row 4 */
++ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED,
++ /* row 5 */
++ KEY_RESERVED, KEY_RESERVED, KEY_MENU, KEY_RESERVED, KEY_RESERVED,
++};
++/*
++static unsigned char a1200_direct_keycode[] = {
++ KEY_CAMERA,
++};
++*/
++
++static int a1200_kbd_init(void)
++{
++ pxa_gpio_mode(100 | GPIO_ALT_FN_1_IN); /* KP_MKIN<0> */
++ pxa_gpio_mode(101 | GPIO_ALT_FN_1_IN); /* KP_MKIN<1> */
++ pxa_gpio_mode(102 | GPIO_ALT_FN_1_IN); /* KP_MKIN<2> */
++ pxa_gpio_mode(97 | GPIO_ALT_FN_3_IN); /* KP_MKIN<3> */
++ pxa_gpio_mode(98 | GPIO_ALT_FN_3_IN); /* KP_MKIN<4> */
++ pxa_gpio_mode(103 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<0> */
++ pxa_gpio_mode(104 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<1> */
++ pxa_gpio_mode(105 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<2> */
++ pxa_gpio_mode(106 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<3> */
++ pxa_gpio_mode(107 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<4> */
++ pxa_gpio_mode(108 | GPIO_ALT_FN_2_OUT); /* KP_MKOUT<5> */
++
++ PKWR = 0xEC000;
++ PGSR3 |= 0x1F80;
++ return 0;
++}
++
++static struct pxakbd_platform_data a1200_kbd_platform_data = {
++ .init = &a1200_kbd_init,
++ .scan_interval = HZ/40,
++ .matrix = {
++ .keycode = a1200_keycode,
++ .cols = 6,
++ .rows = 5,
++ },
++/*
++ .direct = {
++ .keycode = a1200_direct_keycode,
++ .num = 1,
++ },
++*/
++};
++
++
+ static struct platform_device *devices[] __initdata = {
+ &a1200_pcap_device,
+ &a1200_eoc_device,
+@@ -294,6 +354,7 @@
+ {
+ set_pxa_fb_info(&a1200_fb_info);
+ pxa_set_mci_info(&a1200_mci_platform_data);
++ pxa_set_kbd_info(&a1200_kbd_platform_data);
+
+ platform_add_devices(devices, ARRAY_SIZE(devices));
+ }
============================================================
--- packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb ad2ba78ed368bbd20cdb67653fec0f64b6bba864
+++ packages/opie-taskbar/opie-taskbar-images_1.2.3+cvs20070922.bb ad2ba78ed368bbd20cdb67653fec0f64b6bba864
@@ -0,0 +1,5 @@
+require ${PN}.inc
+PR = "r0"
+SRCDATE = "20070922"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
============================================================
--- packages/pimlico/tasks-0.12/tasks-owl.diff 6d8a6a6ced01ab3acb9930399830fb021446e9fd
+++ packages/pimlico/tasks-0.12/tasks-owl.diff 6d8a6a6ced01ab3acb9930399830fb021446e9fd
@@ -0,0 +1,62 @@
+Index: src/gtk/tasks-ui.xml
+===================================================================
+--- src/gtk/tasks-ui.xml (revision 338)
++++ src/gtk/tasks-ui.xml (working copy)
+@@ -7,17 +7,14 @@
+ <menuitem action="EditTask"/>
+ <menuitem action="CompleteTask"/>
+ <separator/>
++ <menuitem action="Undo"/>
++ <menuitem action="Redo"/>
++ <separator/>
+ <menuitem action="DeleteTask"/>
+ <menuitem action="PurgeTasks"/>
+ <separator/>
++ <menuitem action="About"/>
+ <menuitem action="Quit"/>
+ </menu>
+- <menu action="EditMenu">
+- <menuitem action="Undo"/>
+- <menuitem action="Redo"/>
+- </menu>
+- <menu action="HelpMenu">
+- <menuitem action="About"/>
+- </menu>
+ </menubar>
+ </ui>
+Index: src/gtk/main.c
+===================================================================
+--- src/gtk/main.c (revision 338)
++++ src/gtk/main.c (working copy)
+@@ -21,6 +21,7 @@
+ #include <libecal/e-cal.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <owlwindowmenu.h>
+
+ #include <libkoto/ical-util.h>
+ #include <libkoto/koto-actions.h>
+@@ -564,8 +565,8 @@
+ gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager));
+ gtk_ui_manager_ensure_update (ui_manager);
+
+- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar");
+- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0);
++ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu");
++ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu));
+
+ box = gtk_vbox_new (FALSE, 4);
+ gtk_container_set_border_width (GTK_CONTAINER (box), 4);
+Index: src/gtk/Makefile.am
+===================================================================
+--- src/gtk/Makefile.am (revision 338)
++++ src/gtk/Makefile.am (working copy)
+@@ -4,7 +4,7 @@
+ bin_PROGRAMS = tasks
+ tasks_CPPFLAGS = -I$(top_srcdir)/
+ tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS)
+-tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS)
++tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl
+
+ tasks_SOURCES = \
+ main.c \
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3.inc 9a067222c36557f64b1ad239657000b6669f1f41
+++ conf/distro/include/preferred-opie-versions-1.2.3.inc 22eae7904db1714ab869c44a5359c3c968f94c4f
@@ -176,7 +176,7 @@ PREFERRED_VERSION_opie-taskbar = "${OPIE
PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
-PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar-images = "${OPIE_VERSION}+cvs20070922"
PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
============================================================
--- conf/distro/include/preferred-xorg-versions-X11R7.3.inc e17728838422c7e739af9d24b6c0fd5a4d84811f
+++ conf/distro/include/preferred-xorg-versions-X11R7.3.inc d71fcfba9c26f2bea8c29b29484b3c8788baced4
@@ -277,6 +277,6 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.
PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
# xserver
-PREFERRED_VERSION_xserver-kdrive ?= "1.4.0"
-PREFERRED_VERSION_xserver-xorg ?= "1.4.0"
+PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.4"
============================================================
--- conf/distro/include/sane-srcrevs.inc ddaac7ee320dd8ad4baff5a250bd943c0a5c9e96
+++ conf/distro/include/sane-srcrevs.inc 514bd631097bb91cffd2b7ec4aa8019b8993d3f0
@@ -36,6 +36,10 @@ SRCREV_pn-oh-puzzles ?= "22"
SRCREV_moko-gtk-engine ?= "3029"
SRCREV_pn-neod ?= "2956"
SRCREV_pn-oh-puzzles ?= "22"
+SRCREV_pn-osb-browser ?= "125"
+SRCREV_pn-osb-jscore ?= "117"
+SRCREV_pn-osb-nrcit ?= "125"
+SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-browser2 ?= "3031"
SRCREV_pn-openmoko-calculator ?= "2404"
============================================================
--- packages/abiword/abiword-2.5.inc e523d1c593851bbd008dc514dd17073707fc961a
+++ packages/abi%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list