pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt4-libs qt4-libs: fix building on Darwin



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec3cbd4a4b15
branches:  trunk
changeset: 418694:ec3cbd4a4b15
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Dec 01 13:28:09 2019 +0000

description:
qt4-libs: fix building on Darwin

diffstat:

 x11/qt4-libs/distinfo                                            |   3 +-
 x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm |  15 ++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r fc8d18bff7fd -r ec3cbd4a4b15 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Sun Dec 01 12:52:18 2019 +0000
+++ b/x11/qt4-libs/distinfo     Sun Dec 01 13:28:09 2019 +0000
@@ -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_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
diff -r fc8d18bff7fd -r ec3cbd4a4b15 x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm  Sun Dec 01 13:28:09 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index