7 files changed, 13 insertions, 114 deletions

diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
index 2f451ac59a0f..07e55defac8a 100644
--- a/x11-fm/caja/Makefile
+++ b/x11-fm/caja/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	caja
-PORTVERSION=	1.22.3
-PORTREVISION=	1
+PORTVERSION=	1.24.0
 CATEGORIES=	x11-fm mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/x11-fm/caja/distinfo b/x11-fm/caja/distinfo
index 076d9c47f98d..977c83528192 100644
--- a/x11-fm/caja/distinfo
+++ b/x11-fm/caja/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577273923
-SHA256 (mate/caja-1.22.3.tar.xz) = c76237edacadc5f01cf36a229575899800162ffa5d20ac94ff25cf00138e54f0
-SIZE (mate/caja-1.22.3.tar.xz) = 3493232
+TIMESTAMP = 1591973265
+SHA256 (mate/caja-1.24.0.tar.xz) = 80e17a55739561b213197f547cc1b30ca977206980cfa1e2d892331810f1ceb2
+SIZE (mate/caja-1.24.0.tar.xz) = 5221716
diff --git a/x11-fm/caja/files/patch-eel_eel-background.c b/x11-fm/caja/files/patch-eel_eel-background.c
deleted file mode 100644
index 4d45b30cc174..000000000000
--- a/x11-fm/caja/files/patch-eel_eel-background.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- eel/eel-background.c.orig	2020-08-28 11:28:14 UTC
-+++ eel/eel-background.c
-@@ -36,7 +36,6 @@
- #include <gio/gio.h>
- #include <math.h>
- #include <stdio.h>
--#include <libcaja-private/caja-global-preferences.h>
- 
- enum
- {
-@@ -427,6 +426,7 @@ set_root_surface (EelBackground *self,
- static void
- init_fade (EelBackground *self)
- {
-+    GSettings *mate_background_preferences;
-     GtkWidget *widget = self->details->widget;
-     gboolean do_fade;
- 
-@@ -434,8 +434,10 @@ init_fade (EelBackground *self)
-         return;
-     }
- 
-+    mate_background_preferences = g_settings_new ("org.mate.background");
-     do_fade = g_settings_get_boolean (mate_background_preferences,
-                                       MATE_BG_KEY_BACKGROUND_FADE);
-+    g_object_unref (mate_background_preferences);
-     if (!do_fade) {
-     	return;
-     }
diff --git a/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c b/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c
deleted file mode 100644
index 8abd1bc7d6d4..000000000000
--- a/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libcaja-private/caja-global-preferences.c.orig	2020-08-28 11:29:20 UTC
-+++ libcaja-private/caja-global-preferences.c
-@@ -34,6 +34,19 @@
- #include <eel/eel-string.h>
- #include <glib/gi18n.h>
- 
-+GSettings *caja_preferences;
-+GSettings *caja_media_preferences;
-+GSettings *caja_window_state;
-+GSettings *caja_icon_view_preferences;
-+GSettings *caja_desktop_preferences;
-+GSettings *caja_tree_sidebar_preferences;
-+GSettings *caja_compact_view_preferences;
-+GSettings *caja_list_view_preferences;
-+GSettings *caja_extension_preferences;
-+
-+GSettings *mate_background_preferences;
-+GSettings *mate_lockdown_preferences;
-+
- /*
-  * Public functions
-  */
diff --git a/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h b/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h
deleted file mode 100644
index 685db3aa8a42..000000000000
--- a/x11-fm/caja/files/patch-libcaja-private_caja-global-preferences.h
+++ /dev/null
@@ -1,32 +0,0 @@
---- libcaja-private/caja-global-preferences.h.orig	2020-08-28 11:29:20 UTC
-+++ libcaja-private/caja-global-preferences.h
-@@ -211,18 +211,18 @@ typedef enum
- void caja_global_preferences_init                      (void);
- char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void);
- 
--GSettings *caja_preferences;
--GSettings *caja_media_preferences;
--GSettings *caja_window_state;
--GSettings *caja_icon_view_preferences;
--GSettings *caja_desktop_preferences;
--GSettings *caja_tree_sidebar_preferences;
--GSettings *caja_compact_view_preferences;
--GSettings *caja_list_view_preferences;
--GSettings *caja_extension_preferences;
-+extern GSettings *caja_preferences;
-+extern GSettings *caja_media_preferences;
-+extern GSettings *caja_window_state;
-+extern GSettings *caja_icon_view_preferences;
-+extern GSettings *caja_desktop_preferences;
-+extern GSettings *caja_tree_sidebar_preferences;
-+extern GSettings *caja_compact_view_preferences;
-+extern GSettings *caja_list_view_preferences;
-+extern GSettings *caja_extension_preferences;
- 
--GSettings *mate_background_preferences;
--GSettings *mate_lockdown_preferences;
-+extern GSettings *mate_background_preferences;
-+extern GSettings *mate_lockdown_preferences;
- 
- G_END_DECLS
- 
diff --git a/x11-fm/caja/files/patch-src_file-manager_fm-properties-window.c b/x11-fm/caja/files/patch-src_file-manager_fm-properties-window.c
deleted file mode 100644
index 89b90aa64a7c..000000000000
--- a/x11-fm/caja/files/patch-src_file-manager_fm-properties-window.c
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/mate-desktop/caja/commit/13d04135dda5
-
---- src/file-manager/fm-properties-window.c.orig	2019-12-23 17:17:34 UTC
-+++ src/file-manager/fm-properties-window.c
-@@ -42,7 +42,6 @@
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <glib/gi18n.h>
--#include <libmate-desktop/mate-desktop-thumbnail.h>
- #include <libcaja-extension/caja-property-page-provider.h>
- #include <libcaja-private/caja-entry.h>
- #include <libcaja-private/caja-extensions.h>
-@@ -5622,10 +5621,11 @@ update_preview_callback (GtkFileChooser *icon_chooser,
- 			scale = (double)gdk_pixbuf_get_height (pixbuf) /
- 				gdk_pixbuf_get_width (pixbuf);
- 
--			scaled_pixbuf = mate_desktop_thumbnail_scale_down_pixbuf
-+			scaled_pixbuf = gdk_pixbuf_scale_simple
- 				(pixbuf,
- 				 PREVIEW_IMAGE_WIDTH,
--				 scale * PREVIEW_IMAGE_WIDTH);
-+				 scale * PREVIEW_IMAGE_WIDTH,
-+				 GDK_INTERP_HYPER);
- 			g_object_unref (pixbuf);
- 			pixbuf = scaled_pixbuf;
- 		}
diff --git a/x11-fm/caja/pkg-plist b/x11-fm/caja/pkg-plist
index 2af4f340278d..8520e6affcc1 100644
--- a/x11-fm/caja/pkg-plist
+++ b/x11-fm/caja/pkg-plist
@@ -14,6 +14,7 @@ include/caja/libcaja-extension/caja-menu-provider.h
 include/caja/libcaja-extension/caja-menu.h
 include/caja/libcaja-extension/caja-property-page-provider.h
 include/caja/libcaja-extension/caja-property-page.h
