From: Qiu Wenbo <qiuwenbo@kylinos.com.cn>
Date: Fri, 11 Aug 2023 07:55:08 +0000 (+0800)
Subject: filefilter: fix UTI type conversion on macOS
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2^2~38
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0997d39a06266cf357b28d8084aa71d61d02b0fa;p=gtk4.git

filefilter: fix UTI type conversion on macOS

GContentType on macOS switched to UTI since glib 2.51. We should not assume it as MIME type anymore.

Fixes: #4986

Signed-off-by: Qiu Wenbo <qiuwenbo@kylinos.com.cn>
---

diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 1550c491bd..26e5adb0db 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -758,8 +758,6 @@ gtk_file_filter_get_attributes (GtkFileFilter *filter)
 
 #ifdef GDK_WINDOWING_MACOS
 
-#import <Foundation/Foundation.h>
-
 NSArray * _gtk_file_filter_get_as_pattern_nsstrings (GtkFileFilter *filter)
 {
   NSMutableArray *array = [[NSMutableArray alloc] init];
@@ -773,9 +771,8 @@ NSArray * _gtk_file_filter_get_as_pattern_nsstrings (GtkFileFilter *filter)
         {
         case FILTER_RULE_MIME_TYPE:
           {
-            // convert mime-types to UTI
-            NSString *mime_type_nsstring = [NSString stringWithUTF8String: rule->u.content_types[0]];
-            NSString *uti_nsstring = (NSString *) UTTypeCreatePreferredIdentifierForTag (kUTTagClassMIMEType, (CFStringRef) mime_type_nsstring, NULL);
+            // GContentType from GIO use UTI on macOS since glib version 2.51
+            NSString *uti_nsstring = [NSString stringWithUTF8String: rule->u.content_types[0]];
             if (uti_nsstring == NULL)
               {
                 [array release];
diff --git a/gtk/meson.build b/gtk/meson.build
index 765925dc26..1bc3ab14e6 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1075,7 +1075,6 @@ endif
 if macos_enabled
   gtk_macos_frameworks = [
     'AppKit',
-    'Foundation',
   ]
   gtk_deps += [dependency('appleframeworks', modules: gtk_macos_frameworks)]
 endif