Received: by mail.netbsd.org (Postfix, from userid 605) id 9DB1684D68; Sat, 10 Feb 2024 10:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1707561705; bh=q7AVvsdkZ1gUjZp171a4rNpWBvg64gylnkk1csezofU=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=FiYg9lQy/G86VscXhjouDKCpXUp7b/LBq5wFArNQDzEGqS1jv1b8oRYGn/XIYwezH D/i/WWoabgdn8tTZ7XHQ7dtgqPzLFkvjjPZb1gWwvzvEdRTboBTy99+tBCpIXJoQ+0 7Cmxas3xYt/gdrQ+EusD8jLcriNXJF3rniv/CGTA= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8CDF784CFA for ; Sat, 10 Feb 2024 10:41:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id LsBRBdFDfLBI for ; Sat, 10 Feb 2024 10:41:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D762084CD8 for ; Sat, 10 Feb 2024 10:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1707561703; bh=q7AVvsdkZ1gUjZp171a4rNpWBvg64gylnkk1csezofU=; h=Date:From:Subject:To:Reply-To; b=c/OsfNDhRL0iMIHvGUlqgcXJjLuYLV7utmY/11s2byIw+j58GxQobZdPmUcMfBdje qyOhVoxMFtfS9QuRDkBtaEuwyfphHzE3EvjfeN8ae0dpHnVdCz7poeL6CxYiya9T8T nqDvp1ganaVCZ4EGoI11/5IFpgdeAjNwTAyDvMOk= Received: by cvs.NetBSD.org (Postfix, from userid 500) id CE1C1FA42; Sat, 10 Feb 2024 10:41:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170756170368970" MIME-Version: 1.0 Date: Sat, 10 Feb 2024 10:41:43 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/audio/ardour To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20240210104143.CE1C1FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_170756170368970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Feb 10 10:41:43 UTC 2024 Modified Files: pkgsrc/audio/ardour: distinfo Added Files: pkgsrc/audio/ardour/patches: patch-gtk2__ardour_ardour__ui.cc patch-libs_pbd_xml++.cc Log Message: ardour: fix build with libxml2 2.12. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/ardour/distinfo cvs rdiff -u -r0 -r1.4 \ pkgsrc/audio/ardour/patches/patch-gtk2__ardour_ardour__ui.cc cvs rdiff -u -r0 -r1.1 pkgsrc/audio/ardour/patches/patch-libs_pbd_xml++.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170756170368970 Content-Disposition: inline Content-Length: 2949 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/ardour/distinfo diff -u pkgsrc/audio/ardour/distinfo:1.10 pkgsrc/audio/ardour/distinfo:1.11 --- pkgsrc/audio/ardour/distinfo:1.10 Tue Oct 26 09:58:47 2021 +++ pkgsrc/audio/ardour/distinfo Sat Feb 10 10:41:43 2024 @@ -1,11 +1,13 @@ -$NetBSD: distinfo,v 1.10 2021/10/26 09:58:47 nia Exp $ +$NetBSD: distinfo,v 1.11 2024/02/10 10:41:43 wiz Exp $ BLAKE2s (Ardour-6.9.0.tar.bz2) = 9be75d0e92ce43cd27acfbbcbb4fb3a66b6eb02981c1ad9d0850620138389d2c SHA512 (Ardour-6.9.0.tar.bz2) = ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234 Size (Ardour-6.9.0.tar.bz2) = 12297369 bytes +SHA1 (patch-gtk2__ardour_ardour__ui.cc) = dc69522a66a715a164d0d9d360221dbc2e65d85f SHA1 (patch-gtk2__ardour_wscript) = 5dd0d0e86319d7d461587a37c555d9b505b97bed SHA1 (patch-libs_ardour_ardour_audio__backend.h) = 7d919909f768f386b6619772318ad818d797c25d SHA1 (patch-libs_ardour_plugin__manager.cc) = 92564dc05e7f8febe6146f591f0a9c26d1ae0b60 SHA1 (patch-libs_backends_jack_jack__utils.cc) = 5bf08ead83b3a2c4355a0424262878a1b89e1648 +SHA1 (patch-libs_pbd_xml++.cc) = 67ae9474e696e88f0e55685d93396de320c89d07 SHA1 (patch-libs_qm-dsp_wscript) = 0589fe5d811b55ec474e1c48ef73656744e824fc SHA1 (patch-wscript) = f3b9b5dfcdf71ec66744ffa71413cc422a2dcbf2 Added files: Index: pkgsrc/audio/ardour/patches/patch-gtk2__ardour_ardour__ui.cc diff -u /dev/null pkgsrc/audio/ardour/patches/patch-gtk2__ardour_ardour__ui.cc:1.4 --- /dev/null Sat Feb 10 10:41:43 2024 +++ pkgsrc/audio/ardour/patches/patch-gtk2__ardour_ardour__ui.cc Sat Feb 10 10:41:43 2024 @@ -0,0 +1,15 @@ +$NetBSD: patch-gtk2__ardour_ardour__ui.cc,v 1.4 2024/02/10 10:41:43 wiz Exp $ + +Fix build with libxml2 2.12. + +--- gtk2_ardour/ardour_ui.cc.orig 2024-02-10 10:40:02.977463986 +0000 ++++ gtk2_ardour/ardour_ui.cc +@@ -264,7 +264,7 @@ libxml_generic_error_func (void* /* pars + + static void + libxml_structured_error_func (void* /* parsing_context*/, +- xmlErrorPtr err) ++ const xmlError *err) + { + string msg; + Index: pkgsrc/audio/ardour/patches/patch-libs_pbd_xml++.cc diff -u /dev/null pkgsrc/audio/ardour/patches/patch-libs_pbd_xml++.cc:1.1 --- /dev/null Sat Feb 10 10:41:43 2024 +++ pkgsrc/audio/ardour/patches/patch-libs_pbd_xml++.cc Sat Feb 10 10:41:43 2024 @@ -0,0 +1,15 @@ +$NetBSD: patch-libs_pbd_xml++.cc,v 1.1 2024/02/10 10:41:43 wiz Exp $ + +Fix build with libxml2 2.12. + +--- libs/pbd/xml++.cc.orig 2024-02-10 10:29:26.804670554 +0000 ++++ libs/pbd/xml++.cc +@@ -168,7 +168,7 @@ XMLTree::write() const + result = xmlSaveFormatFileEnc(_filename.c_str(), doc, "UTF-8", 1); + #ifndef NDEBUG + if (result == -1) { +- xmlErrorPtr xerr = xmlGetLastError (); ++ const xmlError *xerr = xmlGetLastError (); + if (!xerr) { + std::cerr << "unknown XML error during xmlSaveFormatFileEnc()." << std::endl; + } else { --_----------=_170756170368970--