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.

41 files changed, 435 insertions, 329 deletions

diff --git a/packages/maemo4/hildon-1/buttonbox.patch b/packages/maemo4/hildon-1/buttonbox.patch
deleted file mode 100644
index cfea60d000..0000000000
--- a/packages/maemo4/hildon-1/buttonbox.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /tmp/hildon-code-dialog.c	2007-08-07 11:46:03.000000000 +0200
-+++ hildon-1/src/hildon-code-dialog.c	2007-08-07 11:46:16.468400000 +0200
-@@ -277,7 +277,7 @@
-     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),
--            GTK_BUTTONBOX_CENTER);
-+            GTK_BUTTONBOX_DEFAULT);
- 
-     okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK,
-             GTK_RESPONSE_OK);
diff --git a/packages/maemo4/hildon-base-lib_0.11.1.bb b/packages/maemo4/hildon-base-lib_0.11.1.bb
deleted file mode 100644
index ce3f667a00..0000000000
--- a/packages/maemo4/hildon-base-lib_0.11.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-LICENSE = "LGPL"
-
-DEPENDS = "gtk+ virtual/libx11"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/hildon-lgpl_0.12.1.bb b/packages/maemo4/hildon-lgpl_0.12.1.bb
deleted file mode 100644
index 02bbad9dd2..0000000000
--- a/packages/maemo4/hildon-lgpl_0.12.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "LGPL"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-4.tar.gz"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}	
-
diff --git a/packages/maemo4/hildon-libs_0.15.1.bb b/packages/maemo4/hildon-libs_0.15.1.bb
deleted file mode 100644
index 4c88d322ff..0000000000
--- a/packages/maemo4/hildon-libs_0.15.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon librares"
-
-DEPENDS = "gtk-doc-native libosso libmatchbox"
-
-PR = "r0"
-
-SRC_URI = "http://launchpadlibrarian.net/7598381/hildon-libs_0.15.1-1ubuntu2.tar.gz"
-
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/${PN}"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-        touch gtk-doc.make
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
-FILES_${PN} += "${libdir}/hildon-widgets/*"
-
diff --git a/packages/maemo4/hildon-thumbnail.inc b/packages/maemo4/hildon-thumbnail.inc
new file mode 100644
index 0000000000..46468e1ca1
--- /dev/null
+++ b/packages/maemo4/hildon-thumbnail.inc
@@ -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
+}
+
+
diff --git a/packages/maemo4/hildon-thumbnail_0.11.bb b/packages/maemo4/hildon-thumbnail_0.11.bb
deleted file mode 100644
index 54646e7630..0000000000
--- a/packages/maemo4/hildon-thumbnail_0.11.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon thumbnail library"
-
-DEPENDS = "libhildonmime hildon-libs osso-thumbnail"
-
-PR = "r0"
-
-SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/h/${PN}/${PN}_${PV}.tar.gz \
-          "
-
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/${PV}"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-        touch gtk-doc.make
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/hildon-thumbnail_0.14.bb b/packages/maemo4/hildon-thumbnail_0.14.bb
new file mode 100644
index 0000000000..adc52b3912
--- /dev/null
+++ b/packages/maemo4/hildon-thumbnail_0.14.bb
@@ -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 \
+          "
+
+
diff --git a/packages/maemo4/libconic/dbus-api-update.patch b/packages/maemo4/libconic/dbus-api-update.patch
deleted file mode 100644
index 3542cecae8..0000000000
--- a/packages/maemo4/libconic/dbus-api-update.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- /tmp/conicconnection.c	2007-11-12 12:45:37.000000000 +0100
-+++ libconic-0.13/conic/conicconnection.c	2007-11-12 12:46:04.663234000 +0100
-@@ -473,7 +473,7 @@
- 							  ICD_DBUS_PATH,
- 							  &icd_vtable,
- 							  NULL)) {
--			dbus_connection_disconnect(dbus_connection);
-+			dbus_connection_close(dbus_connection);
- 			dbus_connection_unref(dbus_connection);
- 			dbus_connection = NULL;
- 		}
---- /tmp/Makefile.am	2007-11-12 12:47:22.000000000 +0100
-+++ libconic-0.13/Makefile.am	2007-11-12 12:47:29.773234000 +0100
-@@ -1,4 +1,4 @@
--SUBDIRS = conic tests
-+SUBDIRS = conic 
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = conic.pc
diff --git a/packages/maemo4/libconic_0.13.bb b/packages/maemo4/libconic_0.13.bb
index 511abb70cc..5f57cf77b1 100644
--- a/packages/maemo4/libconic_0.13.bb
+++ b/packages/maemo4/libconic_0.13.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "Internet connection library"
 LICENSE = "LGPL"
