Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8417284F64 for ; Fri, 13 Oct 2023 09:42:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id QbGevvG-mNxP for ; Fri, 13 Oct 2023 09:42:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C9EDF84EA5 for ; Fri, 13 Oct 2023 09:42:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C3A13FADC; Fri, 13 Oct 2023 09:42:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169719014736830" MIME-Version: 1.0 Date: Fri, 13 Oct 2023 09:42:27 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2023Q3] pkgsrc/www/webkit-gtk To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20231013094227.C3A13FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169719014736830 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Oct 13 09:42:27 UTC 2023 Modified Files: pkgsrc/www/webkit-gtk [pkgsrc-2023Q3]: Makefile Log Message: Pullup ticket #6810 - requested by gutteridge www/webkit-gtk: aarch64 build fix Revisions pulled up: - www/webkit-gtk/Makefile 1.249 --- Module Name: pkgsrc Committed By: gutteridge Date: Thu Oct 5 05:57:20 UTC 2023 Modified Files: pkgsrc/www/webkit-gtk: Makefile Log Message: webkit-gtk: fix inadvertent aarch64 lossage from r. 1.247 A block that was a no-op was removed, but the inclusion of bsd.prefs.mk should still be applied because of a different block added in a later revision. To generate a diff of this commit: cvs rdiff -u -r1.248 -r1.248.2.1 pkgsrc/www/webkit-gtk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169719014736830 Content-Disposition: inline Content-Length: 729 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/webkit-gtk/Makefile diff -u pkgsrc/www/webkit-gtk/Makefile:1.248 pkgsrc/www/webkit-gtk/Makefile:1.248.2.1 --- pkgsrc/www/webkit-gtk/Makefile:1.248 Mon Aug 14 05:25:31 2023 +++ pkgsrc/www/webkit-gtk/Makefile Fri Oct 13 09:42:27 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.248 2023/08/14 05:25:31 wiz Exp $ +# $NetBSD: Makefile,v 1.248.2.1 2023/10/13 09:42:27 bsiegert Exp $ DISTNAME= webkitgtk-2.36.8 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} @@ -45,6 +45,7 @@ CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF CMAKE_ARGS+= -DUSE_OPENJPEG=OFF CMAKE_ARGS+= -DUSE_SOUP2=ON +.include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) CMAKE_ARGS+= -DAVOID_INT128=ON .endif --_----------=_169719014736830--