CVS commit: pkgsrc/x11/qt5-qtbase

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Mon Nov 13 17:36:11 UTC 2017

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches:
            patch-src_plugins_platforms_cocoa_qcocoahelpers.h
            patch-src_plugins_platforms_cocoa_qcocoahelpers.mm

Log Message:
x11/qt5-qtbase: Apply upstream fix to build with macOS-10.13 SDK

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.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/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.46 pkgsrc/x11/qt5-qtbase/Makefile:1.47
--- pkgsrc/x11/qt5-qtbase/Makefile:1.46 Sun Nov 12 16:03:36 2017
+++ pkgsrc/x11/qt5-qtbase/Makefile      Mon Nov 13 17:36:11 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2017/11/12 16:03:36 khorben Exp $
+# $NetBSD: Makefile,v 1.47 2017/11/13 17:36:11 minskim Exp $
 
 DISTNAME=      qtbase-opensource-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
-PKGREVISION=   15
+PKGREVISION=   16
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.33 pkgsrc/x11/qt5-qtbase/distinfo:1.34
--- pkgsrc/x11/qt5-qtbase/distinfo:1.33 Tue Jul 11 10:52:41 2017
+++ pkgsrc/x11/qt5-qtbase/distinfo      Mon Nov 13 17:36:11 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2017/07/11 10:52:41 wiz Exp $
+$NetBSD: distinfo,v 1.34 2017/11/13 17:36:11 minskim Exp $
 
 SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f
 RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44
@@ -30,6 +30,8 @@ SHA1 (patch-src_platformsupport_devicedi
 SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
 SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
 SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d
+SHA1 (patch-src_plugins_platforms_cocoa_qcocoahelpers.h) = cc62ac13e3a13c259743147a75b5ceec02c36c67
+SHA1 (patch-src_plugins_platforms_cocoa_qcocoahelpers.mm) = 7a98e395ed690db8d0e680b09be00506fd2ddbd2
 SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02
 SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
 SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h:1.1
--- /dev/null   Mon Nov 13 17:36:11 2017
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.h     Mon Nov 13 17:36:11 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_plugins_platforms_cocoa_qcocoahelpers.h,v 1.1 2017/11/13 17:36:11 minskim Exp $
+
+Fix build error with macOS 10.13 SDK
+https://bugreports.qt.io/browse/QTBUG-63401
+
+--- src/plugins/platforms/cocoa/qcocoahelpers.h.orig   2015-10-13 04:35:27.000000000 +0000
++++ src/plugins/platforms/cocoa/qcocoahelpers.h
+@@ -78,7 +78,7 @@ QColor qt_mac_toQColor(CGColorRef color)
+ // Creates a mutable shape, it's the caller's responsibility to release.
+ HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region);
+ 
+-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
++void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
+ 
+ QChar qt_mac_qtKey2CocoaKey(Qt::Key key);
+ Qt::Key qt_mac_cocoaKey2QtKey(QChar keyCode);
Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm:1.1
--- /dev/null   Mon Nov 13 17:36:11 2017
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_plugins_platforms_cocoa_qcocoahelpers.mm    Mon Nov 13 17:36:11 2017
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_plugins_platforms_cocoa_qcocoahelpers.mm,v 1.1 2017/11/13 17:36:11 minskim Exp $
+
+Fix build error with macOS 10.13 SDK
+https://bugreports.qt.io/browse/QTBUG-63401
+
+--- src/plugins/platforms/cocoa/qcocoahelpers.mm.orig  2015-10-13 04:35:27.000000000 +0000
++++ src/plugins/platforms/cocoa/qcocoahelpers.mm
+@@ -668,15 +668,8 @@ NSRect qt_mac_flipRect(const QRect &rect
+     return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height());
+ }
+ 
+-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
++void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
+ {
+-    // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
+-    OSStatus err = noErr;
+-
+-    require_action(inContext != NULL, InvalidContext, err = paramErr);
+-    require_action(inBounds != NULL, InvalidBounds, err = paramErr);
+-    require_action(inImage != NULL, InvalidImage, err = paramErr);
+-
+     CGContextSaveGState( inContext );
+     CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
+     CGContextScaleCTM(inContext, 1, -1);
+@@ -684,10 +677,6 @@ OSStatus qt_mac_drawCGImage(CGContextRef
+     CGContextDrawImage(inContext, *inBounds, inImage);
+ 
+     CGContextRestoreGState(inContext);
+-InvalidImage:
+-InvalidBounds:
+-InvalidContext:
+-        return err;
+ }
+ 
+ Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)