-DEPENDS = "dbus-glib gconf"
+DEPENDS = "dbus gconf osso-ic-oss"
+
+PR = "r1"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libc/${PN}/${PN}_${PV}-0.8.tar.gz"
 
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
-           file://dbus-api-update.patch;patch=1"
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+	autotools_stage_all
 }
 
 
diff --git a/packages/maemo4/libgpsbt_0.1.bb b/packages/maemo4/libgpsbt_0.1.bb
index 59d0db9fbc..beca783a0b 100644
--- a/packages/maemo4/libgpsbt_0.1.bb
+++ b/packages/maemo4/libgpsbt_0.1.bb
@@ -1,7 +1,9 @@
 LICENSE = "nokia"
 
-DEPENDS = "libgpsmgr dbus-glib"
+DEPENDS = "libgpsmgr dbus"
 
+# This is proprietary software in Chinook, so we have to stay with the last released
+# free version.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-18.tar.gz"
 
 inherit autotools pkgconfig
diff --git a/packages/maemo4/libgpsmgr_0.1.bb b/packages/maemo4/libgpsmgr_0.1.bb
index f0fc14bae9..bcbb4cefcb 100644
--- a/packages/maemo4/libgpsmgr_0.1.bb
+++ b/packages/maemo4/libgpsmgr_0.1.bb
@@ -1,11 +1,13 @@
 LICENSE = "nokia"
 
+# This is proprietary software in Chinook, so we have to stay with the last released
+# free version.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-10.tar.gz"
 
 inherit autotools pkgconfig
 
 do_stage() {
-        autotools_stage_all
+  autotools_stage_all
 }
 
 
diff --git a/packages/maemo4/hildon-1_svn.bb b/packages/maemo4/libhildon.inc
index 27b0443d79..bab16cf062 100644
--- a/packages/maemo4/hildon-1_svn.bb
+++ b/packages/maemo4/libhildon.inc
@@ -3,17 +3,10 @@ LICENSE = "LGPL"
 
 DEPENDS = "gconf-dbus esound gtk+"
 
-PV = "1.0.17+svnr${SRCREV}"
-
-SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \
-           file://buttonbox.patch;patch=1;maxrev=14173 "
-S = "${WORKDIR}/hildon-1"
-
 inherit autotools pkgconfig lib_package
 
 EXTRA_OECONF = "--with-maemo-gtk=no"
 
-
 do_stage() {
         autotools_stage_all
 }
