Attachment 248351 Details for Bug 276974 – Patch

[patch] Patch

488885550e472c30eea2308d2f27be633cb69bcc.patch (text/plain), 2.84 KB, created by Alexander Vereeken on 2024-02-11 10:57:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Vereeken

Created: 2024-02-11 10:57:44 UTC

Size: 2.84 KB

patch

obsolete

>From c4c8ca3748b3ae370a0b6646f6ffbb95a35b4781 Mon Sep 17 00:00:00 2001
>From: Alexander Vereeken <Alexander88207@protonmail.com>
>Date: Sun, 11 Feb 2024 11:52:10 +0100
>Subject: x11-fm/caja: Fix gfile sort and symlink warnings w glib2.76 or later
>
> PR:		276974
> Obtained from:	https://github.com/mate-desktop/caja/commit/488885550e472c30eea2308d2f27be633cb69bcc
>---
> x11-fm/caja/Makefile                          |  2 +-
> ...tch-libcaja-private_caja-directory-async.c | 11 ++++++++++
> .../files/patch-libcaja-private_caja-file.c   | 20 +++++++++++++++++++
> 3 files changed, 32 insertions(+), 1 deletion(-)
> create mode 100644 x11-fm/caja/files/patch-libcaja-private_caja-directory-async.c
> create mode 100644 x11-fm/caja/files/patch-libcaja-private_caja-file.c
>
>diff --git a/x11-fm/caja/Makefile b/x11-fm/caja/Makefile
>index 41e0522e8..c64ce7f87 100644
>--- a/x11-fm/caja/Makefile
>+++ b/x11-fm/caja/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	caja
> PORTVERSION=	1.26.1
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	x11-fm mate
> MASTER_SITES=	MATE
> DIST_SUBDIR=	mate
>diff --git a/x11-fm/caja/files/patch-libcaja-private_caja-directory-async.c b/x11-fm/caja/files/patch-libcaja-private_caja-directory-async.c
>new file mode 100644
>index 000000000..6eb510252
>--- /dev/null
>+++ b/x11-fm/caja/files/patch-libcaja-private_caja-directory-async.c
>@@ -0,0 +1,11 @@
>+--- libcaja-private/caja-directory-async.c.orig	2022-07-03 12:20:51 UTC
>++++ libcaja-private/caja-directory-async.c
>+@@ -3821,7 +3821,7 @@ static gboolean is_trusted_system_desktop_file (GFile 
>+         return FALSE;
>+     }
>+ 
>+-    target = g_file_info_get_symlink_target (info);
>++    target = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET);
>+     if (!target) {
>+         goto done;
>+     }
>diff --git a/x11-fm/caja/files/patch-libcaja-private_caja-file.c b/x11-fm/caja/files/patch-libcaja-private_caja-file.c
>new file mode 100644
>index 000000000..f76c85f48
>--- /dev/null
>+++ b/x11-fm/caja/files/patch-libcaja-private_caja-file.c
>@@ -0,0 +1,20 @@
>+--- libcaja-private/caja-file.c.orig	2022-07-03 12:20:51 UTC
>++++ libcaja-private/caja-file.c
>+@@ -2398,7 +2398,7 @@ update_info_internal (CajaFile *file,
>+ 	}
>+ 	file->details->size_on_disk = size_on_disk;
>+ 
>+-	sort_order = g_file_info_get_sort_order (info);
>++	sort_order = g_file_info_get_attribute_int32 (info, G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER);
>+ 	if (file->details->sort_order != sort_order) {
>+ 		changed = TRUE;
>+ 	}
>+@@ -2453,7 +2453,7 @@ update_info_internal (CajaFile *file,
>+ 		file->details->thumbnailing_failed = thumbnailing_failed;
>+ 	}
>+ 
>+-	symlink_name = g_file_info_get_symlink_target (info);
>++	symlink_name = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET);
>+ 	if (eel_strcmp (file->details->symlink_name, symlink_name) != 0) {
>+ 		changed = TRUE;
>+ 		g_free (file->details->symlink_name);
>-- 
>2.43.0
>

Actions: View | Diff

Attachments on bug 276974: 248351