Tue Dec 24 06:20:42 2019 UTC ()
x11/qt5-qtbase: fix compile macosx < 10.13

define kIOSurfaceSuccess if it's not already defined


(dbj)
diff -r1.54 -r1.55 pkgsrc/x11/qt5-qtbase/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm
cvs diff -r1.54 -r1.55 pkgsrc/x11/qt5-qtbase/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2019/11/05 14:58:43 1.54
+++ pkgsrc/x11/qt5-qtbase/distinfo 2019/12/24 06:20:41 1.55
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1$NetBSD: distinfo,v 1.54 2019/11/05 14:58:43 adam Exp $ 1$NetBSD: distinfo,v 1.55 2019/12/24 06:20:41 dbj Exp $
2 2
3SHA1 (qtbase-everywhere-src-5.13.2.tar.xz) = 3e073387a08599641a154de758f729d47db8986f 3SHA1 (qtbase-everywhere-src-5.13.2.tar.xz) = 3e073387a08599641a154de758f729d47db8986f
4RMD160 (qtbase-everywhere-src-5.13.2.tar.xz) = 94749bf68e78cf3e3fa84a8df73910b501869293 4RMD160 (qtbase-everywhere-src-5.13.2.tar.xz) = 94749bf68e78cf3e3fa84a8df73910b501869293
5SHA512 (qtbase-everywhere-src-5.13.2.tar.xz) = b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 5SHA512 (qtbase-everywhere-src-5.13.2.tar.xz) = b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
6Size (qtbase-everywhere-src-5.13.2.tar.xz) = 48735704 bytes 6Size (qtbase-everywhere-src-5.13.2.tar.xz) = 48735704 bytes
7SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b 7SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
8SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26 8SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
9SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515 9SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
10SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f 10SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f
11SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d 11SHA1 (patch-qmake_generators_makefile.cpp) = 1bca636dc88f258876df54bd0c6c64114fa7411d
12SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 3f2a6a11dacbf7959e5ec032cb4b6ef31b874fb7 12SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 3f2a6a11dacbf7959e5ec032cb4b6ef31b874fb7
13SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0 13SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
14SHA1 (patch-src_corelib_configure.json) = b0865730d33f11e047d3016832e6b56cf5f54add 14SHA1 (patch-src_corelib_configure.json) = b0865730d33f11e047d3016832e6b56cf5f54add
15SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = c52c811a44d965cf9d420749ffe999673c388a68 15SHA1 (patch-src_corelib_global_qconfig-bootstrapped.h) = c52c811a44d965cf9d420749ffe999673c388a68
16SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc 16SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
17SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9 17SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
18SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073 18SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
19SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec 19SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
20SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd 20SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
21SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5 21SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
22SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f 22SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
23SHA1 (patch-src_platformsupport_platformsupport.pro) = 201276e8e990b1c7668a8852ef0390c8a662f618 23SHA1 (patch-src_platformsupport_platformsupport.pro) = 201276e8e990b1c7668a8852ef0390c8a662f618
 24SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
24SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be 25SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
25SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = 965338ca06d930a1e2261ea6312592607521e66c 26SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = 965338ca06d930a1e2261ea6312592607521e66c
26SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb 27SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
27SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1 28SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
28SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3 29SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 1dbb08e5ec6715cbe239efdfb45389959b179ea3
29SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1 30SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
File Added: pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm
$NetBSD: patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm,v 1.1 2019/12/24 06:20:42 dbj Exp $

Fix Darwin build on builds before macosx 10.13

--- src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm.orig	2019-06-13 04:18:18.000000000 +0000
+++ src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
@@ -45,6 +45,12 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <IOSurface/IOSurface.h>
 
+// kIOReturnSuccess is only available on 10.13 and above
+// however, IOSurfaceLock has been around longer
+#ifndef kIOSurfaceSuccess
+#define kIOSurfaceSuccess kIOReturnSuccess
+#endif
+
 // CGColorSpaceCopyPropertyList is available on 10.12 and above,
 // but was only added in the 10.14 SDK, so declare it just in case.
 extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);