CVS commit: pkgsrc/wm/quartz-wm

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Dec  9 09:49:31 UTC 2021

Modified Files:
        pkgsrc/wm/quartz-wm: Makefile distinfo
Added Files:
        pkgsrc/wm/quartz-wm/patches: patch-src_quartz-wm.h

Log Message:
Apply upstream patch (via MacPorts) to fix macOS 12 build.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/wm/quartz-wm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/quartz-wm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/quartz-wm/patches/patch-src_quartz-wm.h

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

Modified files:

Index: pkgsrc/wm/quartz-wm/Makefile
diff -u pkgsrc/wm/quartz-wm/Makefile:1.3 pkgsrc/wm/quartz-wm/Makefile:1.4
--- pkgsrc/wm/quartz-wm/Makefile:1.3    Thu Dec 31 09:51:56 2020
+++ pkgsrc/wm/quartz-wm/Makefile        Thu Dec  9 09:49:30 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/12/31 09:51:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2021/12/09 09:49:30 schmonz Exp $
 
 DISTNAME=      quartz-wm-1.3.1
 PKGREVISION=   2
@@ -7,7 +7,7 @@ MASTER_SITES=   http://xquartz.macosforge.
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://xquartz.macosforge.org/downloads/src/
+HOMEPAGE=      https://gitlab.freedesktop.org/xorg/app/quartz-wm
 COMMENT=       Aqua Window Manager for the X Window System on OS X
 LICENSE=       apple-public-source-license
 

Index: pkgsrc/wm/quartz-wm/distinfo
diff -u pkgsrc/wm/quartz-wm/distinfo:1.4 pkgsrc/wm/quartz-wm/distinfo:1.5
--- pkgsrc/wm/quartz-wm/distinfo:1.4    Tue Oct 26 11:25:17 2021
+++ pkgsrc/wm/quartz-wm/distinfo        Thu Dec  9 09:49:30 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:25:17 nia Exp $
+$NetBSD: distinfo,v 1.5 2021/12/09 09:49:30 schmonz Exp $
 
 BLAKE2s (quartz-wm-1.3.1.tar.xz) = 01e35b48488bbd482dce65d8356566cdbaf72b6c736a39ea9f31852ab0ed2e49
 SHA512 (quartz-wm-1.3.1.tar.xz) = 5a76a32e0efafc5777dbc9b3e5baf73a9cf6addb2aed9822244f6987f830d9064f3d917abe4f25218b6bd2390027005a90cc83e729c9b6663aaef2c1b896420c
 Size (quartz-wm-1.3.1.tar.xz) = 166928 bytes
+SHA1 (patch-src_quartz-wm.h) = 0a1f723154477e8652535dfa5f7fdc4f7161f5ac

Added files:

Index: pkgsrc/wm/quartz-wm/patches/patch-src_quartz-wm.h
diff -u /dev/null pkgsrc/wm/quartz-wm/patches/patch-src_quartz-wm.h:1.1
--- /dev/null   Thu Dec  9 09:49:31 2021
+++ pkgsrc/wm/quartz-wm/patches/patch-src_quartz-wm.h   Thu Dec  9 09:49:30 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_quartz-wm.h,v 1.1 2021/12/09 09:49:30 schmonz Exp $
+
+Apply upstream patch to fix macOS 12 build.
+Upstream: https://trac.macports.org/ticket/63355
+
+--- src/quartz-wm.h.orig       2012-04-29 00:27:13.000000000 +0000
++++ src/quartz-wm.h
+@@ -30,6 +30,7 @@
+ #define Cursor OSX_Cursor
+ #define Picture OSX_Picture
+ #import  <Foundation/Foundation.h>
++#include <ApplicationServices/ApplicationServices.h>
+ #undef Picture
+ #undef Cursor
+