notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macOS 10.7 compatibility

Browse source 
It's been reported that the latest version of Tux Paint does not run on macOS
10.7 (Lion).  This change fixes the issue.

BACKGROUND

A user has reported Tux Paint 0.9.23 does not run on macOS 10.7.  She also
identified that the issue is due to a system library required by Tux Paint,
/System/Library/Frameworks/CoreGraphics.framework does not exist on macOS 10.7

Some investigation revealed that CoreGraphics.framework is a library required
by libSDL, and it exists under an alternate path in macOS 10.7, underneath
/System/Library/Frameworks/ApplicationServices.framework/Frameworks/.
CoreGraphics.framework also exists underneath this path in newer version of
macOS as a symlink to the real directory as well, so the issue can be fixed by
simply relinking SDL to use the old (compatible) path instead of the new
(default) path to CoreGraphics.framework.

This change adds the code such that, during the `make install` step to create
TuxPaint.app, any library referencing CoreGraphics.framework is re-linked to
the compatible path rather than the path that only exists on the newer version
of macOS.

For more information, see:

https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7
This commit is contained in:
Mark Kim 2018-10-07 17:48:41 -04:00
parent be99eb3844
commit d2ef2e17d1
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -9,7 +9,7 @@
# The version number, for release: # The version number, for release:
VER_VERSION:=0.9.23a VER_VERSION:=0.9.23c
ifdef SOURCE_DATE_EPOCH ifdef SOURCE_DATE_EPOCH
VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d") VER_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
else else

15
custom/macos.sh
View file

@ -52,6 +52,21 @@ for i in "$BINARY" $LIBS $LIBDIR/*; do
n=`echo "$j" | sed 's/^[/]opt[/]local[/]/@executable_path\/..\//'` n=`echo "$j" | sed 's/^[/]opt[/]local[/]/@executable_path\/..\//'`
install_name_tool -change "$j" "$n" "$i" install_name_tool -change "$j" "$n" "$i"
done done
# libSDL links to /System/Library/Frameworks/CoreGraphics.framework by
# default on newer versions of macOS, but this library is located under
# /System/Library/Frameworks/ApplicationServices.framework/Frameworks
# instead in macOS 10.7, and is a symlink to its real location in later
# versions of macOS. For compatibility reasons, we tell libSDL to link to
# the former location instead. See here for more information:
#
# https://stackoverflow.com/questions/20206985/xcode-linking-against-applicationservices-framework-with-sdk-10-9-causes-10-7
#
if [ `otool -L "$i" | grep -c '^\t\/System\/Library\/Frameworks\/CoreGraphics\.framework\/Versions\/A\/CoreGraphics'` -gt 0 ]; then
defaultlib="/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
compatlib="/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
install_name_tool -change "$defaultlib" "$compatlib" "$i"
fi
done done
# Some libraries require config files, so copy those... # Some libraries require config files, so copy those...

6
macos/Info.plist
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>tuxpaint</string> <string>tuxpaint</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>0.9.23b, Copyright 2009-2018, Tux Paint Development Team</string> <string>0.9.23c, Copyright 2009-2018, Tux Paint Development Team</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>tuxpaint.icns</string> <string>tuxpaint.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@ -19,10 +19,10 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.23b</string> <string>0.9.23c</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>TXPT</string> <string>TXPT</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2018-09-28</string> <string>2018-10-07</string>
</dict> </dict>
</plist> </plist>