Fix build with with libxml2>=2.11.0diff -r1.108 -r1.109 pkgsrc/devel/gnustep-base/Makefile
(manu)
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | # $NetBSD: Makefile,v 1.108 2023/11/08 13:18:44 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.109 2024/05/12 00:22:02 manu Exp $ | |
2 | 2 | |||
3 | DISTNAME= gnustep-base-1.29.0 | 3 | DISTNAME= gnustep-base-1.29.0 | |
4 | MASTER_SITES= ${MASTER_SITE_GITHUB:=gnustep/} | 4 | MASTER_SITES= ${MASTER_SITE_GITHUB:=gnustep/} | |
5 | GITHUB_PROJECT= libs-base | 5 | GITHUB_PROJECT= libs-base | |
6 | GITHUB_TAG= base-1_29_0 | 6 | GITHUB_TAG= base-1_29_0 | |
7 | WRKSRC= ${WRKDIR}/libs-base-base-1_29_0 | 7 | WRKSRC= ${WRKDIR}/libs-base-base-1_29_0 | |
8 | 8 | |||
9 | PKGREVISION= 3 | 9 | PKGREVISION= 4 | |
10 | CATEGORIES= devel gnustep | 10 | CATEGORIES= devel gnustep | |
11 | 11 | |||
12 | MAINTAINER= pkgsrc-users@NetBSD.org | 12 | MAINTAINER= pkgsrc-users@NetBSD.org | |
13 | HOMEPAGE= http://www.gnustep.org/ | 13 | HOMEPAGE= http://www.gnustep.org/ | |
14 | COMMENT= GNUstep foundation classes | 14 | COMMENT= GNUstep foundation classes | |
15 | LICENSE= gnu-gpl-v3 | 15 | LICENSE= gnu-gpl-v3 | |
16 | 16 | |||
17 | USE_TOOLS+= pkg-config | 17 | USE_TOOLS+= pkg-config | |
18 | USE_LANGUAGES= objc | 18 | USE_LANGUAGES= objc | |
19 | GNU_CONFIGURE= yes | 19 | GNU_CONFIGURE= yes | |
20 | CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep | 20 | CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep | |
21 | CONFIGURE_ARGS+= --with-installation-domain=SYSTEM | 21 | CONFIGURE_ARGS+= --with-installation-domain=SYSTEM | |
22 | # Allow building with NetBSD libiconv that does not support //TRANSLIT | 22 | # Allow building with NetBSD libiconv that does not support //TRANSLIT |
@@ -1,12 +1,13 @@ | @@ -1,12 +1,13 @@ | |||
1 | $NetBSD: distinfo,v 1.39 2023/01/14 01:40:03 manu Exp $ | 1 | $NetBSD: distinfo,v 1.40 2024/05/12 00:22:02 manu Exp $ | |
2 | 2 | |||
3 | BLAKE2s (gnustep-base-1.29.0.tar.gz) = 2d1d7a4e64a417bc8b224068f741ccf29439ef69ab36fca90a5934c075c87cda | 3 | BLAKE2s (gnustep-base-1.29.0.tar.gz) = 2d1d7a4e64a417bc8b224068f741ccf29439ef69ab36fca90a5934c075c87cda | |
4 | SHA512 (gnustep-base-1.29.0.tar.gz) = a3ecbabf09c232acee964b59894f59d42a2ab63f7396c3560d10ad64363ceb455af91f9d40aa386e60f1d9671c436960b70e828e7055005c11f4c02372a4fc0b | 4 | SHA512 (gnustep-base-1.29.0.tar.gz) = a3ecbabf09c232acee964b59894f59d42a2ab63f7396c3560d10ad64363ceb455af91f9d40aa386e60f1d9671c436960b70e828e7055005c11f4c02372a4fc0b | |
5 | Size (gnustep-base-1.29.0.tar.gz) = 3698001 bytes | 5 | Size (gnustep-base-1.29.0.tar.gz) = 3698001 bytes | |
6 | SHA1 (patch-Source_Additions_GSXML.m) = ad3be89d60bb08dcc9b31b8cb8c5e489ecf88a02 | |||
6 | SHA1 (patch-Source_NSProcessInfo.m) = 398c03b9b4a6a97bcd0c13215d444cc4a94ecb19 | 7 | SHA1 (patch-Source_NSProcessInfo.m) = 398c03b9b4a6a97bcd0c13215d444cc4a94ecb19 | |
7 | SHA1 (patch-Source_common.h) = ed8a68a023b01b1562793678b7ddbd641e3a40d8 | 8 | SHA1 (patch-Source_common.h) = ed8a68a023b01b1562793678b7ddbd641e3a40d8 | |
8 | SHA1 (patch-aa) = 5b2b61058fcc8f4c8073598d61cccb3c23429a7c | 9 | SHA1 (patch-aa) = 5b2b61058fcc8f4c8073598d61cccb3c23429a7c | |
9 | SHA1 (patch-ab) = 1eb9746ae2cb8ba9c02d6131c4d797b210318851 | 10 | SHA1 (patch-ab) = 1eb9746ae2cb8ba9c02d6131c4d797b210318851 | |
10 | SHA1 (patch-ac) = 4e8e209ad202385948d0f4b0d29e5e61e01da410 | 11 | SHA1 (patch-ac) = 4e8e209ad202385948d0f4b0d29e5e61e01da410 | |
11 | SHA1 (patch-ad) = 16442b907021c0e490ed6f2072887d7849b5df40 | 12 | SHA1 (patch-ad) = 16442b907021c0e490ed6f2072887d7849b5df40 | |
12 | SHA1 (patch-configure) = b7147653d65719c799a86bd1252207c4bf00168b | 13 | SHA1 (patch-configure) = b7147653d65719c799a86bd1252207c4bf00168b |
$NetBSD: patch-Source_Additions_GSXML.m,v 1.1 2024/05/12 00:22:02 manu Exp $
Fix GSXML compatibility with libxml2 v2.11.0
From upstream
https://github.com/gnustep/libs-base/pull/295/files/9bd745c6b69159cd25150f8297e8aa6c33e2a69f
--- Source/Additions/GSXML.m.orig 2024-05-11 22:55:36.594575380 +0200
+++ Source/Additions/GSXML.m 2024-05-11 22:55:57.348514948 +0200
@@ -2670,12 +2670,14 @@
ctxt->validate = 0;
return NULL;
}
ret->owner = 1;
+#if LIBXML_VERSION < 21100
if (ret->checked == 0)
{
ret->checked = 1;
}
+#endif
}
}
}
return ret;