maemo: rename maemo3 to maemo4 since it's using most of the chinook API already

28 files changed, 577 insertions, 0 deletions

diff --git a/packages/maemo4/.mtn2git_empty b/packages/maemo4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo4/.mtn2git_empty
diff --git a/packages/maemo4/hildon-1/.mtn2git_empty b/packages/maemo4/hildon-1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo4/hildon-1/.mtn2git_empty
diff --git a/packages/maemo4/hildon-1/buttonbox.patch b/packages/maemo4/hildon-1/buttonbox.patch
new file mode 100644
index 0000000000..cfea60d000
--- /dev/null
+++ b/packages/maemo4/hildon-1/buttonbox.patch
@@ -0,0 +1,11 @@
+--- /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-1_svn.bb b/packages/maemo4/hildon-1_svn.bb
new file mode 100644
index 0000000000..27b0443d79
--- /dev/null
+++ b/packages/maemo4/hildon-1_svn.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Hildon widget library"
+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-base-lib_0.11.1.bb b/packages/maemo4/hildon-base-lib_0.11.1.bb
new file mode 100644
index 0000000000..ce3f667a00
--- /dev/null
+++ b/packages/maemo4/hildon-base-lib_0.11.1.bb
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000..02bbad9dd2
--- /dev/null
+++ b/packages/maemo4/hildon-lgpl_0.12.1.bb
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..cb89376776
--- /dev/null
+++ b/packages/maemo4/hildon-libs_0.15.1.bb
@@ -0,0 +1,26 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon librares"
+
+DEPENDS = "gtk-doc-native libosso"
+
+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_0.11.bb b/packages/maemo4/hildon-thumbnail_0.11.bb
new file mode 100644
index 0000000000..54646e7630
--- /dev/null
+++ b/packages/maemo4/hildon-thumbnail_0.11.bb
@@ -0,0 +1,25 @@
+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/libconic/.mtn2git_empty b/packages/maemo4/libconic/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo4/libconic/.mtn2git_empty
diff --git a/packages/maemo4/libconic/dbus-api-update.patch b/packages/maemo4/libconic/dbus-api-update.patch
new file mode 100644
index 0000000000..3542cecae8
--- /dev/null
+++ b/packages/maemo4/libconic/dbus-api-update.patch
@@ -0,0 +1,19 @@
+--- /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
new file mode 100644
index 0000000000..511abb70cc
--- /dev/null
+++ b/packages/maemo4/libconic_0.13.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Internet connection library"
+LICENSE = "LGPL"
+DEPENDS = "dbus-glib gconf"
+
+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
+}
+
+
diff --git a/packages/maemo4/libgpsbt_0.1.bb b/packages/maemo4/libgpsbt_0.1.bb
new file mode 100644
index 0000000000..59d0db9fbc
--- /dev/null
+++ b/packages/maemo4/libgpsbt_0.1.bb
@@ -0,0 +1,13 @@
+LICENSE = "nokia"
+
+DEPENDS = "libgpsmgr dbus-glib"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-18.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libgpsmgr_0.1.bb b/packages/maemo4/libgpsmgr_0.1.bb
new file mode 100644
index 0000000000..f0fc14bae9
--- /dev/null
+++ b/packages/maemo4/libgpsmgr_0.1.bb
@@ -0,0 +1,11 @@
+LICENSE = "nokia"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-10.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libhildonfm/.mtn2git_empty b/packages/maemo4/libhildonfm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo4/libhildonfm/.mtn2git_empty
diff --git a/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff b/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff
new file mode 100644
index 0000000000..8d91e1dd65
--- /dev/null
+++ b/packages/maemo4/libhildonfm/hildonfm-ifdef-maemogtk.diff
@@ -0,0 +1,132 @@
+--- /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
+@@ -2036,6 +2036,7 @@
+     g_object_set(cell, "text", buffer, "sensitive", sensitive, NULL);
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static void hildon_file_selection_navigation_pane_context(GtkWidget *
+                                                           widget,
+                                                           gpointer data)
+@@ -2052,6 +2053,7 @@
+     ULOG_DEBUG(__FUNCTION__);
+     g_signal_emit(data, signal_content_pane_context_menu, 0);
+ }
++#endif /* USE_MAEMO_GTK */
+ 
+ static gboolean hildon_file_selection_on_content_pane_key(GtkWidget *
+                                                           widget,
+@@ -2200,6 +2202,7 @@
+   }
+ }
+ 
++#ifdef USE_MAEMO_GTK
+ static gboolean
+ tap_and_hold_query (gpointer self, guint signal_id)
+ {
+@@ -2225,6 +2228,8 @@
+   return tap_and_hold_query (self, signal_navigation_pane_context_menu);
+ }
+ 
++#endif /* USE_MAEMO_GTK */
++
+ static void hildon_file_selection_create_thumbnail_view(HildonFileSelection
+                                                         * self)
+ {
+@@ -2277,7 +2282,7 @@
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     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 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
++#endif /* USE_MAEMO_GTK */
+ 
+     g_signal_connect_object(tree, "notify::has-focus",
+                      G_CALLBACK(content_pane_focus), self, 0);
+@@ -2397,7 +2403,7 @@
+         (selection, "changed",
+          G_CALLBACK (hildon_file_selection_content_pane_selection_changed),
+          self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     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 @@
+     g_signal_connect_object(tree, "tap-and-hold",
+                      G_CALLBACK
+                      (hildon_file_selection_content_pane_context), self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+     g_signal_connect_object(tree, "key-press-event",
+                      G_CALLBACK(hildon_file_selection_on_content_pane_key),
+                      self, 0);
+@@ -2492,7 +2498,7 @@
+     g_signal_connect_object(selection, "changed",
+                      G_CALLBACK(hildon_file_selection_selection_changed),
+                      self, 0);
+-
++#ifdef USE_MAEMO_GTK
+     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 @@
+                      G_CALLBACK
+                      (hildon_file_selection_navigation_pane_context),
+                      self, 0);
+-
++#endif /* USE_MAEMO_GTK */
+     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
new file mode 100644
index 0000000000..777b2a456b
--- /dev/null
+++ b/packages/maemo4/libhildonfm_1.9.41.bb
@@ -0,0 +1,30 @@
+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/libhildonhelp_1.9.1.bb b/packages/maemo4/libhildonhelp_1.9.1.bb
new file mode 100644
index 0000000000..43d4c15d2e
--- /dev/null
+++ b/packages/maemo4/libhildonhelp_1.9.1.bb
@@ -0,0 +1,23 @@
+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/libhildonmime_1.9.5.bb b/packages/maemo4/libhildonmime_1.9.5.bb
new file mode 100644
index 0000000000..1e0285b1fb
--- /dev/null
+++ b/packages/maemo4/libhildonmime_1.9.5.bb
@@ -0,0 +1,23 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon mime library"
+
+DEPENDS = "libosso gnome-vfs"
+
+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
new file mode 100644
index 0000000000..8888ac7780
--- /dev/null
+++ b/packages/maemo4/libosso-gsf_1.11.10.4.bb
@@ -0,0 +1,20 @@
+LICENSE = "GPL"
+
+DEPENDS = "glib-2.0 zlib"
+
+SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz"
+
+inherit autotools pkgconfig
+
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	oe_runconf
+}
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libosso-help_2.1.2.bb b/packages/maemo4/libosso-help_2.1.2.bb
new file mode 100644
index 0000000000..8a35e1a4f0
--- /dev/null
+++ b/packages/maemo4/libosso-help_2.1.2.bb
@@ -0,0 +1,24 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia osso help library"
+
+DEPENDS = "libhildonhelp libosso gtkhtml-3.8 libxml2 "
+
+PR = "r0"
+
+SRC_URI = "http://repository.maemo.org/pool/sardine-experimental/main.disabled/source/libo/libosso-help/libosso-help_${PV}-2.tar.gz"
+
+inherit autotools pkgconfig lib_package
+
+S = "${WORKDIR}/2.1.2-2"
+
+do_configure_prepend() {
+	# remove Werror from OSSO_CFLAGS
+	sed -i s:-Werror::g configure.ac
+        sed -i -e s:AC_CONFIG_SRCDIR:#AC_CONFIG_SRCDIR:g configure.ac
+}
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/libosso_1.20.bb b/packages/maemo4/libosso_1.20.bb
new file mode 100644
index 0000000000..d5489c7e95
--- /dev/null
+++ b/packages/maemo4/libosso_1.20.bb
@@ -0,0 +1,22 @@
+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/mce-dev_1.5.6.bb b/packages/maemo4/mce-dev_1.5.6.bb
new file mode 100644
index 0000000000..6168cbe31e
--- /dev/null
+++ b/packages/maemo4/mce-dev_1.5.6.bb
@@ -0,0 +1,26 @@
+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() {
+        :
+}
+
+
+do_install() {
+        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}/
+}
+
+
diff --git a/packages/maemo4/osso-gwconnect_1.0.8.bb b/packages/maemo4/osso-gwconnect_1.0.8.bb
new file mode 100644
index 0000000000..66b47ebac2
--- /dev/null
+++ b/packages/maemo4/osso-gwconnect_1.0.8.bb
@@ -0,0 +1,22 @@
+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"
+
+inherit autotools pkgconfig 
+
+
+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/osso-ic-oss/.mtn2git_empty b/packages/maemo4/osso-ic-oss/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo4/osso-ic-oss/.mtn2git_empty
diff --git a/packages/maemo4/osso-ic-oss/dbus-api-update.patch b/packages/maemo4/osso-ic-oss/dbus-api-update.patch
new file mode 100644
index 0000000000..425f959d79
--- /dev/null
+++ b/packages/maemo4/osso-ic-oss/dbus-api-update.patch
@@ -0,0 +1,33 @@
+--- /tmp/osso-iap-connect.c	2007-08-07 12:06:51.000000000 +0200
++++ osso-ic-oss-1.0.4/examples/osso-iap-connect.c	2007-08-07 12:07:32.698400000 +0200
+@@ -276,7 +276,7 @@
+ 	g_main_loop_run(ctxt.loop);
+ 
+ 	/* Clean up */
+-	dbus_connection_disconnect(conn);
++	dbus_connection_close(conn);
+ 	dbus_connection_unref(conn);
+ 
+ 	g_main_loop_unref(ctxt.loop);
+--- /tmp/ic-compat-preload.c	2007-08-07 12:06:57.000000000 +0200
++++ osso-ic-oss-1.0.4/src/ic-compat-preload.c	2007-08-07 12:07:40.268400000 +0200
+@@ -140,7 +140,7 @@
+ 			return NULL;
+ 
+ 		if (!dbus_bus_register(connection, NULL)) {
+-			dbus_connection_disconnect(connection);
++			dbus_connection_close(connection);
+ 			dbus_connection_unref(connection);
+ 			connection = NULL;
+ 			return NULL;
+--- /tmp/ic-api.c	2007-08-07 12:06:57.000000000 +0200
++++ osso-ic-oss-1.0.4/src/ic-api.c	2007-08-07 12:07:55.628400000 +0200
+@@ -145,7 +145,7 @@
+ 		if (dbus_connection_register_object_path(
+ 				connection, ICD_DBUS_PATH,
+ 				&icd_vtable, arg) == FALSE) {
+-			dbus_connection_disconnect(connection);
++			dbus_connection_close(connection);
+ 			dbus_connection_unref(connection);
+ 			connection = NULL;
+ 			return NULL;
diff --git a/packages/maemo4/osso-ic-oss_1.0.4.bb b/packages/maemo4/osso-ic-oss_1.0.4.bb
new file mode 100644
index 0000000000..4f9b742fb7
--- /dev/null
+++ b/packages/maemo4/osso-ic-oss_1.0.4.bb
@@ -0,0 +1,25 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia osso-ic library"
+
+DEPENDS = "dbus-glib glib-2.0 outo libosso"
+
+PR = "r0"
+
+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
+}
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+        autotools_stage_all
+}
+
+
diff --git a/packages/maemo4/osso-thumbnail_0.7.bb b/packages/maemo4/osso-thumbnail_0.7.bb
new file mode 100644
index 0000000000..d99ee786b5
--- /dev/null
+++ b/packages/maemo4/osso-thumbnail_0.7.bb
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000000..7fe0343691
--- /dev/null
+++ b/packages/maemo4/outo_0.1.1.bb
@@ -0,0 +1,14 @@
+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}
+}