From 3dddb741adc07c4f0ad7b31c95fb948200a0e529 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Jan 02 2014 09:09:25 +0000 Subject: hopefully fix rename position issue (bz 1045181) --- diff --git a/Fix_rename_entry_position.patch b/Fix_rename_entry_position.patch new file mode 100644 index 0000000..615f58d --- /dev/null +++ b/Fix_rename_entry_position.patch @@ -0,0 +1,32 @@ +--- a/eel/eel-canvas.c ++++ b/eel/eel-canvas.c +@@ -3213,11 +3213,19 @@ eel_canvas_draw (GtkWidget *widget, cair + return FALSE; + + bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); ++ ++ if (!gtk_cairo_should_draw_window (cr, bin_window)) ++ return FALSE; ++ ++ cairo_save (cr); ++ + gtk_cairo_transform_to_window (cr, widget, bin_window); + + region = eel_cairo_get_clip_region (cr); +- if (region == NULL) ++ if (region == NULL) { ++ cairo_restore (cr); + return FALSE; ++ } + + #ifdef VERBOSE + g_print ("Draw\n"); +@@ -3249,6 +3257,8 @@ eel_canvas_draw (GtkWidget *widget, cair + if (canvas->root->flags & EEL_CANVAS_ITEM_MAPPED) + EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->draw (canvas->root, cr, region); + ++ cairo_restore (cr); ++ + /* Chain up to get exposes on child widgets */ + if (GTK_WIDGET_CLASS (canvas_parent_class)->draw) + GTK_WIDGET_CLASS (canvas_parent_class)->draw (widget, cr); diff --git a/nemo.spec b/nemo.spec index 72c8f3d..3178910 100644 --- a/nemo.spec +++ b/nemo.spec @@ -3,7 +3,7 @@ Name: nemo Summary: File manager for Cinnamon Version: 2.0.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops URL: https://github.com/linuxmint/nemo @@ -17,6 +17,7 @@ Source4: nemo-fedora.gschema.override Patch0: tracker-18.patch Patch1: git_rollup.patch +Patch2: Fix_rename_entry_position.patch Requires: redhat-menus Requires: gvfs @@ -85,6 +86,7 @@ Nemo theme fix for Adwaita %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i -e 's@DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"@@g' configure.in mv configure.in configure.ac NOCONFIGURE=1 ./autogen.sh @@ -187,6 +189,9 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Thu Jan 02 2014 Leigh Scott - 2.0.8-5 +- hopefully fix rename position issue (bz 1045181) + * Mon Dec 23 2013 Leigh Scott - 2.0.8-4 - add patch to build against tracker-1.8