From nobody Thu Dec 14 17:03:52 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 4Srdwn0Vrvz52l81; Thu, 14 Dec 2023 17:03: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 4Srdwm6nWZz3bPL; Thu, 14 Dec 2023 17:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573433; 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=YlAnrTMIIb7mxGGEcrl2YgxuBxRMKkl++e8TgIUKejI=; b=hxa+xY8PL0E1Z0B8iSk4z3vKBoEmoa4RMsWgI2oGRGAGd7zKkWwR8X+6hUJzLetZ2nn97S OmT966OPRNZ541rWepmQw2o5TlCMh1YkqsnxmkzmkeL4iYoy2CSNRPuerofE6invWSnqLr 07T4gBlwbwfqj1GgoQ04wjWzbVQM2FKCPDR0CEO2cW1UM8XJLxEBzP1MfHAyibsWo4TbBw iL8MkZ+mrzjzuERXavrlxc344MV4V+beq+05voShh/A0Xg8osVADwY1X831IO6YaPzk32R 2VhHlKeLZ5CBzAa7otBLX3HMG+gM6hCQ5K+dxjzHIgF/VYGRE6bdvenrlHiRHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573433; a=rsa-sha256; cv=none; b=MLKw4s86EJXaIeF288KFGdIYnU8mcKusC3azpB88Msn52/BI02x/4JdZWVhuw764a9ah8w IlXzzmUx56pVew7dO8D3JXiDuAiydOFWI94LM2IHX9dO6nwdpIPMPWqfhusCY3LFaBFS6B YENkZop/LhP8oD1rkcRnWZCZKBHL6txRPcTpkEskuGcETbQPEZl8tf/oEAOrZ2xojugYZ0 iZD0TQJpXXFbnPJnyjcKSHD/vEUWrjA4EWdJohPAs+bu77HojVZxlBktU6XLtVKcnrQI8q BOv3U3JIaNyRnHdjIl4bWkIg4UoOd48qsVvKoUKemQjksldjn6awbkLCoEOTfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573433; 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=YlAnrTMIIb7mxGGEcrl2YgxuBxRMKkl++e8TgIUKejI=; b=Unh1t0TYzNZl3MpJ580nTyI3mzg7V5nK7mfXT43JbiUHrcSNHqOJBn6awHsjLm/zhZxJ5D r5cXtX2Snz3pArfGsUP81nWnkRae6rFhfAqexNeTLt9satPtoLOAS2o9+4hKEu95Oe2iYQ hktFpfaQK501cpxENpLtsu1WUm3g0EAmYy9ZISdjez8GYhwCmyD+GC0rHtLQ/rekNTGONW FsKhcTxtqRcl6q57lohAlkKHgp+p81YMBQKpXPOVHUZmB0V2Y2JY3S//9MWnhXwT+BqsRV vs8bwdKiwyZGpsOsx934GZhM6ZDpsx97m/FcvQVJG33jhW0v79Dyi3B6PcfO1w== 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 4Srdwm5rWjzbMs; Thu, 14 Dec 2023 17:03:52 +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 3BEH3qhh017762; Thu, 14 Dec 2023 17:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3qE0017759; Thu, 14 Dec 2023 17:03:52 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:52 GMT Message-Id: <202312141703.3BEH3qE0017759@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 27272a57d063 - main - science/paraview: Fix build with protobuf 22+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27272a57d0631c04d53f5a2671990ca3abc8c2ca Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=27272a57d0631c04d53f5a2671990ca3abc8c2ca commit 27272a57d0631c04d53f5a2671990ca3abc8c2ca Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:23:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:09 +0000 science/paraview: Fix build with protobuf 22+ --- science/paraview/Makefile | 1 + science/paraview/files/patch-protobuf | 181 ++++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 2e42363cbee1..69f31ebfc0b8 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -94,6 +94,7 @@ CMAKE_ARGS+= -DPARAVIEW_BUILD_SHARED_LIBS=ON \ CMAKE_ARGS+= -DVTK_FORBID_DOWNLOADS:BOOL=ON .endif MAKE_ENV= XDG_CONFIG_HOME=${WRKDIR} +USE_CXXSTD= c++17 SHEBANG_GLOB= *.py SHEBANG_FILES= VTK/Examples/SearchScript.sh \ diff --git a/science/paraview/files/patch-protobuf b/science/paraview/files/patch-protobuf new file mode 100644 index 000000000000..b17fc4d08614 --- /dev/null +++ b/science/paraview/files/patch-protobuf @@ -0,0 +1,181 @@ +--- VTK/CMake/vtkCompilerChecks.cmake.orig 2023-09-22 14:35:37 UTC ++++ VTK/CMake/vtkCompilerChecks.cmake +@@ -33,7 +33,7 @@ if(NOT VTK_IGNORE_CMAKE_CXX11_CHECKS) + # Needed to make sure libraries and executables not built by the + # vtkModuleMacros still have the C++11 compiler flags enabled + # Wrap this in an escape hatch for unknown compilers +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED True) + set(CMAKE_CXX_EXTENSIONS False) + endif() +--- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfExprLex.cxx.orig 2023-09-22 14:35:37 UTC ++++ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfExprLex.cxx +@@ -706,9 +706,9 @@ extern int dice_yylex (void); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + + +@@ -756,7 +756,7 @@ YY_DECL + yy_match: + do + { +- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; ++ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; +@@ -1091,9 +1091,9 @@ case YY_STATE_EOF(INITIAL): + */ + static int yy_get_next_buffer (void) + { +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = (yytext_ptr); +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = (yytext_ptr); ++ int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) +@@ -1217,14 +1217,14 @@ static int yy_get_next_buffer (void) + + static yy_state_type yy_get_previous_state (void) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = (yy_start); + + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) + { +- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); ++ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; +@@ -1249,10 +1249,10 @@ static int yy_get_next_buffer (void) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) + { +- register int yy_is_jam; +- register char *yy_cp = (yy_c_buf_p); ++ int yy_is_jam; ++ char *yy_cp = (yy_c_buf_p); + +- register YY_CHAR yy_c = 1; ++ YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + (yy_last_accepting_state) = yy_current_state; +@@ -1270,9 +1270,9 @@ static int yy_get_next_buffer (void) + return yy_is_jam ? 0 : yy_current_state; + } + +- static void yyunput (int c, register char * yy_bp ) ++ static void yyunput (int c, char * yy_bp ) + { +- register char *yy_cp; ++ char *yy_cp; + + yy_cp = (yy_c_buf_p); + +@@ -1282,10 +1282,10 @@ static int yy_get_next_buffer (void) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register int number_to_move = (yy_n_chars) + 2; +- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ ++ int number_to_move = (yy_n_chars) + 2; ++ char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; +- register char *source = ++ char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) +@@ -1862,7 +1862,7 @@ int dice_yylex_destroy (void) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -1871,7 +1871,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s ) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +--- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfExprYacc.cxx.orig 2023-09-22 14:35:37 UTC ++++ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfExprYacc.cxx +@@ -270,7 +270,7 @@ union yyalloc + # define YYCOPY(To, From, Count) \ + do \ + { \ +- register YYSIZE_T yyi; \ ++ YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ +@@ -800,7 +800,7 @@ yystrlen (yystr) + const char *yystr; + # endif + { +- register const char *yys = yystr; ++ const char *yys = yystr; + + while (*yys++ != '\0') + continue; +@@ -825,8 +825,8 @@ yystpcpy (yydest, yysrc) + const char *yysrc; + # endif + { +- register char *yyd = yydest; +- register const char *yys = yysrc; ++ char *yyd = yydest; ++ const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; +@@ -945,8 +945,8 @@ yyparse () + #endif + { + +- register int yystate; +- register int yyn; ++ int yystate; ++ int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; +@@ -964,12 +964,12 @@ yyparse () + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; +- register short *yyssp; ++ short *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; +- register YYSTYPE *yyvsp; ++ YYSTYPE *yyvsp; + + +