CVS commit: pkgsrc/x11/qt4-libs

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Dec  1 13:28:09 UTC 2019

Modified Files:
        pkgsrc/x11/qt4-libs: distinfo
Added Files:
        pkgsrc/x11/qt4-libs/patches:
            patch-src_gui_text_qfontengine__coretext.mm

Log Message:
qt4-libs: fix building on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/x11/qt4-libs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt4-libs/patches/patch-src_gui_text_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/qt4-libs/distinfo
diff -u pkgsrc/x11/qt4-libs/distinfo:1.116 pkgsrc/x11/qt4-libs/distinfo:1.117
--- pkgsrc/x11/qt4-libs/distinfo:1.116  Mon Oct 28 19:37:41 2019
+++ pkgsrc/x11/qt4-libs/distinfo        Sun Dec  1 13:28:09 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.116 2019/10/28 19:37:41 maya Exp $
+$NetBSD: distinfo,v 1.117 2019/12/01 13:28:09 adam Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -78,6 +78,7 @@ SHA1 (patch-src_corelib_io_io.pri) = cde
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
 SHA1 (patch-src_corelib_thread_qthread__unix.cpp) = 67fbdc29d6da0aa7309a7aeb653a5abf10bd4d78
 SHA1 (patch-src_gui_painting_qpaintengine__mac.cpp) = dc44116d5d138020e5d525ec5b7fd0f1b44ebeca
+SHA1 (patch-src_gui_text_qfontengine__coretext.mm) = bf9b280a00ca062c60b311e6bbe57592b2b1dec5
 SHA1 (patch-src_network_ssl_qsslcertificate.cpp) = 92d6a3cd5deacd75ada210bed56f4d4ba749d2ba
 SHA1 (patch-src_network_ssl_qsslkey.cpp) = f17f52ba3aa37c9b2211dfcf1c7c2c12aa5d6473
 SHA1 (patch-src_network_ssl_qsslsocket__openssl.cpp) = 145fb594ba1e5153b0811ff37eb2a4bb1c41b4ba

Added files:

Index: pkgsrc/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm:1.1
--- /dev/null   Sun Dec  1 13:28:09 2019
+++ pkgsrc/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm     Sun Dec  1 13:28:09 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gui_text_qfontengine__coretext.mm,v 1.1 2019/12/01 13:28:09 adam Exp $
+
+Fix compiler error.
+
+--- src/gui/text/qfontengine_coretext.mm.orig  2019-12-01 12:38:26.000000000 +0000
++++ src/gui/text/qfontengine_coretext.mm
+@@ -886,7 +886,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