@@ -378,6 +378,8 @@ if [ ! -f qtbase-opensource-src-${QT5_VERSION}/build-done ]; then | |||||
if [ ! -f carla-patched ]; 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|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|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 | patch -p1 -i ../patches/qt55-newosx-fix.patch | ||||
touch carla-patched | touch carla-patched | ||||
fi | fi | ||||
@@ -69,3 +69,16 @@ index cd73148..3f8429e 100644 | |||||
-- | -- | ||||
2.7.4 | 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 |
@@ -40,7 +40,7 @@ const char* findBinaryInBundle(const char* const bundleDir) | |||||
const CFURLRef absoluteURL = CFURLCopyAbsoluteURL(exeRef); | const CFURLRef absoluteURL = CFURLCopyAbsoluteURL(exeRef); | ||||
CARLA_SAFE_ASSERT_RETURN(absoluteURL != nullptr, nullptr); | 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); | CARLA_SAFE_ASSERT_RETURN(strRef != nullptr, nullptr); | ||||
static CarlaString ret; | static CarlaString ret; | ||||