From e36c646caf7cdbe560692326bd84a3d0f3a40581 Mon Sep 17 00:00:00 2001 From: Brendan Black Date: Fri, 10 Sep 2021 10:55:00 +0100 Subject: [PATCH] fix for https://sourceforge.net/p/flightgear/codetickets/2651/ libfreetype 2.11 breaks compatibility with older harfbuzz that we are including to enable backwards compatibility with Ubuntu 16.04 based dists, so we now need to include libfontconfig & libpng15 In future for next we might not bother with harfbuzz,fontconfig etc as we are compiling OSG with vendor neutral dispatch (libGLvnd) that the older Mesa in 16.04 doesn't support --- build_appimage.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build_appimage.sh b/build_appimage.sh index 6670603..a9f2942 100755 --- a/build_appimage.sh +++ b/build_appimage.sh @@ -66,6 +66,15 @@ cp /etc/pki/tls/certs/ca-bundle.crt appdir/usr/ssl/cacert.pem # https://sourceforge.net/p/flightgear/codetickets/2590/ cp -a /lib64/libharfbuzz.so* appdir/usr/lib +# as we are copying over libharfbuzz we need the older libfontconfig, +# libfreetype & libpng15 as 2.11 breaks compatibility: see +# https://sourceforge.net/p/flightgear/codetickets/2651/ +cp -a /usr/lib64/libfontconfig.so* appdir/usr/lib +cp -a /usr/lib64/libfreetype.so* appdir/usr/lib +cp -a /usr/lib64/libpng15.so* appdir/usr/lib +patchelf --set-rpath \$ORIGIN appdir/usr/lib/libfontconfig.so +patchelf --set-rpath \$ORIGIN appdir/usr/lib/libfreetype.so + #modify the desktop file so that linuxdeployqt doesn't barf (version to 1.0, add semicolon to end of certain line types) sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/applications/org.flightgear.FlightGear.desktop