public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt48: fix darwin build with clang-5

Browse Source
This commit is contained in:
Daiderd Jordan 2018-02-13 22:16:24 +01:00
parent f8865b1181
commit 4c07aea8d8
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm
index 204d685..e05179e 100644
--- a/src/gui/text/qfontengine_coretext.mm
+++ b/src/gui/text/qfontengine_coretext.mm
@@ -886,7 +886,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
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
[ ./glib-2.32.patch [ ./glib-2.32.patch
./libressl.patch ./libressl.patch
./parallel-configure.patch ./parallel-configure.patch
./clang-5-darwin.patch
./qt-4.8.7-unixmake-darwin.patch ./qt-4.8.7-unixmake-darwin.patch
(substituteAll { (substituteAll {
src = ./dlopen-absolute-paths.diff; src = ./dlopen-absolute-paths.diff;