+include/caja/libcaja-extension/caja-widget-view-provider.h
 lib/girepository-1.0/Caja-2.0.typelib
 lib/libcaja-extension.so
 lib/libcaja-extension.so.1
@@ -31,7 +32,12 @@ share/applications/caja-folder-handler.desktop
 share/applications/caja-home.desktop
 share/applications/caja.desktop
 share/applications/mate-network-scheme.desktop
+%%DATADIR%%/a11y-caja-desktop-base.css
 %%DATADIR%%/browser.xml
+%%DATADIR%%/caja-desktop-ContrastHigh.css
+%%DATADIR%%/caja-desktop-ContrastHighInverse.css
+%%DATADIR%%/caja-desktop-HighContrast.css
+%%DATADIR%%/caja-desktop-HighContrastInverse.css
 %%DATADIR%%/caja-desktop.css
 %%DATADIR%%/caja-extras.placeholder
 %%DATADIR%%/caja-suggested.placeholder
@@ -88,6 +94,7 @@ share/doc/libcaja-extension/CajaMenuItem.html
 share/doc/libcaja-extension/CajaMenuProvider.html
 share/doc/libcaja-extension/CajaPropertyPage.html
 share/doc/libcaja-extension/CajaPropertyPageProvider.html
+share/doc/libcaja-extension/CajaWidgetViewProvider.html
 share/doc/libcaja-extension/ch01.html
 share/doc/libcaja-extension/home.png
 share/doc/libcaja-extension/index.html
@@ -231,6 +238,8 @@ share/locale/zh_HK/LC_MESSAGES/caja.mo
 share/locale/zh_TW/LC_MESSAGES/caja.mo
 share/locale/zu/LC_MESSAGES/caja.mo
 share/metainfo/caja.appdata.xml
+share/mime/application/x-mate-saved-search.xml
+share/mime/packages/caja.xml
 share/pixmaps/caja/audio.svg
 share/pixmaps/caja/backgrounds.png
 share/pixmaps/caja/chit_frame.png