From nobody Tue Jul 04 05:44:53 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 4QwBZY6XL3z4lPP3; Tue, 4 Jul 2023 05:44:53 +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 4QwBZY5fWlz3BvX; Tue, 4 Jul 2023 05:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688449493; 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=GCnXgSRqmuRWVMUwkmfi5uiSeo2dHMK0wK/wli4fKCo=; b=SPlX27tPWxCadrDj5EDCVYnNDRIyfo2NsMI/h76AO8k4Jl32ARtfG012wA63f4kaK7Tk41 QxtKUlBMZoSbi5cPl89dWZr5ZqUgAXJEkCEolMX+bm5F2MYvs3xg8XLc0vLMpiy9/xKAkq 81lXqg0RE6y41MgLDlqhAZSKUPSoEzyxjL7riyOF+8t4GXTz2nUMd4ai7oCBP6fRy0K6G9 ZZCRE+sv0ffo98tCbyqlHE3K7omIp9ONOeedbY5Dim9BwBVzXtrJcTyGgWIsbmHUsNUNP4 qP6hSU0Zy36WQptruiXWJxX6TcJJoAfjaLPGXZZ97YhX1bB/rtJLKwy6QAScpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688449493; 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=GCnXgSRqmuRWVMUwkmfi5uiSeo2dHMK0wK/wli4fKCo=; b=KwzeCOhrZ+5AUjvki/79RTv8cXPXRAZY6lkOxaPrSktQW0tXGMtS/09roaXcUL0a9V5aMP J6C7NlWu0zEbzIvc4nTlLVhenxUMH8wvk0MyXgwVu8G+/W/viQaO7IVhPZnLlJS8mKEIFy LKMJeEjSuS++gayUwzzT9GJOMlDn0XvTK3q2iEuKMy/vffzVcZZb+IMya08aNE/dIaKSHg q6eFN7MaPDmVSDMG8yJixLKaAArOu4KNJt+HEnNJb/9LFXH81KfytOON/RhiUO1VfLMLov OiaalAer/uY6sW6lGAjp8GqPXyiwGiKKEX+ew8KvPuXauDWmSIEppeHqQMVR9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688449493; a=rsa-sha256; cv=none; b=weXIIii2ZScTy0IicM/9R+/CI39qHIAynU1OiddjlgCs7ghMHtDBd8pGPR61aQZjFhlAqn h/RYw0WiT4V34cHuXGLGpNM28lAnDocg3FDqaQzMe6RSGCmzNfnw2UcR25BmYJSvjXO8Y/ +LsovfoHiyoLWAAKpYuSnIZDpL5b7+jq9Zclti6gZe5fdfwf0d/9NEvq/jmxNEcHV+aM2t 3X4xOX3bnkK+2rjxCqHsGmVcRN4AGK0x4+Co1AJV9DWqsSk80S612FFgtub6d+zqsbzv55 IaklW50ezLXVpNJDfGOQjToSqqlBKGY8O9aNYUfRwL3miDhmJdTR/08/fp+slw== 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 4QwBZY4mRWzLPv; Tue, 4 Jul 2023 05:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3645irl6056566; Tue, 4 Jul 2023 05:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3645ircZ056565; Tue, 4 Jul 2023 05:44:53 GMT (envelope-from git) Date: Tue, 4 Jul 2023 05:44:53 GMT Message-Id: <202307040544.3645ircZ056565@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: b5772e3fcc10 - main - games/gtkradiant: try to fix the port's build 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: b5772e3fcc106a71e3bfd49abbf73af151645647 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5772e3fcc106a71e3bfd49abbf73af151645647 commit b5772e3fcc106a71e3bfd49abbf73af151645647 Author: Alexey Dokuchaev AuthorDate: 2023-07-04 05:41:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-07-04 05:41:52 +0000 games/gtkradiant: try to fix the port's build against Clang 16 Ancient `register' keyword is gone with C++17, drop it from various places. Also, ISO C99 and later no longer tolerate implicit function declarations, but the code in question is too convoluted and fragile to fix properly, so just disable the warning for the time being. While here, do not hardcode -O2 for release builds (system-provided compilation flags being correctly upheld) and spell -Wextra correctly (quoting the GCC docs*, this option used to be called -W; the older name is still supported, but the newer name is more descriptive). Reported by: pkg-fallout *) https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wextra --- games/gtkradiant/Makefile | 10 ++++++++-- games/gtkradiant/files/patch-SConstruct | 25 ++++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile index 907426700916..3fb93b36f945 100644 --- a/games/gtkradiant/Makefile +++ b/games/gtkradiant/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libpng.so:graphics/png USES= compiler:c++11-lang gnome pkgconfig python:build scons zip -USE_GNOME= gtk20 libxml2 +USE_GNOME= gdkpixbuf2 gtk20 libxml2 MAKE_ARGS= ${MAKE_ENV} BUILD=release SSP_UNSAFE= yes @@ -44,7 +44,13 @@ post-patch: ${WRKSRC}/radiant/patch.cpp \ ${WRKSRC}/radiant/watchbsp.cpp \ ${WRKSRC}/tools/quake3/common/inout.c -# Fix the build against Clang +# Fix the build against Clang and possibly other modern compilers + @${REINPLACE_CMD} -e 's,register ,,g' \ + ${WRKSRC}/libs/container/hashfunc.h \ + ${WRKSRC}/libs/jpeg6/jdcolor.cpp \ + ${WRKSRC}/libs/jpeg6/jdhuff.* \ + ${WRKSRC}/libs/jpeg6/jdsample.cpp \ + ${WRKSRC}/libs/jpeg6/jutils.cpp @${REINPLACE_CMD} -e '/#include "generic\/reference\.h"/x ; 318G' \ ${WRKSRC}/libs/scenelib.h @${REINPLACE_CMD} -e '/#include "generic\/referencecounted\.h/ { \ diff --git a/games/gtkradiant/files/patch-SConstruct b/games/gtkradiant/files/patch-SConstruct index 7484c3a34b55..1e8ca062178f 100644 --- a/games/gtkradiant/files/patch-SConstruct +++ b/games/gtkradiant/files/patch-SConstruct @@ -121,20 +121,23 @@ p = pickle.Pickler(site_file) p.dump(site_dict) site_file.close() -@@ -172,8 +166,8 @@ LINK = CXX +@@ -170,7 +164,7 @@ SetOption('num_jobs', JOBS) + + LINK = CXX # common flags - warningFlags = '-W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter ' +-warningFlags = '-W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter ' ++warningFlags = '-Wall -Wextra -Wcast-align -Wcast-qual -Wno-implicit-function-declaration -Wno-unused-parameter ' warningFlagsCXX = '-Wno-non-virtual-dtor -Wreorder ' # -Wold-style-cast --CCFLAGS = '' + warningFlags --CXXFLAGS = '-pipe -DQ_NO_STLPORT ' + warningFlags + warningFlagsCXX -+CCFLAGS += ' ' -+CXXFLAGS += ' -pipe -DQ_NO_STLPORT ' - CPPPATH = [] - if (BUILD == 'debug'): + CCFLAGS = '' + warningFlags + CXXFLAGS = '-pipe -DQ_NO_STLPORT ' + warningFlags + warningFlagsCXX +@@ -179,18 +173,17 @@ if (BUILD == 'debug'): CXXFLAGS += '-g -D_DEBUG ' -@@ -182,15 +176,14 @@ elif (BUILD == 'release'): - CXXFLAGS += '-O2 ' - CCFLAGS += '-O2 ' + CCFLAGS += '-g -D_DEBUG ' + elif (BUILD == 'release'): +- CXXFLAGS += '-O2 ' +- CCFLAGS += '-O2 ' ++ # uphold system-provided compilation flags ++ pass elif ( BUILD == 'info' ): - print 'Preparing OSX release' + print('Preparing OSX release')