CVS commit: pkgsrc/x11/modular-xorg-xquartz

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar  8 01:28:14 UTC 2020

Modified Files:
        pkgsrc/x11/modular-xorg-xquartz: Makefile distinfo
Added Files:
        pkgsrc/x11/modular-xorg-xquartz/patches:
            patch-hw_xquartz_X11Application.m

Log Message:
modular-xorg-xquartz: build fix for catalina


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/modular-xorg-xquartz/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/modular-xorg-xquartz/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Application.m

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -u pkgsrc/x11/modular-xorg-xquartz/Makefile:1.11 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.12
--- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.11       Mon Nov 25 22:32:52 2019
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile    Sun Mar  8 01:28:14 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2019/11/25 22:32:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/08 01:28:14 tnn Exp $
 
 DISTNAME=      xorg-server-1.17.2
 PKGNAME=       ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    x11
 MASTER_SITES=  https://www.x.org/releases/individual/xserver/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/modular-xorg-xquartz/distinfo
diff -u pkgsrc/x11/modular-xorg-xquartz/distinfo:1.2 pkgsrc/x11/modular-xorg-xquartz/distinfo:1.3
--- pkgsrc/x11/modular-xorg-xquartz/distinfo:1.2        Wed Nov  4 03:28:49 2015
+++ pkgsrc/x11/modular-xorg-xquartz/distinfo    Sun Mar  8 01:28:14 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 03:28:49 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/03/08 01:28:14 tnn Exp $
 
 SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
 RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
@@ -11,6 +11,7 @@ SHA1 (patch-fb_fbscreen.c) = 6bc92e7002f
 SHA1 (patch-fb_fbtrap.c) = 60e74d8d6f86dfb24491b17170e02a6040ad9abb
 SHA1 (patch-hw_xfree86_Makefile.am) = 0388fa2a2cb08194def579c014848eaf66f02b24
 SHA1 (patch-hw_xquartz_GL_indirect.c) = f915ce2f6043c21cbaf6a656b7339776156b609e
+SHA1 (patch-hw_xquartz_X11Application.m) = b97759b8e81b582dcf3600a1c3a0b387d2ae24f8
 SHA1 (patch-hw_xquartz_X11Controller.m) = d25fb8915d6ee9b1214a346d3042b47a43ee46f8
 SHA1 (patch-hw_xquartz_pbproxy_Makefile.in) = a877cf56033544b46169757c1ceda5f17fe7a224
 SHA1 (patch-mi_miexpose.c) = e53cbee2330300ef016aae5a5ee9fe8a65efc46b

Added files:

Index: pkgsrc/x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Application.m
diff -u /dev/null pkgsrc/x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Application.m:1.1
--- /dev/null   Sun Mar  8 01:28:14 2020
+++ pkgsrc/x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Application.m   Sun Mar  8 01:28:14 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-hw_xquartz_X11Application.m,v 1.1 2020/03/08 01:28:14 tnn Exp $
+
+X11Application.m:404:17: error: use of undeclared identifier '_appFlags'
+
+--- hw/xquartz/X11Application.m.orig   2015-05-21 14:23:54.000000000 +0000
++++ hw/xquartz/X11Application.m
+@@ -401,7 +401,9 @@ message_kit_thread(SEL selector, NSObjec
+                 /* FIXME: This is a hack to avoid passing the event to AppKit which
+                  *        would result in it raising one of its windows.
+                  */
++#if 0
+                 _appFlags._active = YES;
++#endif
+ 
+                 [self set_front_process:nil];
+