summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2019-12-01 13:28:09 +0000
committeradam <adam@pkgsrc.org>2019-12-01 13:28:09 +0000
commitf06d5dfe8b1545500ccf879e895e50ef2ff6034f (patch)
tree1a3ff35145c66b4e01b920472f3559e190284644 /x11
parent0b2b399051dce9c156dcc499cd36118f1f76c79b (diff)
downloadpkgsrc-f06d5dfe8b1545500ccf879e895e50ef2ff6034f.tar.gz
qt4-libs: fix building on Darwin
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/distinfo3
-rw-r--r--x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm15
2 files changed, 17 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 52cc51a3008..98d2bc43c47 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -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) = cde98927b524c92fae1e053c2359e77bde2c240a
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 --git a/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm b/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm
new file mode 100644
index 00000000000..229d7e82d01
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_gui_text_qfontengine__coretext.mm
@@ -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