CVS commit: pkgsrc/x11/libXt

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May 25 11:53:09 UTC 2023

Modified Files:
        pkgsrc/x11/libXt: Makefile distinfo
Added Files:
        pkgsrc/x11/libXt/patches: patch-include_X11_Intrinsic.h
            patch-include_X11_IntrinsicP.h

Log Message:
libXt: Do not use _Static_assert in C++ code.

Fixes lots of dependencies.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/libXt/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libXt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/libXt/patches/patch-include_X11_Intrinsic.h \
    pkgsrc/x11/libXt/patches/patch-include_X11_IntrinsicP.h

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

Modified files:

Index: pkgsrc/x11/libXt/Makefile
diff -u pkgsrc/x11/libXt/Makefile:1.32 pkgsrc/x11/libXt/Makefile:1.33
--- pkgsrc/x11/libXt/Makefile:1.32      Sun Apr  9 21:44:13 2023
+++ pkgsrc/x11/libXt/Makefile   Thu May 25 11:53:08 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2023/04/09 21:44:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2023/05/25 11:53:08 jperkin Exp $
 
 DISTNAME=              libXt-1.3.0
+PKGREVISION=           1
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/x11/libXt/distinfo
diff -u pkgsrc/x11/libXt/distinfo:1.19 pkgsrc/x11/libXt/distinfo:1.20
--- pkgsrc/x11/libXt/distinfo:1.19      Sun Apr  9 21:44:13 2023
+++ pkgsrc/x11/libXt/distinfo   Thu May 25 11:53:08 2023
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.19 2023/04/09 21:44:13 wiz Exp $
+$NetBSD: distinfo,v 1.20 2023/05/25 11:53:08 jperkin Exp $
 
 BLAKE2s (libXt-1.3.0.tar.xz) = 3dd6663db4604ca68ef8037fc34cc07ca459fa1f9dd35137e239a437c0052207
 SHA512 (libXt-1.3.0.tar.xz) = 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118
 Size (libXt-1.3.0.tar.xz) = 688084 bytes
+SHA1 (patch-include_X11_Intrinsic.h) = 01869bd973ce6622bdb76435545c86f10ca7f833
+SHA1 (patch-include_X11_IntrinsicP.h) = c497933ce621ab6fc3e648c2aed46ec19f82a9b9
 SHA1 (patch-util_Makefile.in) = 388bc6eeed85f30f13daa93d9efc48b31ef1b76d

Added files:

Index: pkgsrc/x11/libXt/patches/patch-include_X11_Intrinsic.h
diff -u /dev/null pkgsrc/x11/libXt/patches/patch-include_X11_Intrinsic.h:1.1
--- /dev/null   Thu May 25 11:53:09 2023
+++ pkgsrc/x11/libXt/patches/patch-include_X11_Intrinsic.h      Thu May 25 11:53:09 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_X11_Intrinsic.h,v 1.1 2023/05/25 11:53:09 jperkin Exp $
+
+Do not use _Static_assert in C++ code.
+
+--- include/X11/Intrinsic.h.orig       2023-04-09 20:48:48.000000000 +0000
++++ include/X11/Intrinsic.h
+@@ -174,7 +174,7 @@ typedef unsigned short     Dimension;  /* Si
+ typedef short         Position;   /* Offset from 0 coordinate         */
+ 
+ typedef void*         XtPointer;
+-#if __STDC_VERSION__ >= 201112L
++#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+ _Static_assert(sizeof(XtArgVal) >= sizeof(XtPointer), "XtArgVal too small");
+ _Static_assert(sizeof(XtArgVal) >= sizeof(long), "XtArgVal too small");
+ #endif
Index: pkgsrc/x11/libXt/patches/patch-include_X11_IntrinsicP.h
diff -u /dev/null pkgsrc/x11/libXt/patches/patch-include_X11_IntrinsicP.h:1.1
--- /dev/null   Thu May 25 11:53:09 2023
+++ pkgsrc/x11/libXt/patches/patch-include_X11_IntrinsicP.h     Thu May 25 11:53:09 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_X11_IntrinsicP.h,v 1.1 2023/05/25 11:53:09 jperkin Exp $
+
+Do not use _Static_assert in C++ code.
+
+--- include/X11/IntrinsicP.h.orig      2023-04-09 20:48:48.000000000 +0000
++++ include/X11/IntrinsicP.h
+@@ -64,7 +64,7 @@ typedef struct {
+     XtIntPtr  xrm_default_type; /* Default representation type quark  */
+     XtPointer xrm_default_addr; /* Default resource address           */
+ } XrmResource, *XrmResourceList;
+-#if __STDC_VERSION__ >= 201112L
++#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+ _Static_assert(XtOffsetOf(XrmResource, xrm_default_addr) ==
+                    XtOffsetOf(XtResource, default_addr),
+                "Field offset mismatch");