[Scummvm-git-logs] scummvm branch-2-7 -> f6ca571c87580c5ae2183387375ada1e8f255bdb

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f6ca571c87 BUILD: MACOS: Fix/simplify the `xattr` check for older OSX


Commit: f6ca571c87580c5ae2183387375ada1e8f255bdb
    https://github.com/scummvm/scummvm/commit/f6ca571c87580c5ae2183387375ada1e8f255bdb
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-04-13T00:20:47+02:00

Commit Message:
BUILD: MACOS: Fix/simplify the `xattr` check for older OSX

Just reuse the MACOSX_LEOPARD_OR_BELOW define, since TextEdit isn't able
to make anything out of this attribute on Leopard or below anyway.

Fixes a GNU make mistake of mine in commit
cdbdb58e07cc2235cd24ce2d6e8ea515938fdd93.

(cherry picked from commit ad42ff82d3a49f0054d127ea1208ab3b6ad7dcbe)

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index 616cbf728a1..969faf682ac 100644
--- a/ports.mk
+++ b/ports.mk
@@ -543,7 +543,9 @@ osxsnap: bundle
 	cp $(DIST_FILES_DOCS_se) ./ScummVM-snapshot/doc/se/
 	$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/doc/QuickStart
 	$(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/doc/*/*
-	command -v xattr >/dev/null 2>&1 && xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/*/*
+ifndef MACOSX_LEOPARD_OR_BELOW
+	xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/*/*
+endif
 	cp -RP $(bundle_name) ./ScummVM-snapshot/
 	cp $(srcdir)/dists/macosx/DS_Store ./ScummVM-snapshot/.DS_Store
 	cp $(srcdir)/dists/macosx/background.jpg ./ScummVM-snapshot/background.jpg