CVS commit: pkgsrc/x11/qt5-qtbase

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 31 14:08:26 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtbase: distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches:
            patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm

Log Message:
Fix building on Darwin (with newer clang)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.36 pkgsrc/x11/qt5-qtbase/distinfo:1.37
--- pkgsrc/x11/qt5-qtbase/distinfo:1.36 Wed Jan 31 12:36:57 2018
+++ pkgsrc/x11/qt5-qtbase/distinfo      Wed Jan 31 14:08:25 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2018/01/31 12:36:57 jperkin Exp $
+$NetBSD: distinfo,v 1.37 2018/01/31 14:08:25 adam Exp $
 
 SHA1 (qtbase-everywhere-src-5.10.0.tar.xz) = 34fa3d4e7bb2b1545247a616190efaf74804db49
 RMD160 (qtbase-everywhere-src-5.10.0.tar.xz) = d6f9ab8526ebe50791b9b948930806dc8b3be73b
@@ -20,6 +20,7 @@ SHA1 (patch-src_corelib_thread_qwaitcond
 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 3131d74a547abdcca7594b49b739cc1c0eed68f5
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
+SHA1 (patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm) = 062b9e38ee6223281a6ae851aa5cb8ecae4c7874
 SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 1655b2320b250defcfa406c95e58a1b728c0f2d9
 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 655ca6601ddd1768b92758cfdfd8d1c3514fba94
 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm:1.1
--- /dev/null   Wed Jan 31 14:08:26 2018
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm   Wed Jan 31 14:08:26 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_platformsupport_fontdatabases_mac_qfontengine_coretext.mm,v 1.1 2018/01/31 14:08:26 adam Exp $
+
+Fix compilation error.
+
+--- src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm.orig 2018-01-31 12:52:17.000000000 +0000
++++ src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+@@ -830,7 +830,7 @@ void QCoreTextFontEngine::getUnscaledGly
+ 
+ QFixed QCoreTextFontEngine::emSquareSize() const
+ {
+-    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
++    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+ }
+ 
+ QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const