diff --git a/packages/maemo4/hildon-1/.mtn2git_empty b/packages/maemo4/libhildon/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/maemo4/hildon-1/.mtn2git_empty
+++ b/packages/maemo4/libhildon/.mtn2git_empty
diff --git a/packages/maemo4/libhildon/libhildon-buildfix.patch b/packages/maemo4/libhildon/libhildon-buildfix.patch
new file mode 100644
index 0000000000..b9a669c76a
--- /dev/null
+++ b/packages/maemo4/libhildon/libhildon-buildfix.patch
@@ -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);
diff --git a/packages/maemo4/libhildon_1.99.0.bb b/packages/maemo4/libhildon_1.99.0.bb
new file mode 100644
index 0000000000..4757d140b2
--- /dev/null
+++ b/packages/maemo4/libhildon_1.99.0.bb
@@ -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 \
+  "
+
+
+
diff --git a/packages/maemo4/libhildonfm.inc b/packages/maemo4/libhildonfm.inc
new file mode 100644
index 0000000000..b6c20a4499
--- /dev/null
+++ b/packages/maemo4/libhildonfm.inc
@@ -0,0 +1,22 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "gtk+ libxi libxt libpng gconf dbus libosso libhildon hildon-thumbnail libhildonmime osso-gwconnect mce-dev"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+
+	touch gtk-doc.make
+}
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+	autotools_stage_all
+	ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
+}
+
+
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();
diff --git a/packages/maemo4/libhildonfm_1.9.41.bb b/packages/maemo4/libhildonfm_1.9.41.bb
deleted file mode 100644
index 777b2a456b..0000000000
--- a/packages/maemo4/libhildonfm_1.9.41.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon filemanager library"
-
-DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
-
-PR = "r1"
-
-SRC_URI = "http://repository.maemo.org/pool/sardine/main/source/libh/libhildonfm/libhildonfm_${PV}.tar.gz \
-           file://hildonfm-ifdef-maemogtk.diff;patch=1 \
-	   "
-
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/1_${PV}"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-        touch gtk-doc.make
-}
-
-
-PARALLEL_MAKE = ""
-
-do_stage() {
-        autotools_stage_all
-	ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
-}
-
-
diff --git a/packages/maemo4/libhildonfm_1.9.46.bb b/packages/maemo4/libhildonfm_1.9.46.bb
new file mode 100644
index 0000000000..67816fb496
--- /dev/null
+++ b/packages/maemo4/libhildonfm_1.9.46.bb
@@ -0,0 +1,9 @@
+require libhildonfm.inc
+
+PR = "r1"
+
+SRC_URI = "\
+	http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}.tar.gz \
+  file://libhildonfm-gtkmaemo-ifdef.patch;patch=1 \
+	"
+
diff --git a/packages/maemo4/libhildonhelp.inc b/packages/maemo4/libhildonhelp.inc
new file mode 100644
index 0000000000..6ce0f0ac6f
--- /dev/null
+++ b/packages/maemo4/libhildonhelp.inc
@@ -0,0 +1,17 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon help library"
+
+DEPENDS = "gtk+ intltool-native libxml2 gtkhtml-3.8 libosso libhildon"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libhildonhelp_1.9.1.bb b/packages/maemo4/libhildonhelp_1.9.1.bb
deleted file mode 100644
index 43d4c15d2e..0000000000
--- a/packages/maemo4/libhildonhelp_1.9.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon help library"
-
-DEPENDS = "libart-lgpl libpng jpeg libxml2 gtkhtml-3.8 libosso"
-
-PR = "r0"
-
-SRC_URI = "http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libh/libhildonhelp/libhildonhelp_${PV}-1.tar.gz"
-
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/${PV}-1"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/libhildonhelp_1.9.6.bb b/packages/maemo4/libhildonhelp_1.9.6.bb
new file mode 100644
index 0000000000..6b6e23d951
--- /dev/null
+++ b/packages/maemo4/libhildonhelp_1.9.6.bb
@@ -0,0 +1,6 @@
+require libhildonhelp.inc
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
+
diff --git a/packages/maemo4/libhildonmime.inc b/packages/maemo4/libhildonmime.inc
new file mode 100644
index 0000000000..12c74a334b
--- /dev/null
+++ b/packages/maemo4/libhildonmime.inc
@@ -0,0 +1,17 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon mime library"
+
+DEPENDS = "libosso gnome-vfs"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.in
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libhildonmime_1.10.0.bb b/packages/maemo4/libhildonmime_1.10.0.bb
new file mode 100644
index 0000000000..68cdd64413
--- /dev/null
+++ b/packages/maemo4/libhildonmime_1.10.0.bb
@@ -0,0 +1,7 @@
+require libhildonmime.inc
+
+DEPENDS += "osso-gnome-vfs2"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libh/${PN}/${PN}_${PV}-1.tar.gz"
diff --git a/packages/maemo4/libhildonmime_1.9.5.bb b/packages/maemo4/libhildonmime_1.9.5.bb
index 1e0285b1fb..1a06284314 100644
--- a/packages/maemo4/libhildonmime_1.9.5.bb
+++ b/packages/maemo4/libhildonmime_1.9.5.bb
@@ -1,23 +1,6 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia hildon mime library"
-
-DEPENDS = "libosso gnome-vfs"
+require libhildonmime.inc
 
 PR = "r0"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/libh/libhildonmime/libhildonmime_${PV}-1ubuntu1.tar.gz"
 
