libhildonfm: add 1.9.41 works against a stock gtk+!

diff --git a/packages/maemo3/libhildonfm/.mtn2git_empty b/packages/maemo3/libhildonfm/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff b/packages/maemo3/libhildonfm/hildonfm-ifdef-maemogtk.diff
new file mode 100644 (file)
index 0000000..8d91e1d
--- /dev/null
+++ b/packages/maemo3/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/maemo3/libhildonfm_1.9.41.bb b/packages/maemo3/libhildonfm_1.9.41.bb
new file mode 100644 (file)
index 0000000..de1bb3d
--- /dev/null
+++ b/packages/maemo3/libhildonfm_1.9.41.bb
@@ -0,0 +1,29 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Nokia hildon filemanager library"
+
+DEPENDS = "hildon-thumbnail mce-dev libhildonmime osso-gwconnect hildon-libs osso-thumbnail"
+
+PR = "r0"
+
+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
+}
+
+