From nobody Sat Sep 28 14:18:06 2024 X-Original-To: dev-commits-ports-all@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 4XG8Z62BwFz5XPWc; Sat, 28 Sep 2024 14:18:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG8Z61SdFz4Yj7; Sat, 28 Sep 2024 14:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727533086; 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=pk+mgy5CNcA1Z1rplf6Ai8TY25UmZduqxEMtxeukt1k=; b=I2ruJJZquVVFQVLukYGDr6QsNFQDTNgrAr3JsO+E2lwnm+orKaDww0RaVe+o/mIVl45V35 g4bF/igK6yK+qguuet4MQcJV5PgqHyCDqSGGB8hP1r1PDoD/EAI/JtlbczKSZ3s3Z6UO9A PfmLyupIvLKK8cQF0wB9mdgvuXqT5IJ2ttoJDRmHK1TjFTcQNCoevN68s9Fxk/Dw3cRrr1 8fDw7uHYr4+tnBDJtKTr8Fm3WOfMGkn2fFoZHCzIlYAjon2LUg5rtn3cQI5Fvwcux3cLDh PUY99CcX/JeXQX3bSz6K2eZodAtLjCZ/kQqtyDRm76HsnlV6l8moeGxVrzbL3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727533086; 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=pk+mgy5CNcA1Z1rplf6Ai8TY25UmZduqxEMtxeukt1k=; b=lq6n0yPz3gPozM4glqMAif7F4hlkOzeEuuwQEUyhEb+M3X4wQFi5EvbpEvvedZmb41WXxX 09nFITawpjLD3kx19u2jNEbZRfViGoIBdYtcWga3cOCTyd7jFuchyg0FgX7OeqRH2vG+aJ tqrdK5Y0w25swDnZ/zJgPYSeuLA+xv0v8s9zZCMkEBu5Cc2mEkw22bkev3R/NTu0VKa5RZ T97mb62mkFtv586NcAsn1ao2tJ1v/SKc53ILdNY1WqlsPsJqHJ50obcPlzSExs1EP0qxxP iR2JAqKo43Vf8BP0tVxyYDUKfB3KU22XjKBanOGxQvbthbAppThBcF1JF5g8vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727533086; a=rsa-sha256; cv=none; b=oTZyKOPMpquSjbp2vAB48j4GF9lhLlP/QkNEdfkXcTstPxzrGPhBRJCLzAqTgphmHdw2uA Ry+EE2AuRD/OLmLAAWvWvZ2VN4TiRD0yTNtKvu5onvqESDVPn8kM9ukmo95UgulcqXxVVN aJc/cuPcC14TtCFTBhtwdcQRG2wgCyhb8QYGpCUzBjzzsfU0JK7GD7LNEckwDE0n1A/mAV brRYsjv5otG70L+tt4CmF3BzWczngO+HhbL4iLKAeLO3MMGQYsGeYX27wJF3pCj7CW8COz xn7Te/ixyvU9wSJMDWOvKbnWZ7q5HIc06bZf+5/zWaHeoq5WiREh84ofCjg58Q== 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 4XG8Z60pJGzSHg; Sat, 28 Sep 2024 14:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48SEI6eI072277; Sat, 28 Sep 2024 14:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SEI6Wp072274; Sat, 28 Sep 2024 14:18:06 GMT (envelope-from git) Date: Sat, 28 Sep 2024 14:18:06 GMT Message-Id: <202409281418.48SEI6Wp072274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 92b9946c916c - main - math/z3: Update to 4.13.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92b9946c916c8f9841f795df308ae373c6a4916b Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=92b9946c916c8f9841f795df308ae373c6a4916b commit 92b9946c916c8f9841f795df308ae373c6a4916b Author: Gleb Popov AuthorDate: 2024-09-28 14:17:38 +0000 Commit: Gleb Popov CommitDate: 2024-09-28 14:18:02 +0000 math/z3: Update to 4.13.2 Reported by: repology.org --- math/z3/Makefile | 2 +- math/z3/distinfo | 6 +- math/z3/files/patch-backport-2ce89e5f4 | 125 --------------------------------- math/z3/pkg-plist | 2 +- 4 files changed, 5 insertions(+), 130 deletions(-) diff --git a/math/z3/Makefile b/math/z3/Makefile index d58e82b1d59a..d793caa3e4a6 100644 --- a/math/z3/Makefile +++ b/math/z3/Makefile @@ -1,6 +1,6 @@ PORTNAME= z3 DISTVERSIONPREFIX= z3- -DISTVERSION= 4.13.0 +DISTVERSION= 4.13.2 CATEGORIES= math MAINTAINER= arrowd@FreeBSD.org diff --git a/math/z3/distinfo b/math/z3/distinfo index 57345d04df5a..8ff6c36ddf0d 100644 --- a/math/z3/distinfo +++ b/math/z3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713421143 -SHA256 (Z3Prover-z3-z3-4.13.0_GH0.tar.gz) = 01bcc61c8362e37bb89fd2430f7e3385e86df7915019bd2ce45de9d9bd934502 -SIZE (Z3Prover-z3-z3-4.13.0_GH0.tar.gz) = 5520232 +TIMESTAMP = 1727532409 +SHA256 (Z3Prover-z3-z3-4.13.2_GH0.tar.gz) = fd7dc6dd2633074f0a47670d6378b0e5c28c2c26f2b58aa23e9cd7f0bc9ba0dc +SIZE (Z3Prover-z3-z3-4.13.2_GH0.tar.gz) = 5578178 diff --git a/math/z3/files/patch-backport-2ce89e5f4 b/math/z3/files/patch-backport-2ce89e5f4 deleted file mode 100644 index 07161f1d64ed..000000000000 --- a/math/z3/files/patch-backport-2ce89e5f4 +++ /dev/null @@ -1,125 +0,0 @@ -From 2ce89e5f491fa817d02d8fdce8c62798beab258b Mon Sep 17 00:00:00 2001 -From: David Seifert <16636962+SoapGentoo@users.noreply.github.com> -Date: Mon, 29 Jul 2024 20:07:10 +0200 -Subject: [PATCH] Gcc 15 two phase (#7313) - -* Fix `-Wclass-memaccess` - -* Fix for GCC 15 two-phase lookup - -* GCC 15 is more aggressive about checking dependent names: - https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=r15-2117-g313afcfdabeab3 - -Bug: https://bugs.gentoo.org/936634 ---- - src/math/lp/lp_settings.h | 69 ++++++++++++++++----------------- - src/math/lp/static_matrix.h | 2 +- - src/math/lp/static_matrix_def.h | 2 +- - 3 files changed, 36 insertions(+), 37 deletions(-) - -diff --git src/math/lp/lp_settings.h src/math/lp/lp_settings.h -index d1a4be21c64..0d47877c76b 100644 ---- src/math/lp/lp_settings.h -+++ src/math/lp/lp_settings.h ---- src/math/lp/lp_settings.h.orig 2024-03-07 18:25:16 UTC -+++ src/math/lp/lp_settings.h -@@ -97,39 +97,39 @@ struct statistics { - }; - - struct statistics { -- unsigned m_make_feasible; -- unsigned m_total_iterations; -- unsigned m_iters_with_no_cost_growing; -- unsigned m_num_factorizations; -- unsigned m_num_of_implied_bounds; -- unsigned m_need_to_solve_inf; -- unsigned m_max_cols; -- unsigned m_max_rows; -- unsigned m_gcd_calls; -- unsigned m_gcd_conflicts; -- unsigned m_cube_calls; -- unsigned m_cube_success; -- unsigned m_patches; -- unsigned m_patches_success; -- unsigned m_hnf_cutter_calls; -- unsigned m_hnf_cuts; -- unsigned m_nla_calls; -- unsigned m_gomory_cuts; -- unsigned m_nla_add_bounds; -- unsigned m_nla_propagate_bounds; -- unsigned m_nla_propagate_eq; -- unsigned m_nla_lemmas; -- unsigned m_nra_calls; -- unsigned m_nla_bounds_improvements; -- unsigned m_horner_calls; -- unsigned m_horner_conflicts; -- unsigned m_cross_nested_forms; -- unsigned m_grobner_calls; -- unsigned m_grobner_conflicts; -- unsigned m_offset_eqs; -- unsigned m_fixed_eqs; -+ unsigned m_make_feasible = 0; -+ unsigned m_total_iterations = 0; -+ unsigned m_iters_with_no_cost_growing = 0; -+ unsigned m_num_factorizations = 0; -+ unsigned m_num_of_implied_bounds = 0; -+ unsigned m_need_to_solve_inf = 0; -+ unsigned m_max_cols = 0; -+ unsigned m_max_rows = 0; -+ unsigned m_gcd_calls = 0; -+ unsigned m_gcd_conflicts = 0; -+ unsigned m_cube_calls = 0; -+ unsigned m_cube_success = 0; -+ unsigned m_patches = 0; -+ unsigned m_patches_success = 0; -+ unsigned m_hnf_cutter_calls = 0; -+ unsigned m_hnf_cuts = 0; -+ unsigned m_nla_calls = 0; -+ unsigned m_gomory_cuts = 0; -+ unsigned m_nla_add_bounds = 0; -+ unsigned m_nla_propagate_bounds = 0; -+ unsigned m_nla_propagate_eq = 0; -+ unsigned m_nla_lemmas = 0; -+ unsigned m_nra_calls = 0; -+ unsigned m_nla_bounds_improvements = 0; -+ unsigned m_horner_calls = 0; -+ unsigned m_horner_conflicts = 0; -+ unsigned m_cross_nested_forms = 0; -+ unsigned m_grobner_calls = 0; -+ unsigned m_grobner_conflicts = 0; -+ unsigned m_offset_eqs = 0; -+ unsigned m_fixed_eqs = 0; - statistics() { reset(); } -- void reset() { memset(this, 0, sizeof(*this)); } -+ void reset() { *this = statistics{}; } - void collect_statistics(::statistics& st) const { - st.update("arith-factorizations", m_num_factorizations); - st.update("arith-make-feasible", m_make_feasible); -diff --git src/math/lp/static_matrix.h src/math/lp/static_matrix.h -index 9d6bb859964..42dd476b5d4 100644 ---- src/math/lp/static_matrix.h -+++ src/math/lp/static_matrix.h -@@ -79,7 +79,7 @@ class static_matrix (public) - ref(static_matrix & m, unsigned row, unsigned col):m_matrix(m), m_row(row), m_col(col) {} - ref & operator=(T const & v) { m_matrix.set( m_row, m_col, v); return *this; } - -- ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get(v.m_row, v.m_col)); return *this; } -+ ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get_elem(v.m_row, v.m_col)); return *this; } - - operator T () const { return m_matrix.get_elem(m_row, m_col); } - }; -diff --git src/math/lp/static_matrix_def.h src/math/lp/static_matrix_def.h -index 0370ee8990a..c3b2fc16821 100644 ---- src/math/lp/static_matrix_def.h -+++ src/math/lp/static_matrix_def.h ---- src/math/lp/static_matrix_def.h.orig 2024-03-07 18:25:16 UTC -+++ src/math/lp/static_matrix_def.h -@@ -92,7 +92,7 @@ static_matrix::static_matrix(static_matrix const - init_row_columns(m, m); - for (; m-- > 0; ) - for (auto & col : A.m_columns[m]) -- set(col.var(), m, A.get_value_of_column_cell(col)); -+ set(col.var(), m, A.get_column_cell(col)); - } - - template void static_matrix::clear() { diff --git a/math/z3/pkg-plist b/math/z3/pkg-plist index 09c647afface..41fa8dd7a334 100644 --- a/math/z3/pkg-plist +++ b/math/z3/pkg-plist @@ -19,5 +19,5 @@ lib/cmake/z3/Z3Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/z3/Z3Targets.cmake lib/libz3.so lib/libz3.so.4.13 -lib/libz3.so.4.13.0.0 +lib/libz3.so.4.13.2.0 libdata/pkgconfig/z3.pc