Sun Mar 8 01:28:14 2020 UTC ()
modular-xorg-xquartz: build fix for catalina


(tnn)
diff -r1.11 -r1.12 pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/modular-xorg-xquartz/distinfo
diff -r0 -r1.1 pkgsrc/x11/modular-xorg-xquartz/patches/patch-hw_xquartz_X11Application.m
cvs diff -r1.11 -r1.12 pkgsrc/x11/modular-xorg-xquartz/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xquartz/Makefile 2019/11/25 22:32:52 1.11
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile 2020/03/08 01:28:14 1.12
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.11 2019/11/25 22:32:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2020/03/08 01:28:14 tnn Exp $
2 2
3DISTNAME= xorg-server-1.17.2 3DISTNAME= xorg-server-1.17.2
4PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/} 4PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= https://www.x.org/releases/individual/xserver/ 7MASTER_SITES= https://www.x.org/releases/individual/xserver/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.x.org/releases/individual/xserver/ 11HOMEPAGE= https://www.x.org/releases/individual/xserver/
12COMMENT= X11 server for Mac OS X 12COMMENT= X11 server for Mac OS X
13LICENSE= mit 13LICENSE= mit
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
18USE_LANGUAGES= c c++ objc 18USE_LANGUAGES= c c++ objc
cvs diff -r1.2 -r1.3 pkgsrc/x11/modular-xorg-xquartz/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/modular-xorg-xquartz/distinfo 2015/11/04 03:28:49 1.2
+++ pkgsrc/x11/modular-xorg-xquartz/distinfo 2020/03/08 01:28:14 1.3
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: distinfo,v 1.2 2015/11/04 03:28:49 agc Exp $ 1$NetBSD: distinfo,v 1.3 2020/03/08 01:28:14 tnn Exp $
2 2
3SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262 3SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
4RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2 4RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
5SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 5SHA512 (xorg-server-1.17.2.tar.bz2) = 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551
6Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes 6Size (xorg-server-1.17.2.tar.bz2) = 5767983 bytes
7SHA1 (patch-fb_fb.h) = 82099b0982da0d9d64e3ae8f03393ec0df22f916 7SHA1 (patch-fb_fb.h) = 82099b0982da0d9d64e3ae8f03393ec0df22f916
8SHA1 (patch-fb_fbpict.c) = 101645f653665c917c0f899b0eb771e7ff1280c4 8SHA1 (patch-fb_fbpict.c) = 101645f653665c917c0f899b0eb771e7ff1280c4
9SHA1 (patch-fb_fbpict.h) = 686d6634e0cee9b56660787b616435c8134f8c61 9SHA1 (patch-fb_fbpict.h) = 686d6634e0cee9b56660787b616435c8134f8c61
10SHA1 (patch-fb_fbscreen.c) = 6bc92e7002f215430e8647337d596bfe99d3d63a 10SHA1 (patch-fb_fbscreen.c) = 6bc92e7002f215430e8647337d596bfe99d3d63a
11SHA1 (patch-fb_fbtrap.c) = 60e74d8d6f86dfb24491b17170e02a6040ad9abb 11SHA1 (patch-fb_fbtrap.c) = 60e74d8d6f86dfb24491b17170e02a6040ad9abb
12SHA1 (patch-hw_xfree86_Makefile.am) = 0388fa2a2cb08194def579c014848eaf66f02b24 12SHA1 (patch-hw_xfree86_Makefile.am) = 0388fa2a2cb08194def579c014848eaf66f02b24
13SHA1 (patch-hw_xquartz_GL_indirect.c) = f915ce2f6043c21cbaf6a656b7339776156b609e 13SHA1 (patch-hw_xquartz_GL_indirect.c) = f915ce2f6043c21cbaf6a656b7339776156b609e
 14SHA1 (patch-hw_xquartz_X11Application.m) = b97759b8e81b582dcf3600a1c3a0b387d2ae24f8
14SHA1 (patch-hw_xquartz_X11Controller.m) = d25fb8915d6ee9b1214a346d3042b47a43ee46f8 15SHA1 (patch-hw_xquartz_X11Controller.m) = d25fb8915d6ee9b1214a346d3042b47a43ee46f8
15SHA1 (patch-hw_xquartz_pbproxy_Makefile.in) = a877cf56033544b46169757c1ceda5f17fe7a224 16SHA1 (patch-hw_xquartz_pbproxy_Makefile.in) = a877cf56033544b46169757c1ceda5f17fe7a224
16SHA1 (patch-mi_miexpose.c) = e53cbee2330300ef016aae5a5ee9fe8a65efc46b 17SHA1 (patch-mi_miexpose.c) = e53cbee2330300ef016aae5a5ee9fe8a65efc46b
17SHA1 (patch-render_mipict.c) = fa9058f76d69d9227c41f16094a9ee9926214337 18SHA1 (patch-render_mipict.c) = fa9058f76d69d9227c41f16094a9ee9926214337
18SHA1 (patch-render_mipict.h) = 11ee673c750ce7860670110ce792ad9f0094d4ad 19SHA1 (patch-render_mipict.h) = 11ee673c750ce7860670110ce792ad9f0094d4ad
19SHA1 (patch-render_mitrap.c) = d31fdb56b129b4d5c131dd8caaac41cc37df9f99 20SHA1 (patch-render_mitrap.c) = d31fdb56b129b4d5c131dd8caaac41cc37df9f99
20SHA1 (patch-render_mitri.c) = dfb0061cb39bfadea0ac32f77f03e988f958d14c 21SHA1 (patch-render_mitri.c) = dfb0061cb39bfadea0ac32f77f03e988f958d14c
File Added: pkgsrc/x11/modular-xorg-xquartz/patches/Attic/patch-hw_xquartz_X11Application.m
$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];