Received: by mail.netbsd.org (Postfix, from userid 605) id 3659284DCF; Fri, 2 Apr 2021 14:56:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 70A6C84DCB for ; Fri, 2 Apr 2021 14:56:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at 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 HSCmGLQcfeaP for ; Fri, 2 Apr 2021 14:56:06 +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 C759784D31 for ; Fri, 2 Apr 2021 14:56:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C0E83FA95; Fri, 2 Apr 2021 14:56:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1617375365167100" MIME-Version: 1.0 Date: Fri, 2 Apr 2021 14:56:05 +0000 From: "Dan Cirnat" Subject: CVS commit: pkgsrc/x11/qt5-qtwebkit To: pkgsrc-changes@NetBSD.org Reply-To: cirnatdan@netbsd.org X-Mailer: log_accum Message-Id: <20210402145605.C0E83FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1617375365167100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: cirnatdan Date: Fri Apr 2 14:56:05 UTC 2021 Modified Files: pkgsrc/x11/qt5-qtwebkit: Makefile Log Message: qt5-qtwebkit: Fix build with glib-2.68.0 To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 pkgsrc/x11/qt5-qtwebkit/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1617375365167100 Content-Disposition: inline Content-Length: 866 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtwebkit/Makefile diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.86 pkgsrc/x11/qt5-qtwebkit/Makefile:1.87 --- pkgsrc/x11/qt5-qtwebkit/Makefile:1.86 Tue Jan 5 15:08:43 2021 +++ pkgsrc/x11/qt5-qtwebkit/Makefile Fri Apr 2 14:56:05 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2021/01/05 15:08:43 gdt Exp $ +# $NetBSD: Makefile,v 1.87 2021/04/02 14:56:05 cirnatdan Exp $ QTWKVERSION= 5.212.0-alpha4 DISTNAME= qtwebkit-${QTWKVERSION} @@ -49,6 +49,10 @@ pre-configure: # wcstof(3) etc. is used in C++ code. CFLAGS.NetBSD+= -D_NETBSD_SOURCE +# temporary fix for GLib 2.68 breakage +# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 +CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 + ## for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. #BUILDLINK_TRANSFORM+= rm:-Wundef --_----------=_1617375365167100--