[oe-commits] org.oe.dev merge of '0c66b53f17f5196eb35fffef39265d813c870e1c'
koen commit
openembedded-commits at lists.openembedded.org
Thu Feb 14 15:01:19 UTC 2008
merge of '0c66b53f17f5196eb35fffef39265d813c870e1c'
and 'e3eea2ab1eb9f03b1640b15f0943c4fec05494cb'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 7aa6d55a412ad863ad7d00fd713510da328cec22
ViewMTN: http://monotone.openembedded.org/revision/info/7aa6d55a412ad863ad7d00fd713510da328cec22
Files:
1
packages/maemo4/hildon-1
packages/maemo4/hildon-1/buttonbox.patch
packages/maemo4/hildon-1_svn.bb
packages/maemo4/hildon-base-lib_0.11.1.bb
packages/maemo4/hildon-lgpl_0.12.1.bb
packages/maemo4/hildon-libs_0.15.1.bb
packages/maemo4/hildon-thumbnail_0.11.bb
packages/maemo4/libconic
packages/maemo4/libconic/dbus-api-update.patch
packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff
packages/maemo4/libhildonfm_1.9.41.bb
packages/maemo4/libhildonhelp_1.9.1.bb
packages/maemo4/libosso_1.20.bb
packages/maemo4/mce-dev_1.5.6.bb
packages/maemo4/osso-gwconnect_1.0.8.bb
packages/maemo4/osso-thumbnail_0.7.bb
packages/maemo4/outo_0.1.1.bb
packages/maemo4/libhildon
packages/maemo4/libosso
packages/maemo4/osso-gnome-vfs2
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
packages/maemo4/hildon-thumbnail.inc
packages/maemo4/hildon-thumbnail_0.14.bb
packages/maemo4/libhildon/libhildon-buildfix.patch
packages/maemo4/libhildon.inc
packages/maemo4/libhildon_1.99.0.bb
packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch
packages/maemo4/libhildonfm.inc
packages/maemo4/libhildonfm_1.9.46.bb
packages/maemo4/libhildonhelp.inc
packages/maemo4/libhildonhelp_1.9.6.bb
packages/maemo4/libhildonmime.inc
packages/maemo4/libhildonmime_1.10.0.bb
packages/maemo4/libosso/libosso-buildfix.patch
packages/maemo4/libosso.inc
packages/maemo4/libosso_2.13.bb
packages/maemo4/mce-dev.inc
packages/maemo4/mce-dev_1.6.3.bb
packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch
packages/maemo4/osso-gnome-vfs2_2.16.3.bb
packages/maemo4/osso-gwconnect.inc
packages/maemo4/osso-gwconnect_1.0.12.bb
packages/maemo4/libconic_0.13.bb
packages/maemo4/libgpsbt_0.1.bb
packages/maemo4/libgpsmgr_0.1.bb
packages/maemo4/libhildonmime_1.9.5.bb
packages/maemo4/libosso-gsf_1.11.10.4.bb
packages/maemo4/osso-ic-oss_1.0.4.bb
packages/busybox/busybox-1.7.2/run_parts.c
packages/busybox/files/run_parts.c
Diffs:
#
# mt diff -r0c66b53f17f5196eb35fffef39265d813c870e1c -r7aa6d55a412ad863ad7d00fd713510da328cec22
#
#
#
# delete "packages/maemo4/hildon-1"
#
# delete "packages/maemo4/hildon-1/buttonbox.patch"
#
# delete "packages/maemo4/hildon-1_svn.bb"
#
# delete "packages/maemo4/hildon-base-lib_0.11.1.bb"
#
# delete "packages/maemo4/hildon-lgpl_0.12.1.bb"
#
# delete "packages/maemo4/hildon-libs_0.15.1.bb"
#
# delete "packages/maemo4/hildon-thumbnail_0.11.bb"
#
# delete "packages/maemo4/libconic"
#
# delete "packages/maemo4/libconic/dbus-api-update.patch"
#
# delete "packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff"
#
# delete "packages/maemo4/libhildonfm_1.9.41.bb"
#
# delete "packages/maemo4/libhildonhelp_1.9.1.bb"
#
# delete "packages/maemo4/libosso_1.20.bb"
#
# delete "packages/maemo4/mce-dev_1.5.6.bb"
#
# delete "packages/maemo4/osso-gwconnect_1.0.8.bb"
#
# delete "packages/maemo4/osso-thumbnail_0.7.bb"
#
# delete "packages/maemo4/outo_0.1.1.bb"
#
# add_dir "packages/maemo4/libhildon"
#
# add_dir "packages/maemo4/libosso"
#
# add_dir "packages/maemo4/osso-gnome-vfs2"
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# content [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
# content [4978804f67a8e4bbe5d9320b58f68773a3788b4b]
#
# add_file "packages/maemo4/hildon-thumbnail.inc"
# content [5f522a76af0f370d8aba840c711e6f53521948c3]
#
# add_file "packages/maemo4/hildon-thumbnail_0.14.bb"
# content [b965c3b2137d65d559b6e2fc3a5d1b06f42af721]
#
# add_file "packages/maemo4/libhildon/libhildon-buildfix.patch"
# content [95afc0884957f9c34df62b25506ef6bb991c4e84]
#
# add_file "packages/maemo4/libhildon.inc"
# content [70a67dff25516f5733a761759e0fe24718b8faa9]
#
# add_file "packages/maemo4/libhildon_1.99.0.bb"
# content [9c8b8b8a3261c7099d8d7e00f2c559f3577e526f]
#
# add_file "packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch"
# content [b3308e8f1d2f73e45f3a3a84ce22d4f0d3fa26ab]
#
# add_file "packages/maemo4/libhildonfm.inc"
# content [702ae68cf109a6449b217f12b2a3a9ae5b0ce95c]
#
# add_file "packages/maemo4/libhildonfm_1.9.46.bb"
# content [f13cecd2da630a4df022e8780af9cb3f75586d07]
#
# add_file "packages/maemo4/libhildonhelp.inc"
# content [d8798eb52cf25927b963391842c55fd69b1e89c0]
#
# add_file "packages/maemo4/libhildonhelp_1.9.6.bb"
# content [fc40d0fd11f7e9167f02bafeb9e9c2334118b144]
#
# add_file "packages/maemo4/libhildonmime.inc"
# content [47c2382c0cdb243012f49d3e541b7c340d787655]
#
# add_file "packages/maemo4/libhildonmime_1.10.0.bb"
# content [25951b1409cc178b5fb12b25009d3b44aa028546]
#
# add_file "packages/maemo4/libosso/libosso-buildfix.patch"
# content [3dcbcb1b3f4d798e66346fdb379b03e0bd80f16b]
#
# add_file "packages/maemo4/libosso.inc"
# content [304467b6e4fd87052f5fe7daf6f379f4a96c86ad]
#
# add_file "packages/maemo4/libosso_2.13.bb"
# content [4084cd02d497ea92af50a90283bd54226b6b3b01]
#
# add_file "packages/maemo4/mce-dev.inc"
# content [5af6061604f9698708256b504e2cd24676a9201c]
#
# add_file "packages/maemo4/mce-dev_1.6.3.bb"
# content [60831cce23d1983db9de94e671ef0e88559862ac]
#
# add_file "packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch"
# content [860446c945edbfcc96fafaaca0498b642e6a22dc]
#
# add_file "packages/maemo4/osso-gnome-vfs2_2.16.3.bb"
# content [bee779cc4c4133738b9494b780167ddb0d0d99d9]
#
# add_file "packages/maemo4/osso-gwconnect.inc"
# content [48df958c4d4eb97102b6f038e9f56b83505dd192]
#
# add_file "packages/maemo4/osso-gwconnect_1.0.12.bb"
# content [bda7afdb51174da9146347834d120c0ab889788e]
#
# patch "packages/maemo4/libconic_0.13.bb"
# from [a868945ce6c923fc705a172c4c384f2e3ccf6103]
# to [ab4ddb0173de6129aef409aac2bc3aa58439a632]
#
# patch "packages/maemo4/libgpsbt_0.1.bb"
# from [15eacab347380f9222a9961bb33430d27ceae9e9]
# to [acd6d25155e29d080a975c204b84771b813db795]
#
# patch "packages/maemo4/libgpsmgr_0.1.bb"
# from [e570f94af0edecdef5a0be390b83dea9b4f11d9e]
# to [a44a220435fe6a837c7a32843e089c6e43f35c57]
#
# patch "packages/maemo4/libhildonmime_1.9.5.bb"
# from [bee736d32a41ff42806e5b50c9f6e17f193394b2]
# to [fb43e486b4c6e10edbe7df380d4dee4844699741]
#
# patch "packages/maemo4/libosso-gsf_1.11.10.4.bb"
# from [50510c332d867a95b40caeef898ac30d59b53dbf]
# to [3a58ae7ec2c9c3b275f3a7c4c5d8f2eaa1bcdee1]
#
# patch "packages/maemo4/osso-ic-oss_1.0.4.bb"
# from [dead034f542e3a2def64bfbccd112417c8ed2e7b]
# to [b2b4db3ddd51e753e50b20cc518ea5e0e1c09b8f]
#
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c051c656cccc3f7c4bb15b21010e3e198b2e651d
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c051c656cccc3f7c4bb15b21010e3e198b2e651d
@@ -0,0 +1,202 @@
+diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconfig
+--- linux-2.6.24.orig/drivers/leds/Kconfig 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Kconfig 2008-02-08 08:12:01.000000000 +0100
+@@ -114,6 +114,12 @@
+ help
+ This option enables support for the CM-X270 LEDs.
+
++config LEDS_MPC8313E_RDB
++ tristate "LED Support for MPC8313E-RDB LEDs"
++ depends on LEDS_CLASS && PPC_83xx
++ help
++ This option enables support for the LEDs on MPC8313E-RDB board.
++
+ comment "LED Triggers"
+
+ config LEDS_TRIGGERS
+diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c
+--- linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c 2008-02-08 08:12:01.000000000 +0100
+@@ -0,0 +1,171 @@
++/*
++ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007 Leon Woestenberg <leon at sidebranch.com>
++ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ *
++ * MPC8313E-RDB LEDs driver
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/ioport.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
++
++static struct platform_device *leds_pdev = NULL;
++static struct resource *led_mem = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0xff;
++
++struct mpc8313_led {
++ struct led_classdev cdev;
++ u8 bitmask;
++};
++
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
++{
++ struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++ if (value)
++ led_state &= ~led_dev->bitmask;
++ else
++ led_state |= led_dev->bitmask;
++ iowrite8(led_state, led_io);
++}
++
++static struct mpc8313_led mpc8313_leds[] = {
++ {
++ .cdev = {
++ .name = "mpc8313:led0",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 1,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led1",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 2,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led2",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 4,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led3",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 8,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led4",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 16,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:green",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 32,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:yellow",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 64,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:red",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 128,
++ },
++};
++
++static int mpc8313leds_probe(struct platform_device *pdev)
++{
++ int i;
++ int ret;
++
++ for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++ ret = led_classdev_register(&pdev->dev,
++ &mpc8313_leds[i].cdev);
++ }
++
++ if (ret < 0 && i > 1) {
++ for (i = i - 2; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++ }
++
++ return ret;
++}
++
++static int mpc8313leds_remove(struct platform_device *pdev)
++{
++ int i;
++
++ for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++
++ return 0;
++}
++
++static struct platform_driver mpc8313leds_driver = {
++ .driver = {
++ .name = "mpc8313-leds",
++ .owner = THIS_MODULE,
++ },
++ .probe = mpc8313leds_probe,
++ .remove = mpc8313leds_remove,
++};
++
++static int __init mpc8313leds_init(void)
++{
++ if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++ return -ENOMEM;
++ if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
++ {
++ release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ return -ENOMEM;
++ }
++ iowrite8(led_state, led_io);
++
++ leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
++
++ return platform_driver_register(&mpc8313leds_driver);
++}
++
++static void __exit mpc8313leds_exit(void)
++{
++ if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ platform_driver_unregister(&mpc8313leds_driver);
++
++ platform_device_unregister(leds_pdev);
++}
++
++module_init(mpc8313leds_init);
++module_exit(mpc8313leds_exit);
++
++MODULE_AUTHOR("Leon Woestenberg <leon at sidebranch.com>");
++MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
++MODULE_LICENSE("GPL");
+diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile
+--- linux-2.6.24.orig/drivers/leds/Makefile 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Makefile 2008-02-08 08:12:38.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
+ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
++obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o
+
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 4978804f67a8e4bbe5d9320b58f68773a3788b4b
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 4978804f67a8e4bbe5d9320b58f68773a3788b4b
@@ -0,0 +1,24 @@
+diff -urN linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-02-08 08:09:07.000000000 +0100
+@@ -52,12 +52,20 @@
+ };
+
+ i2c at 3000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
+ device_type = "i2c";
+ compatible = "fsl-i2c";
+ reg = <3000 100>;
+ interrupts = <e 8>;
+ interrupt-parent = < &ipic >;
+ dfsrr;
++
++ rtc at 68 {
++ device_type = "rtc";
++ compatible = "dallas,ds1339";
++ reg = <68>;
++ };
+ };
+
+ i2c at 3100 {
============================================================
--- packages/maemo4/hildon-thumbnail.inc 5f522a76af0f370d8aba840c711e6f53521948c3
+++ packages/maemo4/hildon-thumbnail.inc 5f522a76af0f370d8aba840c711e6f53521948c3
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon thumbnail library"
+
+DEPENDS = "libhildonmime"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+ # remove Werror from OSSO_CFLAGS
+ sed -i s:-Werror::g configure.ac
+
+ touch gtk-doc.make
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+
============================================================
--- packages/maemo4/hildon-thumbnail_0.14.bb b965c3b2137d65d559b6e2fc3a5d1b06f42af721
+++ packages/maemo4/hildon-thumbnail_0.14.bb b965c3b2137d65d559b6e2fc3a5d1b06f42af721
@@ -0,0 +1,10 @@
+require hildon-thumbnail.inc
+
+DEPENDS = "libhildon libosso"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/h/${PN}/${PN}_${PV}.tar.gz \
+ "
+
+
============================================================
--- packages/maemo4/libhildon/libhildon-buildfix.patch 95afc0884957f9c34df62b25506ef6bb991c4e84
+++ packages/maemo4/libhildon/libhildon-buildfix.patch 95afc0884957f9c34df62b25506ef6bb991c4e84
@@ -0,0 +1,16 @@
+Index: libhildon-1.99.0/src/hildon-code-dialog.c
+===================================================================
+--- libhildon-1.99.0.orig/src/hildon-code-dialog.c 2007-10-10 15:03:09.000000000 +0200
++++ libhildon-1.99.0/src/hildon-code-dialog.c 2008-02-13 13:54:47.000000000 +0100
+@@ -302,7 +302,11 @@
+ gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1);
+ dialog_action_area1 = GTK_DIALOG (dialog)->action_area;
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
++#if defined (MAEMO_GTK)
+ GTK_BUTTONBOX_CENTER);
++#else
++ GTK_BUTTONBOX_DEFAULT_STYLE);
++#endif
+
+ okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK,
+ GTK_RESPONSE_OK);
============================================================
--- packages/maemo4/libhildon.inc 70a67dff25516f5733a761759e0fe24718b8faa9
+++ packages/maemo4/libhildon.inc 70a67dff25516f5733a761759e0fe24718b8faa9
@@ -0,0 +1,13 @@
+DESCRIPTION = "Hildon widget library"
+LICENSE = "LGPL"
+
+DEPENDS = "gconf-dbus esound gtk+"
+
+inherit autotools pkgconfig lib_package
+
+EXTRA_OECONF = "--with-maemo-gtk=no"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/maemo4/libhildon_1.99.0.bb 9c8b8b8a3261c7099d8d7e00f2c559f3577e526f
+++ packages/maemo4/libhildon_1.99.0.bb 9c8b8b8a3261c7099d8d7e00f2c559f3577e526f
@@ -0,0 +1,11 @@
+require libhildon.inc
+
+DEPENDS += "libpng libxt libxi"
+
+SRC_URI = "\
+ http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz \
+ file://libhildon-buildfix.patch;patch=1 \
+ "
+
+
+
============================================================
--- packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch b3308e8f1d2f73e45f3a3a84ce22d4f0d3fa26ab
+++ packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch b3308e8f1d2f73e45f3a3a84ce22d4f0d3fa26ab
@@ -0,0 +1,133 @@
+Index: libhildonfm-1.9.46/hildon-fm/hildon-file-chooser-dialog.c
+===================================================================
+--- libhildonfm-1.9.46.orig/hildon-fm/hildon-file-chooser-dialog.c 2007-10-16 10:11:59.000000000 +0200
++++ libhildonfm-1.9.46/hildon-fm/hildon-file-chooser-dialog.c 2008-02-14 08:24:41.000000000 +0100
+@@ -192,6 +192,7 @@
+ return (first_digit << 4) | second_digit;
+ }
+
++#ifdef USE_MAEMO_GTK
+ static void chooser_entry_invalid_input_cb (GtkEntry *entry,
+ GtkInvalidInputType inv_type,
+ gpointer user_data)
+@@ -202,6 +203,7 @@
+ HCS("ckdg_ib_maximum_characters_reached"));
+ }
+ }
++#endif
+
+ static gchar *
+ g_unescape_uri_string (const char *escaped,
+@@ -1838,7 +1840,9 @@
+ g_object_class_install_property(gobject_class, PROP_SELECTION_MODE, pspec);
+
+
++#ifdef USE_MAEMO_GTK
+ hildon_gtk_file_chooser_install_properties(gobject_class);
++#endif
+ }
+
+ static void hildon_file_chooser_dialog_sort_changed(GtkWidget * item,
+@@ -1975,10 +1979,10 @@
+ g_signal_connect( priv->entry_name, "changed",
+ G_CALLBACK( hildon_file_chooser_entry_changed ),
+ self );
+-
++#ifdef USE_MAEMO_GTK
+ g_signal_connect(priv->entry_name, "invalid-input",
+ G_CALLBACK(chooser_entry_invalid_input_cb), self);
+-
++#endif
+ priv->hbox_location = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+ priv->hbox_items = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
+ priv->image_location = gtk_image_new();
+Index: libhildonfm-1.9.46/hildon-fm/hildon-file-selection.c
+===================================================================
+--- libhildonfm-1.9.46.orig/hildon-fm/hildon-file-selection.c 2007-10-16 10:11:59.000000000 +0200
++++ libhildonfm-1.9.46/hildon-fm/hildon-file-selection.c 2008-02-14 08:21:31.000000000 +0100
+@@ -2036,6 +2036,7 @@
+ g_object_set(cell, "text", buffer, "sensi%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -re3eea2ab1eb9f03b1640b15f0943c4fec05494cb -r7aa6d55a412ad863ad7d00fd713510da328cec22
#
#
#
# rename "packages/busybox/busybox-1.7.2/run_parts.c"
# to "packages/busybox/files/run_parts.c"
#
More information about the Openembedded-commits
mailing list