From nobody Wed Jun 28 10:16:03 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QrctD179cz4kylS; Wed, 28 Jun 2023 10:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QrctC6yTNz4Jgk; Wed, 28 Jun 2023 10:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687947364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6crEkMkdyY2/QUGSJX3sZSzpr4Bo6UOPi7Zm6eeXCo=; b=UnxbJaLWd+YkfAjebVU1fsg2l+RlEJBQGwuqC8F2CROiLF85VDJl60oIxk2TjXWYPzZjcW qTLdunz5ZsZ7LSAD6wFMp7F0UxcWIepHSUFQzFcdr3G2s1djhLvgYHUJfIZaMzFh+WTNhQ D74Cq72PCoCpYWL0BkFnBe/LPD0wG//xNk7EhPhIjztu+YHskweEPM3l28Om1HcyCJ6YoM UevXcSrBugnM/bEtu6pkGeOJCcmXwjMGj5q+faeh/yGiPQ7PmFWozGK7pNIxt4B+QQX9hL ENwFaJMEAt1S6XDkQOwl6+s91n9Hn9jCxYPoVqHFL4oY7ZyavyI0a4R4q6Drbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687947364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V6crEkMkdyY2/QUGSJX3sZSzpr4Bo6UOPi7Zm6eeXCo=; b=IYEky/yjsp0HKmDLdWTbevayDy30Kd9OYCqkj30hJlqeP4nOBRrJVD8rmRxIQkrIe4M8X1 6fjrNtyoGqtVCsu3Hr1OPZYZGce6UNl1gePs2x4aaZ/UaXHXOB8YVQSXf/hoWSogrvseIL crYd/fnJFmHTfMs0jG5ytnwe8bhViEonKcgkZmUxasGRrWsnXatCO11sDcAcA2Lv6D+WFb iluBwWVHrvH5FyoGAhtOt2CLr5fMewkB69w/BEWfTO0jq3vDBKKjkEw3KcE1bKD8o5Ks1n vPW+bgFh9ko6GfFkrPHs+4V8fiiIfu9vVAczf4fwU6oFvObV6Vz1DAydhk59rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687947364; a=rsa-sha256; cv=none; b=utCieR7o7uKpZW+8HS4ugPxfJnlIXZvjEteC4hiPctlj4tKCV83hZ/LNi7/+0NJ8ReLrk2 fGERr8DMolK4dN67AW1mrEaYEbejgYOJQZ7b793Bg5uNsWVm7YbXzqKvyQhTC5KBk39yLN 65zxdoGVMIL0bKygLCu9MNPAm7SHjCaUxiBtmRwTCOxnPGdKFavcmH6RCXyuXEkESDdQO5 djztbOOJrLnLo+m9csZIbSuVg9pUtASii+CwKA5PfTZMCA+AXG5VDwRrD8QjkpKPEl2MLG c6058nMSOkOL0nM+ZaD9Q2fiT1vQ+EamZ9Y5L1Qbc0J94L2XKWdpNFsbwcCXQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QrctC4WdYzVjp; Wed, 28 Jun 2023 10:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35SAG3nS009124; Wed, 28 Jun 2023 10:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35SAG3ls009123; Wed, 28 Jun 2023 10:16:03 GMT (envelope-from git) Date: Wed, 28 Jun 2023 10:16:03 GMT Message-Id: <202306281016.35SAG3ls009123@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 34b026b15a67 - main - Try to fix the build of four of my ports against Clang 16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34b026b15a672161911b77b6d4921447e138ef4c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=34b026b15a672161911b77b6d4921447e138ef4c commit 34b026b15a672161911b77b6d4921447e138ef4c Author: Alexey Dokuchaev AuthorDate: 2023-06-28 10:14:20 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-06-28 10:14:20 +0000 Try to fix the build of four of my ports against Clang 16 It now defaults to ISO C++17 which does not allow `register' storage class specifier [-Wregister]. Reported by: pkg-fallout --- audio/deadbeef/Makefile | 7 +++---- devel/smooth/Makefile | 2 ++ graphics/fotoxx/Makefile | 2 +- misc/swissfileknife/Makefile | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index b74c159bb0c8..d6253a6b0f07 100644 --- a/audio/deadbeef/Makefile +++ b/audio/deadbeef/Makefile @@ -206,11 +206,10 @@ PLIST_SUB+= MP3="@comment " PLIST_SUB+= MP3="" .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 -CPPFLAGS+= -Dregister= -.endif - post-patch: + @${REINPLACE_CMD} -e 's,register ,,' \ + ${WRKSRC}/plugins/adplug/adplug/rix.cpp \ + ${WRKSRC}/plugins/adplug/libbinio/binio.cpp # Do not link to libsupc++ which may be PIC-unsafe (breaks 64-bit arches) @${REINPLACE_CMD} -e 's, -lsupc++,,' \ ${WRKSRC}/plugins/adplug/Makefile.in \ diff --git a/devel/smooth/Makefile b/devel/smooth/Makefile index 6b404cfba958..6efbd50613c9 100644 --- a/devel/smooth/Makefile +++ b/devel/smooth/Makefile @@ -23,6 +23,8 @@ USE_XORG= x11 MAKE_ARGS= config="systemlibcpuid systemlibwebp" post-extract: + @${REINPLACE_CMD} -e 's,register ,,' \ + ${WRKSRC}/classes/gui/dialogs/colordlg.cpp # Prevent accidental build/use of bundled libraries' code/headers @${RM} -r ${WRKSRC}/libraries/fribidi ${WRKSRC}/libraries/lib* \ ${WRKSRC}/libraries/v8 ${WRKSRC}/libraries/zlib diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile index ca3855b6a0a5..20b198cdc883 100644 --- a/graphics/fotoxx/Makefile +++ b/graphics/fotoxx/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ USES= desktop-file-utils gmake gnome jpeg pkgconfig USE_GNOME= cairo glib20 gdkpixbuf2 gtk30 ALL_TARGET= fotoxx -CXXFLAGS+= -Wno-writable-strings +CXXFLAGS+= -Wno-register -Wno-writable-strings WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/misc/swissfileknife/Makefile b/misc/swissfileknife/Makefile index 602e4c0d402e..6abe7935a5bd 100644 --- a/misc/swissfileknife/Makefile +++ b/misc/swissfileknife/Makefile @@ -26,6 +26,7 @@ post-patch: || defined(__FreeBSD__),' \ ${WRKSRC}/sfk.cpp ${WRKSRC}/sfkext.cpp @${REINPLACE_CMD} -e '/_STDINT_H/,+6d' ${WRKSRC}/sfkmatch.hpp + @${REINPLACE_CMD} -e 's,^ *register, ,' ${WRKSRC}/sfkpack.cpp post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}