CVS commit: pkgsrc/x11/qt5-qtbase

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Tue Dec 24 06:20:42 UTC 2019

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

Log Message:
x11/qt5-qtbase: fix compile macosx < 10.13

define kIOSurfaceSuccess if it's not already defined


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.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.54 pkgsrc/x11/qt5-qtbase/distinfo:1.55
--- pkgsrc/x11/qt5-qtbase/distinfo:1.54 Tue Nov  5 14:58:43 2019
+++ pkgsrc/x11/qt5-qtbase/distinfo      Tue Dec 24 06:20:41 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2019/11/05 14:58:43 adam Exp $
+$NetBSD: distinfo,v 1.55 2019/12/24 06:20:41 dbj Exp $
 
 SHA1 (qtbase-everywhere-src-5.13.2.tar.xz) = 3e073387a08599641a154de758f729d47db8986f
 RMD160 (qtbase-everywhere-src-5.13.2.tar.xz) = 94749bf68e78cf3e3fa84a8df73910b501869293
@@ -21,6 +21,7 @@ SHA1 (patch-src_corelib_thread_qwaitcond
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
 SHA1 (patch-src_platformsupport_platformsupport.pro) = 201276e8e990b1c7668a8852ef0390c8a662f618
+SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be
 SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection__basic.h) = 965338ca06d930a1e2261ea6312592607521e66c
 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm:1.1
--- /dev/null   Tue Dec 24 06:20:42 2019
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm Tue Dec 24 06:20:42 2019
@@ -0,0 +1,19 @@
+$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);