Browse Source

Fix build against newer macOS versions

tags/v1.9.11
falkTX 6 years ago
parent
commit
f114739e06
3 changed files with 16 additions and 1 deletions
  1. +2
    -0
      data/macos/build-deps.sh
  2. +13
    -0
      data/macos/patches/qt55-newosx-fix.patch
  3. +1
    -1
      source/utils/CarlaMacUtils.cpp

+ 2
- 0
data/macos/build-deps.sh View File

@@ -378,6 +378,8 @@ if [ ! -f qtbase-opensource-src-${QT5_VERSION}/build-done ]; then
if [ ! -f carla-patched ]; then
sed -i -e "s|PNG_WARNINGS_SUPPORTED|PNG_WARNINGS_NOT_SUPPORTED|" src/3rdparty/libpng/pnglibconf.h
sed -i -e "s|AWK=.*|AWK=/opt/local/bin/gawk|" configure
sed -i -e "s|/usr/bin/xcrun -find xcrun|true|" configure
sed -i -e "s|/usr/bin/xcrun -find xcrun|echo hello|" mkspecs/features/mac/default_pre.prf
patch -p1 -i ../patches/qt55-newosx-fix.patch
touch carla-patched
fi


+ 13
- 0
data/macos/patches/qt55-newosx-fix.patch View File

@@ -69,3 +69,16 @@ index cd73148..3f8429e 100644
--
2.7.4

diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 7e1dfd9..674c037 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -736,7 +736,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
QFixed QCoreTextFontEngine::emSquareSize() const
{
- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+ return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
}
QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const

+ 1
- 1
source/utils/CarlaMacUtils.cpp View File

@@ -40,7 +40,7 @@ const char* findBinaryInBundle(const char* const bundleDir)
const CFURLRef absoluteURL = CFURLCopyAbsoluteURL(exeRef);
CARLA_SAFE_ASSERT_RETURN(absoluteURL != nullptr, nullptr);

const NSString* strRef = (NSString*)CFURLCopyFileSystemPath(absoluteURL, nil);
const NSString* strRef = (NSString*)CFURLCopyFileSystemPath(absoluteURL, kCFURLPOSIXPathStyle);
CARLA_SAFE_ASSERT_RETURN(strRef != nullptr, nullptr);

static CarlaString ret;


Loading…
Cancel
Save