-inherit autotools pkgconfig lib_package
-
-S = "${WORKDIR}/${PN}"
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.in
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/libosso-gsf_1.11.10.4.bb b/packages/maemo4/libosso-gsf_1.11.10.4.bb
index 8888ac7780..6adbc0f6e3 100644
--- a/packages/maemo4/libosso-gsf_1.11.10.4.bb
+++ b/packages/maemo4/libosso-gsf_1.11.10.4.bb
@@ -1,12 +1,13 @@
 LICENSE = "GPL"
 
+PR = "r1"
+
 DEPENDS = "glib-2.0 zlib"
 
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz"
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}_${PV}-1.tar.gz"
 
 inherit autotools pkgconfig
 
-
 do_configure() {
 	gnu-configize
 	libtoolize --force
@@ -14,7 +15,7 @@ do_configure() {
 }
 
 do_stage() {
-        autotools_stage_all
+	autotools_stage_all
 }
 
 
diff --git a/packages/maemo4/libosso.inc b/packages/maemo4/libosso.inc
new file mode 100644
index 0000000000..56437e625f
--- /dev/null
+++ b/packages/maemo4/libosso.inc
@@ -0,0 +1,19 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia osso library"
+
+DEPENDS = "dbus-glib glib-2.0"
+
+inherit autotools pkgconfig lib_package
+
+do_configure_prepend() {
+  # Remove Werror from OSSO_CFLAGS since the source
+  # contains many implicit (const void *) to (void *)
+  # conversions.
+  sed -i s:-Werror::g configure.ac
+}
+
+do_stage() {
+  autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libconic/.mtn2git_empty b/packages/maemo4/libosso/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/maemo4/libconic/.mtn2git_empty
+++ b/packages/maemo4/libosso/.mtn2git_empty
diff --git a/packages/maemo4/libosso/libosso-buildfix.patch b/packages/maemo4/libosso/libosso-buildfix.patch
new file mode 100644
index 0000000000..adb0ca6b5f
--- /dev/null
+++ b/packages/maemo4/libosso/libosso-buildfix.patch
@@ -0,0 +1,64 @@
+Index: libosso-2.13/src/osso-hw.c
+===================================================================
+--- libosso-2.13.orig/src/osso-hw.c	2008-02-13 12:55:17.000000000 +0100
++++ libosso-2.13/src/osso-hw.c	2008-02-13 13:02:55.000000000 +0100
+@@ -23,6 +23,9 @@
+  * 02110-1301 USA
+  */
+ 
++#define _GNU_SOURCE
++#include <string.h>
++
+ #include "osso-internal.h"
+ #include "osso-hw.h"
+ #include "osso-mem.h"
+@@ -635,7 +638,7 @@
+     (*cb)((muali_context_t*)osso, &info, data->user_data);
+ 
+     if (info.args != NULL) {
+-            free(info.args);
++            free((void *) info.args);
+             info.args = NULL;
+     }
+ }
+@@ -762,7 +765,7 @@
+         (*cb)((muali_context_t*)osso, &info, data->user_data);
+ 
+         if (info.args != NULL) {
+-                free(info.args);
++                free((void *) info.args);
+                 info.args = NULL;
+         }
+ }
+Index: libosso-2.13/src/osso-rpc.c
+===================================================================
+--- libosso-2.13.orig/src/osso-rpc.c	2008-02-13 13:03:13.000000000 +0100
++++ libosso-2.13/src/osso-rpc.c	2008-02-13 13:06:05.000000000 +0100
+@@ -997,7 +997,8 @@
+                 int *serial)
+ {
+         int i;
+-        char buf[20], *p;
++        char buf[20];
++        const char *p;
+ 
+         /* get bus type */
+         for (i = 0, p = id; *p != ','; ++p, ++i) {
+@@ -1101,7 +1102,7 @@
+         (*cb)((muali_context_t*)osso, &info, cb_data->user_data);
+ 
+         if (info.args != NULL) {
+-                free(info.args);
++                free((void *) info.args);
+                 info.args = NULL;
+         }
+ }
+@@ -1410,7 +1411,7 @@
+         cb_data->message_id = (long)msg_serial;
+ 
+         cb_data->user_cb = reply_handler;
+-        cb_data->user_data = user_data;
++        cb_data->user_data = (void *) user_data;
+         cb_data->match_rule = NULL;
+         cb_data->event_type = 0;
+         cb_data->bus_type = bus_type;
diff --git a/packages/maemo4/libosso_1.20.bb b/packages/maemo4/libosso_1.20.bb
deleted file mode 100644
index d5489c7e95..0000000000
--- a/packages/maemo4/libosso_1.20.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia osso library"
-
-DEPENDS = "hildon-1 dbus-glib glib-2.0 outo"
-
-PR = "r1"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz"
-
-inherit autotools pkgconfig lib_package
-
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/libosso_2.13.bb b/packages/maemo4/libosso_2.13.bb
new file mode 100644
index 0000000000..1920e29d3a
--- /dev/null
+++ b/packages/maemo4/libosso_2.13.bb
@@ -0,0 +1,16 @@
+require libosso.inc
+
+PR = "r0"
+
+SRC_URI = "\
+  http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}/${PN}_${PV}-1.1fix.tar.gz \
+  file://libosso-buildfix.patch;patch=1 \
+  "
+
+PACKAGES += "${PN}-outo ${PN}-outo-dev ${PN}-outo-dbg ${PN}-outo-bin-dbg ${PN}-outo-bin"
+
+FILES_${PN}-outo = "${libdir}/outo/lib*.so"
+FILES_${PN}-outo-dev = "${libdir}/outo/*.la ${libdir}/outo/*.a"
+FILES_${PN}-outo-dbg = "${libdir}/outo/.debug/lib*.so
+FILES_${PN}-outo-bin-dbg = "${libdir}/outo/.debug/*bin"
+FILES_${PN}-outo-bin = "${libdir}/outo/*bin ${libdir}/outo/mimedummy.doc"
diff --git a/packages/maemo4/mce-dev_1.5.6.bb b/packages/maemo4/mce-dev.inc
index 6168cbe31e..55db0d69da 100644
--- a/packages/maemo4/mce-dev_1.5.6.bb
+++ b/packages/maemo4/mce-dev.inc
@@ -1,26 +1,22 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Nokia MCE headers"
 
-PR = "r0"
-
-SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/m/mce-dev/mce-dev_${PV}.tar.gz"
-
 inherit  pkgconfig 
 
 do_compile() {
-        :
+	# Nothing to compile in this recipe. These are just headers.
+	:
 }
 
-
 do_install() {
-        install -d ${D}${prefix}/include
+	install -d ${D}${prefix}/include
 	install -d ${D}${libdir}/pkgconfig
+
 	cp -pPr include/* ${D}${prefix}/include
 	cp *.pc ${D}${libdir}/pkgconfig/
 }
 
 do_stage() {
-        cp -pPr include/* ${STAGING_INCDIR}/
+	cp -pPr include/* ${STAGING_INCDIR}/
 }
 
-
diff --git a/packages/maemo4/mce-dev_1.6.3.bb b/packages/maemo4/mce-dev_1.6.3.bb
new file mode 100644
index 0000000000..66e238c109
--- /dev/null
+++ b/packages/maemo4/mce-dev_1.6.3.bb
@@ -0,0 +1,7 @@
+require mce-dev.inc
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/m/mce-dev/mce-dev_${PV}.tar.gz"
+
+
diff --git a/packages/maemo4/osso-gnome-vfs2/.mtn2git_empty b/packages/maemo4/osso-gnome-vfs2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo4/osso-gnome-vfs2/.mtn2git_empty
diff --git a/packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch b/packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch
new file mode 100644
index 0000000000..e25ecdd66f
--- /dev/null
+++ b/packages/maemo4/osso-gnome-vfs2/gnome-vfs-no-kerberos.patch
@@ -0,0 +1,51 @@
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig	2007-01-05 19:42:26.418541610 +0200
++++ configure.in	2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-					   
+-if test "x$KRB5_CONFIG" != "xnone"; then
+-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-   
+-   saved_CPPFLAGS="$CPPFLAGS"
+-   saved_LIBS="$LIBS"
+-   LIBS="$LIBS $GSSAPI_LIBS"
+-   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+-   # MIT and Heimdal put gssapi.h in different places
+-   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+-       AC_CHECK_FUNCS(gss_init_sec_context, [
+-           AC_MSG_NOTICE([GSSAPI authentication support enabled])
+-           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+-           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+-		 have_gssapi=yes
+-	 
+-       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+-       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+-          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
+-             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+-		], [
+-		    #ifdef HAVE_GSSAPI_GSSAPI_H
+-		    #include <gssapi/gssapi.h>
+-		    #else	   
+-		    #include <gssapi.h>
+-		    #endif
+-		])
+-	  ])
+-     break
+-   ])
+-   LIBS="$saved_LIBS" 
+-   CPPFLAGS="$saved_CPPFLAGS" 
+-fi   
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+ 	   
+ dnl ******************************
+ dnl http-method (neon checks)
diff --git a/packages/maemo4/osso-gnome-vfs2_2.16.3.bb b/packages/maemo4/osso-gnome-vfs2_2.16.3.bb
new file mode 100644
index 0000000000..4d2e9aa94e
--- /dev/null
+++ b/packages/maemo4/osso-gnome-vfs2_2.16.3.bb
@@ -0,0 +1,47 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
+
+DESCRIPTION = "gnomevfs - osso variant"
+
+PR = "r0"
+
+SRC_URI = "\
+  http://repository.maemo.org/pool/maemo4.0/free/source/o/${PN}/${PN}_${PV}-1osso31.tar.gz \
+  file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0 \
+  "
+
+inherit gnome
+
+EXTRA_OECONF = " \
+	--disable-openssl \
+	--enable-gnutls \
+	--enable-avahi \
+	--with-samba-includes=${STAGING_INCDIR} \
+	--enable-more-warnings=no \
+	"
+
+do_configure_prepend() {
+	# remove Werror from VFS_CFLAGS
+	sed -i s:-Werror::g configure.in
+
+	touch gtk-doc.make
+}
+
+do_stage() {
+  autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "osso-gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+	print bb.data.getVar('FILES_osso-gnome-vfs', d, 1)
+
+	plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+	do_split_packages(d, plugindir, '^lib(.*)\.so$', 'osso-gnome-vfs-plugin-%s', 'OSSO GNOME VFS plugin for %s')
+}
+
+FILES_${PN} += "${datadir}/dbus-1"
+FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug/lib*.so"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include ${libdir}/gnome-vfs-2.0/modules/lib*.a ${libdir}/gnome-vfs-2.0/modules/lib*.la"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
diff --git a/packages/maemo4/osso-gwconnect_1.0.8.bb b/packages/maemo4/osso-gwconnect.inc
index 66b47ebac2..8781b1eb25 100644
--- a/packages/maemo4/osso-gwconnect_1.0.8.bb
+++ b/packages/maemo4/osso-gwconnect.inc
@@ -1,22 +1,17 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Nokia osso connection library"
 
-DEPENDS = "hildon-1 libosso"
-
-PR = "r1"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz"
+DEPENDS = "libosso"
 
 inherit autotools pkgconfig 
 
-
 do_configure_prepend() {
 	# remove Werror from OSSO_CFLAGS
 	sed -i s:-Werror::g configure.ac
 }
 
 do_stage() {
-        autotools_stage_all
+	autotools_stage_all
 }
 
 
diff --git a/packages/maemo4/osso-gwconnect_1.0.12.bb b/packages/maemo4/osso-gwconnect_1.0.12.bb
new file mode 100644
index 0000000000..1a499687f8
--- /dev/null
+++ b/packages/maemo4/osso-gwconnect_1.0.12.bb
@@ -0,0 +1,8 @@
+require osso-gwconnect.inc
+
+DEPENDS += "libhildon bluez-libs"
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo4.0/free/source/o/${PN}/${PN}_${PV}.tar.gz"
+
diff --git a/packages/maemo4/osso-ic-oss_1.0.4.bb b/packages/maemo4/osso-ic-oss_1.0.4.bb
index 4f9b742fb7..04ec84e4e2 100644
--- a/packages/maemo4/osso-ic-oss_1.0.4.bb
+++ b/packages/maemo4/osso-ic-oss_1.0.4.bb
@@ -1,16 +1,16 @@
 LICENSE = "LGPL"
 DESCRIPTION = "Nokia osso-ic library"
 
-DEPENDS = "dbus-glib glib-2.0 outo libosso"
+DEPENDS = "dbus-glib glib-2.0 libosso"
 
-PR = "r0"
+PR = "r1"
 
+# No sources for that Maemo revision any more.
 SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}.tar.gz \
            file://dbus-api-update.patch;patch=1 "
 
 inherit autotools pkgconfig lib_package
 
-
 do_configure_prepend() {
 	# remove Werror from OSSO_CFLAGS
 	sed -i s:-Werror::g configure.ac
diff --git a/packages/maemo4/osso-thumbnail_0.7.bb b/packages/maemo4/osso-thumbnail_0.7.bb
deleted file mode 100644
index d99ee786b5..0000000000
--- a/packages/maemo4/osso-thumbnail_0.7.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Nokia osso thumbnail library"
-
-DEPENDS = "gnome-vfs gconf-dbus hildon-1 libosso"
-
-PR = "r0"
-
-SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz"
-
-inherit autotools pkgconfig lib_package
-
-
-do_configure_prepend() {
-	# remove Werror from OSSO_CFLAGS
-	sed -i s:-Werror::g configure.ac
-}
-
-do_stage() {
-        autotools_stage_all
-}
-
-
diff --git a/packages/maemo4/outo_0.1.1.bb b/packages/maemo4/outo_0.1.1.bb
deleted file mode 100644
index 7fe0343691..0000000000
--- a/packages/maemo4/outo_0.1.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Outo Unit Tester by Otso"
-LICENSE	=	"LGPL"
-
-SRC_URI =	"http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_${PV}.orig.tar.gz \
-			http://repository.maemo.org/pool/maemo/ossw/source/o/outo/outo_0.1.1-2.diff.gz;patch=1;pnum=1"
-S = "${WORKDIR}/outo-0.1.1-20030806.orig"
-
-inherit pkgconfig autotools
-
-
-do_stage() {
-		install -d ${STAGING_INCDIR}
-		install -m 644 include/outo.h ${STAGING_INCDIR}
-}