Reworked maemo4 packages

hildon-1: Removed, replaced by libhildon
hildon-lgpl: Removed (obsolete in Maemo 4.0)
hildon-libs: Removed (obsolete in Maemo 4.0)
outo: Removed (integrated in libosso).
libhildon: Updated to Maemo 4.0 version.
libhildonfm: Updated to Maemo 4.0 version.
libconic: Updated to Maemo 4.0 version.
libosso: Updated to Maemo 4.0 version.
mce-dev: Updated to Maemo 4.0 version.
osso-gwconnect: Updated to Maemo 4.0 version.
hildon-thumbnail: Updated to Maemo 4.0 version.
osso-thumbnail: Removed, replaced by hildon-thumbnail.
osso-gnome-vf2: New recipe, needed for other OSSO libraries.
osso-ic-oss: Adjusted dependencies.
libhildonmime: Adjusted dependencies.
libhildonhelp: Adjusted dependencies.
libgpsbt: Adjusted dependencies.
libgpsmgr: Adjusted dependencies.
libosso-gsf: Adjusted dependencies.

1 files changed, 62 insertions, 61 deletions

diff --git a/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff b/packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch
index 8d91e1dd65..6af13d24bf 100644
--- a/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff
+++ b/packages/maemo4/libhildonfm/libhildonfm-gtkmaemo-ifdef.patch
@@ -1,5 +1,50 @@
---- /tmp/hildon-file-selection.c	2007-10-02 10:08:17.000000000 +0200
-+++ 1_1.9.41/hildon-fm/hildon-file-selection.c	2007-10-02 11:26:58.292045000 +0200
+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, "sensitive", sensitive, NULL);
  }
@@ -12,7 +57,7 @@
      ULOG_DEBUG(__FUNCTION__);
      g_signal_emit(data, signal_content_pane_context_menu, 0);
  }
-+#endif /* USE_MAEMO_GTK */
++#endif
  
  static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
                                                            widget,
@@ -24,16 +69,15 @@
  static gboolean
  tap_and_hold_query (gpointer self, guint signal_id)
  {
-@@ -2225,6 +2228,8 @@
+@@ -2224,6 +2227,7 @@
+ {
    return tap_and_hold_query (self, signal_navigation_pane_context_menu);
  }
++#endif
  
-+#endif /* USE_MAEMO_GTK */
-+
  static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
                                                          * self)
- {
-@@ -2277,7 +2282,7 @@
+@@ -2277,7 +2281,7 @@
      g_signal_connect_object(tree, "key-press-event",
                       G_CALLBACK(hildon_file_selection_on_content_pane_key),
                       self, 0);
@@ -42,15 +86,16 @@
      gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
                                    GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
      g_signal_connect_object (tree, "tap-and-hold-query",
-@@ -2286,6 +2291,7 @@
+@@ -2286,7 +2290,7 @@
      g_signal_connect_object(tree, "tap-and-hold",
                       G_CALLBACK
                       (hildon_file_selection_content_pane_context), self, 0);
-+#endif /* USE_MAEMO_GTK */
- 
+-
++#endif
      g_signal_connect_object(tree, "notify::has-focus",
                       G_CALLBACK(content_pane_focus), self, 0);
-@@ -2397,7 +2403,7 @@
+ }
+@@ -2397,7 +2401,7 @@
          (selection, "changed",
           G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
           self, 0);
@@ -59,16 +104,16 @@
      gtk_widget_tap_and_hold_setup(GTK_WIDGET(tree), NULL, NULL,
                                    GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
      g_signal_connect_object (tree, "tap-and-hold-query",
-@@ -2406,7 +2412,7 @@
+@@ -2406,7 +2410,7 @@
      g_signal_connect_object(tree, "tap-and-hold",
                       G_CALLBACK
                       (hildon_file_selection_content_pane_context), self, 0);
 -
-+#endif /* USE_MAEMO_GTK */
++#endif
      g_signal_connect_object(tree, "key-press-event",
                       G_CALLBACK(hildon_file_selection_on_content_pane_key),
                       self, 0);
-@@ -2492,7 +2498,7 @@
+@@ -2492,7 +2496,7 @@
      g_signal_connect_object(selection, "changed",
                       G_CALLBACK(hildon_file_selection_selection_changed),
                       self, 0);
@@ -77,56 +122,12 @@
      gtk_widget_tap_and_hold_setup(GTK_WIDGET(self->priv->dir_tree), NULL,
                                    NULL, GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
      g_signal_connect_object (self->priv->dir_tree, "tap-and-hold-query",
-@@ -2502,7 +2508,7 @@
+@@ -2502,7 +2506,7 @@
                       G_CALLBACK
                       (hildon_file_selection_navigation_pane_context),
                       self, 0);
 -
-+#endif /* USE_MAEMO_GTK */
++#endif
      g_signal_connect_object(self->priv->dir_tree, "key-press-event",
                       G_CALLBACK
                       (hildon_file_selection_on_navigation_pane_key), self, 0);
---- /tmp/hildon-file-chooser-dialog.c	2007-10-02 10:14:05.000000000 +0200
-+++ 1_1.9.41/hildon-fm/hildon-file-chooser-dialog.c	2007-10-02 11:33:43.132045000 +0200
-@@ -191,7 +191,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,7 +202,7 @@
-                                     HCS("ckdg_ib_maximum_characters_reached"));
-   }
- }
--
-+#endif /* USE_MAEMO_GTK */
- static gchar *
- g_unescape_uri_string (const char *escaped,
-                        int         len,
-@@ -1837,8 +1837,9 @@
-                               G_PARAM_READWRITE);
-     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 +1976,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 /* USE_MAEMO_GTK */
-     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();