Skip to content

Commit 9a77203

Browse files
authored
libfm: fix build (#368590)
2 parents 98979e8 + 54dab20 commit 9a77203

File tree

5 files changed

+51
-0
lines changed

5 files changed

+51
-0
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/src/actions/action.c
2+
+++ b/src/actions/action.c
3+
@@ -2047,7 +2047,7 @@
4+
gchar* _tmp9_ = NULL;
5+
_tmp0_ = fm_all_actions;
6+
g_hash_table_remove_all (_tmp0_);
7+
- _tmp2_ = _tmp1_ = g_get_system_data_dirs ();
8+
+ _tmp2_ = _tmp1_ = (gchar **)g_get_system_data_dirs ();
9+
dirs = _tmp2_;
10+
dirs_length1 = _vala_array_length (_tmp1_);
11+
_dirs_size_ = dirs_length1;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/src/gtk/exo/exo-icon-view.c
2+
+++ b/src/gtk/exo/exo-icon-view.c
3+
@@ -2819,7 +2819,7 @@
4+
/* allocate a new event to forward */
5+
new_event = gdk_event_copy ((GdkEvent *) event);
6+
g_object_unref (G_OBJECT (new_event->key.window));
7+
- new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
8+
+ new_event->key.window = (GdkWindow *)g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
9+
10+
/* send the event to the search entry. If the "preedit-changed" signal is
11+
* emitted during this event, priv->search_imcontext_changed will be set.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/src/gtk/fm-dnd-dest.c
2+
+++ b/src/gtk/fm-dnd-dest.c
3+
@@ -458,7 +458,7 @@
4+
gtk_action_set_sensitive(act, FALSE);
5+
}
6+
}
7+
- ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"));
8+
+ ri.menu = (GtkMenu *)g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"));
9+
g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL);
10+
unmap_handler = g_signal_connect(ri.menu, "unmap",
11+
G_CALLBACK(run_unmap_handler), &ri);
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/src/gtk/fm-standard-view.c
2+
+++ b/src/gtk/fm-standard-view.c
3+
@@ -637,7 +637,7 @@
4+
"text", FM_FOLDER_MODEL_COL_NAME );
5+
if(fv->renderer_text)
6+
g_object_unref(fv->renderer_text);
7+
- fv->renderer_text = g_object_ref_sink(render);
8+
+ fv->renderer_text = (FmCellRendererText *)g_object_ref_sink(render);
9+
exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME);
10+
g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv);
11+
g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv);

pkgs/by-name/li/libfm/package.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
2727
sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
2828
};
2929

30+
patches = [
31+
./0001-fm-load-all-actions.patch
32+
./0002-exo-icon-view-key-press-event.patch
33+
./0003-ask-action-on-drop.patch
34+
./0004-create-icon-view.patch
35+
];
36+
3037
nativeBuildInputs = [
3138
vala
3239
pkg-config

0 commit comments

Comments
 (0)