From b2c01502c91e8549527c38a8d1df85ef8873911a Mon Sep 17 00:00:00 2001 From: raveit65 Date: Aug 28 2017 13:30:27 +0000 Subject: add more upstream fixes --- diff --git a/caja.spec b/caja.spec index 52b05fc..68b944f 100644 --- a/caja.spec +++ b/caja.spec @@ -16,7 +16,7 @@ Name: caja Summary: File manager for MATE Version: %{branch}.1 %if 0%{?rel_build} -Release: 1%{?dist} +Release: 2%{?dist} %else Release: 0.6%{?git_rel}%{?dist} %endif @@ -33,6 +33,11 @@ URL: http://mate-desktop.org Patch1: caja_add-xfce-to-desktop-file.patch # drop backgrounds Patch2: caja_0001-do-not-show-property-browser-in-menu.patch +# https://github.com/mate-desktop/caja/pull/837 +Patch3: caja_0001-make-sure-scaling-the-desktop-wallpaper-works-in-all.patch +# https://github.com/mate-desktop/caja/pull/838 +Patch4: caja_0001-Revert-Adds-columns-autosizing.patch +Patch5: caja_0002-list-view-fix-large-icon-margins-on-zooming-out.pat BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils @@ -101,6 +106,9 @@ sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-home.desktop.in.in %patch1 -p1 -b .add-xfce-to-desktop-file #%patch2 -p1 -b .0001 +%patch3 -p1 -b .0001 +%patch4 -p1 -b .0001 +%patch5 -p1 -b .0002 %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh @@ -214,6 +222,10 @@ fi %changelog +* Mon Aug 28 2017 Wolfgang Ulbrich - 1.19.1-2 +- use https://github.com/mate-desktop/caja/pull/837 +- use https://github.com/mate-desktop/caja/pull/838 + * Sat Aug 26 2017 Wolfgang Ulbrich - 1.19.1-1 - update to 1.19.1 diff --git a/caja_0001-Revert-Adds-columns-autosizing.patch b/caja_0001-Revert-Adds-columns-autosizing.patch new file mode 100644 index 0000000..f130004 --- /dev/null +++ b/caja_0001-Revert-Adds-columns-autosizing.patch @@ -0,0 +1,33 @@ +From 5917c93ddbdf13816be0334a9fb272a669e47f96 Mon Sep 17 00:00:00 2001 +From: monsta +Date: Mon, 28 Aug 2017 14:15:46 +0300 +Subject: [PATCH 1/2] Revert "Adds columns autosizing" + +This reverts commit 2a424fca8bd928223e92570fa692266c471a52b3. +--- + src/file-manager/fm-list-view.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c +index 155b3b2..4a2a82f 100644 +--- a/src/file-manager/fm-list-view.c ++++ b/src/file-manager/fm-list-view.c +@@ -1766,7 +1766,6 @@ create_and_set_up_tree_view (FMListView *view) + gtk_tree_view_column_set_sort_column_id (view->details->file_name_column, column_num); + gtk_tree_view_column_set_title (view->details->file_name_column, _("Name")); + gtk_tree_view_column_set_resizable (view->details->file_name_column, TRUE); +- gtk_tree_view_column_set_sizing(view->details->file_name_column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + + gtk_tree_view_column_pack_start (view->details->file_name_column, cell, FALSE); + gtk_tree_view_column_set_attributes (view->details->file_name_column, +@@ -1806,7 +1805,6 @@ create_and_set_up_tree_view (FMListView *view) + column); + + gtk_tree_view_column_set_resizable (column, TRUE); +- gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + } + g_free (name); + g_free (label); +-- +2.13.5 + diff --git a/caja_0001-make-sure-scaling-the-desktop-wallpaper-works-in-all.patch b/caja_0001-make-sure-scaling-the-desktop-wallpaper-works-in-all.patch new file mode 100644 index 0000000..9b02919 --- /dev/null +++ b/caja_0001-make-sure-scaling-the-desktop-wallpaper-works-in-all.patch @@ -0,0 +1,48 @@ +From 3063876faf0e2bcbba03264a4a907f1e4e373196 Mon Sep 17 00:00:00 2001 +From: ZenWalker +Date: Mon, 28 Aug 2017 03:33:41 +0200 +Subject: [PATCH] make sure scaling the desktop wallpaper works in all monitors + +Fixes #836 +--- + eel/eel-background.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +diff --git a/eel/eel-background.c b/eel/eel-background.c +index 57e9d65..a3392c2 100644 +--- a/eel/eel-background.c ++++ b/eel/eel-background.c +@@ -313,10 +313,26 @@ drawable_get_adjusted_size (EelBackground *self, + { + #if GTK_CHECK_VERSION (3, 22, 0) + GdkRectangle geometry; +- gdk_monitor_get_geometry (gdk_display_get_primary_monitor (gtk_widget_get_display (self->details->widget)), +- &geometry); +- *width = geometry.width; +- *height = geometry.height; ++ GdkMonitor *monitor; ++ GdkDisplay *display; ++ int n = 0; ++ int i = 0; ++ int sc_width = 0; ++ int sc_height = 0; ++ ++ display = gtk_widget_get_display (self->details->widget); ++ n = gdk_display_get_n_monitors (display); ++ ++ for (i = 0; i < n; ++i) ++ { ++ monitor = gdk_display_get_monitor (display, i); ++ gdk_monitor_get_geometry (monitor, &geometry); ++ sc_width = sc_width + geometry.width; ++ sc_height = sc_height + geometry.height; ++ } ++ ++ *width = sc_width; ++ *height = sc_height; + #else + GdkScreen *screen = gtk_widget_get_screen (self->details->widget); + *width = gdk_screen_get_width (screen); +-- +2.13.5 + diff --git a/caja_0002-list-view-fix-large-icon-margins-on-zooming-out.patch b/caja_0002-list-view-fix-large-icon-margins-on-zooming-out.patch new file mode 100644 index 0000000..32a3b3d --- /dev/null +++ b/caja_0002-list-view-fix-large-icon-margins-on-zooming-out.patch @@ -0,0 +1,28 @@ +From d6b173535255372bc27e803739280be090576939 Mon Sep 17 00:00:00 2001 +From: monsta +Date: Mon, 28 Aug 2017 14:17:18 +0300 +Subject: [PATCH 2/2] list view: fix large icon margins on zooming out + +ported from: +https://git.gnome.org/browse/nautilus/commit/?id=4f17fb7db7b8736ebb4fe82ddb1c279777847730 +https://git.gnome.org/browse/nautilus/commit/?id=41de4e52b43c8ed5c9118860dac7caa303ebbc5b +--- + src/file-manager/fm-list-view.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c +index 4a2a82f..c9eb825 100644 +--- a/src/file-manager/fm-list-view.c ++++ b/src/file-manager/fm-list-view.c +@@ -2777,6 +2777,8 @@ fm_list_view_set_zoom_level (FMListView *view, + gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (view->details->pixbuf_cell), + -1, icon_size); + ++ gtk_tree_view_columns_autosize (view->details->tree_view); ++ + fm_directory_view_update_menus (FM_DIRECTORY_VIEW (view)); + + gtk_tree_model_foreach (GTK_TREE_MODEL (view->details->model), list_view_changed_foreach, NULL); +-- +2.13.5 +