CVS commit: pkgsrc/devel/gnustep-base

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Sun May 12 00:22:02 UTC 2024

Modified Files:
        pkgsrc/devel/gnustep-base: Makefile distinfo
Added Files:
        pkgsrc/devel/gnustep-base/patches: patch-Source_Additions_GSXML.m

Log Message:
Fix build with with libxml2>=2.11.0


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/devel/gnustep-base/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/gnustep-base/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gnustep-base/patches/patch-Source_Additions_GSXML.m

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

Modified files:

Index: pkgsrc/devel/gnustep-base/Makefile
diff -u pkgsrc/devel/gnustep-base/Makefile:1.108 pkgsrc/devel/gnustep-base/Makefile:1.109
--- pkgsrc/devel/gnustep-base/Makefile:1.108    Wed Nov  8 13:18:44 2023
+++ pkgsrc/devel/gnustep-base/Makefile  Sun May 12 00:22:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2023/11/08 13:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2024/05/12 00:22:02 manu Exp $
 
 DISTNAME=      gnustep-base-1.29.0
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnustep/}
@@ -6,7 +6,7 @@ GITHUB_PROJECT= libs-base
 GITHUB_TAG=    base-1_29_0
 WRKSRC=                ${WRKDIR}/libs-base-base-1_29_0
 
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel gnustep
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/devel/gnustep-base/distinfo
diff -u pkgsrc/devel/gnustep-base/distinfo:1.39 pkgsrc/devel/gnustep-base/distinfo:1.40
--- pkgsrc/devel/gnustep-base/distinfo:1.39     Sat Jan 14 01:40:03 2023
+++ pkgsrc/devel/gnustep-base/distinfo  Sun May 12 00:22:02 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.39 2023/01/14 01:40:03 manu Exp $
+$NetBSD: distinfo,v 1.40 2024/05/12 00:22:02 manu Exp $
 
 BLAKE2s (gnustep-base-1.29.0.tar.gz) = 2d1d7a4e64a417bc8b224068f741ccf29439ef69ab36fca90a5934c075c87cda
 SHA512 (gnustep-base-1.29.0.tar.gz) = a3ecbabf09c232acee964b59894f59d42a2ab63f7396c3560d10ad64363ceb455af91f9d40aa386e60f1d9671c436960b70e828e7055005c11f4c02372a4fc0b
 Size (gnustep-base-1.29.0.tar.gz) = 3698001 bytes
+SHA1 (patch-Source_Additions_GSXML.m) = ad3be89d60bb08dcc9b31b8cb8c5e489ecf88a02
 SHA1 (patch-Source_NSProcessInfo.m) = 398c03b9b4a6a97bcd0c13215d444cc4a94ecb19
 SHA1 (patch-Source_common.h) = ed8a68a023b01b1562793678b7ddbd641e3a40d8
 SHA1 (patch-aa) = 5b2b61058fcc8f4c8073598d61cccb3c23429a7c

Added files:

Index: pkgsrc/devel/gnustep-base/patches/patch-Source_Additions_GSXML.m
diff -u /dev/null pkgsrc/devel/gnustep-base/patches/patch-Source_Additions_GSXML.m:1.1
--- /dev/null   Sun May 12 00:22:02 2024
+++ pkgsrc/devel/gnustep-base/patches/patch-Source_Additions_GSXML.m    Sun May 12 00:22:02 2024
@@ -0,0 +1,24 @@
+$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;