Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0614A84EAB for ; Tue, 18 Jul 2023 18:56:05 +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 5_ff1OReuK7B for ; Tue, 18 Jul 2023 18:56:04 +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 1D49D84D36 for ; Tue, 18 Jul 2023 18:56:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 16826FBDB; Tue, 18 Jul 2023 18:56:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168970656440170" MIME-Version: 1.0 Date: Tue, 18 Jul 2023 18:56:04 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/x11 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20230718185604.16826FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168970656440170 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Jul 18 18:56:03 UTC 2023 Modified Files: pkgsrc/x11/gtkmm3: Makefile pkgsrc/x11/gtkmm4: Makefile pkgsrc/x11/kactivities: Makefile pkgsrc/x11/kitty: Makefile pkgsrc/x11/libkactivities4: Makefile pkgsrc/x11/vte3: Makefile buildlink3.mk Log Message: x11: Adapt packages (where possible) to USE_(CC|CXX)_FEATURES To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/gtkmm3/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/gtkmm4/Makefile cvs rdiff -u -r1.69 -r1.70 pkgsrc/x11/kactivities/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/kitty/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/libkactivities4/Makefile cvs rdiff -u -r1.66 -r1.67 pkgsrc/x11/vte3/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/vte3/buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168970656440170 Content-Disposition: inline Content-Length: 4880 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/gtkmm3/Makefile diff -u pkgsrc/x11/gtkmm3/Makefile:1.57 pkgsrc/x11/gtkmm3/Makefile:1.58 --- pkgsrc/x11/gtkmm3/Makefile:1.57 Wed Apr 19 08:08:51 2023 +++ pkgsrc/x11/gtkmm3/Makefile Tue Jul 18 18:56:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2023/04/19 08:08:51 adam Exp $ +# $NetBSD: Makefile,v 1.58 2023/07/18 18:56:03 nia Exp $ DISTNAME= gtkmm-3.24.7 PKGNAME= ${DISTNAME:S/gtkmm/gtkmm3/1} @@ -12,8 +12,8 @@ HOMEPAGE= https://www.gtkmm.org/ COMMENT= C++ Interfaces for GTK+ and GNOME (v3) LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 -USE_LANGUAGES= c c++11 -GCC_REQD+= 4.9 +USE_LANGUAGES= c c++ +USE_CXX_FEATURES+= c++11 USE_TOOLS+= perl pkg-config PKGCONFIG_OVERRIDE+= gdk/gdkmm.pc.in PKGCONFIG_OVERRIDE+= gtk/gtkmm.pc.in Index: pkgsrc/x11/gtkmm4/Makefile diff -u pkgsrc/x11/gtkmm4/Makefile:1.5 pkgsrc/x11/gtkmm4/Makefile:1.6 --- pkgsrc/x11/gtkmm4/Makefile:1.5 Sun Jan 29 21:15:07 2023 +++ pkgsrc/x11/gtkmm4/Makefile Tue Jul 18 18:56:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/01/29 21:15:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2023/07/18 18:56:03 nia Exp $ DISTNAME= gtkmm-4.2.0 PKGNAME= ${DISTNAME:S/gtkmm/gtkmm4/1} @@ -14,8 +14,8 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt -USE_LANGUAGES= c c++11 -GCC_REQD+= 4.9 +USE_LANGUAGES= c c++ +USE_CXX_FEATURES+= c++11 USE_TOOLS+= perl pkg-config PKGCONFIG_OVERRIDE+= gtk/gtkmm.pc.in Index: pkgsrc/x11/kactivities/Makefile diff -u pkgsrc/x11/kactivities/Makefile:1.69 pkgsrc/x11/kactivities/Makefile:1.70 --- pkgsrc/x11/kactivities/Makefile:1.69 Sun Apr 23 14:26:10 2023 +++ pkgsrc/x11/kactivities/Makefile Tue Jul 18 18:56:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2023/04/23 14:26:10 adam Exp $ +# $NetBSD: Makefile,v 1.70 2023/07/18 18:56:03 nia Exp $ DISTNAME= kactivities-4.13.3 PKGREVISION= 36 @@ -12,8 +12,7 @@ DEPENDS+= libkactivities4-[0-9]*:../../x DISTINFO_FILE= ${.CURDIR}/../../x11/libkactivities4/distinfo -# Needs C++11 features for kactivitymanager -GCC_REQD+= 4.5 +USE_CXX_FEATURES+= c++11 CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF Index: pkgsrc/x11/kitty/Makefile diff -u pkgsrc/x11/kitty/Makefile:1.41 pkgsrc/x11/kitty/Makefile:1.42 --- pkgsrc/x11/kitty/Makefile:1.41 Thu Jul 13 13:49:17 2023 +++ pkgsrc/x11/kitty/Makefile Tue Jul 18 18:56:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2023/07/13 13:49:17 nia Exp $ +# $NetBSD: Makefile,v 1.42 2023/07/18 18:56:03 nia Exp $ DISTNAME= kitty-0.26.5 PKGREVISION= 1 @@ -14,9 +14,10 @@ COMMENT= GPU based terminal emulator LICENSE= gnu-gpl-v3 USE_LANGUAGES= c -EXTRACT_USING= bsdtar USE_TOOLS+= gmake pkg-config +USE_CXX_FEATURES+= has_include + # don't force LTO BUILDLINK_TRANSFORM+= rm:-flto # code is not perfect Index: pkgsrc/x11/libkactivities4/Makefile diff -u pkgsrc/x11/libkactivities4/Makefile:1.34 pkgsrc/x11/libkactivities4/Makefile:1.35 --- pkgsrc/x11/libkactivities4/Makefile:1.34 Sun Apr 23 14:26:10 2023 +++ pkgsrc/x11/libkactivities4/Makefile Tue Jul 18 18:56:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2023/04/23 14:26:10 adam Exp $ +# $NetBSD: Makefile,v 1.35 2023/07/18 18:56:03 nia Exp $ DISTNAME= kactivities-4.13.3 PKGNAME= libkactivities4-4.13.3 @@ -11,8 +11,7 @@ MASTER_SITES= ${MASTER_SITE_KDE:=4.13.3/ CONFLICTS+= kactivities<4.13.3nb4 -# Needs C++11 features for kactivitymanager -GCC_REQD+= 4.5 +USE_CXX_FEATURES+= c++1 CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF Index: pkgsrc/x11/vte3/Makefile diff -u pkgsrc/x11/vte3/Makefile:1.66 pkgsrc/x11/vte3/Makefile:1.67 --- pkgsrc/x11/vte3/Makefile:1.66 Sun Jun 11 02:19:46 2023 +++ pkgsrc/x11/vte3/Makefile Tue Jul 18 18:56:03 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2023/06/11 02:19:46 gutteridge Exp $ +# $NetBSD: Makefile,v 1.67 2023/07/18 18:56:03 nia Exp $ DISTNAME= vte-0.72.2 PKGNAME= ${DISTNAME:S/vte/vte3/} @@ -16,9 +16,9 @@ PKGCONFIG_OVERRIDE_STAGE= post-configure PKGCONFIG_OVERRIDE+= output/meson-private/vte-2.91.pc USE_TOOLS+= msgfmt pkg-config bash -USE_LANGUAGES= c c++20 -# for c++20 -GCC_REQD+= 10 +USE_LANGUAGES= c c++ + +USE_CXX_FEATURES+= c++20 # Otherwise, this will fail on Linux distributions that don't # have libsystemd. Index: pkgsrc/x11/vte3/buildlink3.mk diff -u pkgsrc/x11/vte3/buildlink3.mk:1.23 pkgsrc/x11/vte3/buildlink3.mk:1.24 --- pkgsrc/x11/vte3/buildlink3.mk:1.23 Sun Jan 29 21:15:19 2023 +++ pkgsrc/x11/vte3/buildlink3.mk Tue Jul 18 18:56:03 2023 @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.23 2023/01/29 21:15:19 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2023/07/18 18:56:03 nia Exp $ BUILDLINK_TREE+= vte3 .if !defined(VTE3_BUILDLINK3_MK) VTE3_BUILDLINK3_MK:= -# for c++20 -GCC_REQD+= 10 +USE_CXX_FEATURES+= c++20 BUILDLINK_API_DEPENDS.vte3+= vte3>=0.52.2 BUILDLINK_ABI_DEPENDS.vte3+= vte3>=0.68.0nb11 --_----------=_168970656440170--