Thu May 25 11:53:09 2023 UTC ()
libXt: Do not use _Static_assert in C++ code.
Fixes lots of dependencies. Bump PKGREVISION.
(jperkin)
diff -r1.32 -r1.33 pkgsrc/x11/libXt/Makefile
diff -r1.19 -r1.20 pkgsrc/x11/libXt/distinfo
diff -r0 -r1.1 pkgsrc/x11/libXt/patches/patch-include_X11_Intrinsic.h
diff -r0 -r1.1 pkgsrc/x11/libXt/patches/patch-include_X11_IntrinsicP.h
--- pkgsrc/x11/libXt/Makefile 2023/04/09 21:44:13 1.32
+++ pkgsrc/x11/libXt/Makefile 2023/05/25 11:53:08 1.33
| @@ -1,16 +1,17 @@ | | | @@ -1,16 +1,17 @@ |
| 1 | # $NetBSD: Makefile,v 1.32 2023/04/09 21:44:13 wiz Exp $ | | 1 | # $NetBSD: Makefile,v 1.33 2023/05/25 11:53:08 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | DISTNAME= libXt-1.3.0 | | 3 | DISTNAME= libXt-1.3.0 |
| | | 4 | PKGREVISION= 1 |
| 4 | CATEGORIES= x11 devel | | 5 | CATEGORIES= x11 devel |
| 5 | MASTER_SITES= ${MASTER_SITE_XORG:=lib/} | | 6 | MASTER_SITES= ${MASTER_SITE_XORG:=lib/} |
| 6 | EXTRACT_SUFX= .tar.xz | | 7 | EXTRACT_SUFX= .tar.xz |
| 7 | | | 8 | |
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | | 9 | MAINTAINER= pkgsrc-users@NetBSD.org |
| 9 | HOMEPAGE= https://xorg.freedesktop.org/ | | 10 | HOMEPAGE= https://xorg.freedesktop.org/ |
| 10 | COMMENT= X Toolkit Intrinsics library | | 11 | COMMENT= X Toolkit Intrinsics library |
| 11 | LICENSE= mit | | 12 | LICENSE= mit |
| 12 | | | 13 | |
| 13 | GNU_CONFIGURE= yes | | 14 | GNU_CONFIGURE= yes |
| 14 | USE_LIBTOOL= yes | | 15 | USE_LIBTOOL= yes |
| 15 | USE_TOOLS+= pkg-config | | 16 | USE_TOOLS+= pkg-config |
| 16 | | | 17 | |
--- pkgsrc/x11/libXt/distinfo 2023/04/09 21:44:13 1.19
+++ pkgsrc/x11/libXt/distinfo 2023/05/25 11:53:08 1.20
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.19 2023/04/09 21:44:13 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.20 2023/05/25 11:53:08 jperkin Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (libXt-1.3.0.tar.xz) = 3dd6663db4604ca68ef8037fc34cc07ca459fa1f9dd35137e239a437c0052207 | | 3 | BLAKE2s (libXt-1.3.0.tar.xz) = 3dd6663db4604ca68ef8037fc34cc07ca459fa1f9dd35137e239a437c0052207 |
| 4 | SHA512 (libXt-1.3.0.tar.xz) = 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 | | 4 | SHA512 (libXt-1.3.0.tar.xz) = 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 |
| 5 | Size (libXt-1.3.0.tar.xz) = 688084 bytes | | 5 | Size (libXt-1.3.0.tar.xz) = 688084 bytes |
| | | 6 | SHA1 (patch-include_X11_Intrinsic.h) = 01869bd973ce6622bdb76435545c86f10ca7f833 |
| | | 7 | SHA1 (patch-include_X11_IntrinsicP.h) = c497933ce621ab6fc3e648c2aed46ec19f82a9b9 |
| 6 | SHA1 (patch-util_Makefile.in) = 388bc6eeed85f30f13daa93d9efc48b31ef1b76d | | 8 | SHA1 (patch-util_Makefile.in) = 388bc6eeed85f30f13daa93d9efc48b31ef1b76d |
$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
$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");