public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/cryptominisat] f44: Version 5.14.7
@ 2026-07-08 19:15 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-08 19:15 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/cryptominisat
            Branch : f44
            Commit : e060ffc4bd99a4e50416bc0331a6fb78bcedd9f8
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-08T13:15:12-06:00
            Stats  : +7/-20 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/cryptominisat/c/e060ffc4bd99a4e50416bc0331a6fb78bcedd9f8?branch=f44

            Log:
            Version 5.14.7

- Drop upstreamed breakid patch
- Drop unused gperftools dependency

---
diff --git a/cryptominisat-breakid.patch b/cryptominisat-breakid.patch
deleted file mode 100644
index 43f9a60..0000000
--- a/cryptominisat-breakid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cryptominisat-release-5.13.0/src/cms_breakid.cpp.orig	2025-04-19 13:14:50.000000000 -0600
-+++ cryptominisat-release-5.13.0/src/cms_breakid.cpp	2025-04-25 08:24:47.937030696 -0600
-@@ -224,7 +224,7 @@ bool BreakID::doit()
-     breakid->set_useMatrixDetection(solver->conf.breakid_matrix_detect);
-     breakid->set_symBreakingFormLength(solver->conf.breakid_max_constr_per_permut);
-     breakid->start_dynamic_cnf(solver->nVars());
--    verb_print(1, "[breakid] version " << breakid->get_sha1_version());
-+    verb_print(1, "[breakid] version " << breakid->get_version_sha1());
- 
-     // We can fail adding clauses if they are UNSAT under the current assumptions
-     if (!add_clauses()) {

diff --git a/cryptominisat.spec b/cryptominisat.spec
index aecdab4..076730a 100644
--- a/cryptominisat.spec
+++ b/cryptominisat.spec
@@ -1,11 +1,11 @@
 # We bundle cadiback because it has been modified by the cryptominisat team to
 # present a library interface to cryptominisat
 %global cadiurl     https://github.com/meelgroup/cadiback
-%global cadicommit  35f027383abf3b4b52bbc8af789c8f1aa3d84ad2
+%global cadicommit  3b6a84062b1304433eb8960a4bff6b9a80de9c54
 %global giturl      https://github.com/msoos/cryptominisat
 
 Name:           cryptominisat
-Version:        5.14.5
+Version:        5.14.7
 Release:        %autorelease
 Summary:        SAT solver
 
@@ -20,8 +20,6 @@ Patch:          %{name}-cmake.patch
 Patch:          %{name}-picosat.patch
 # Use zlib-ng instead of zlib
 Patch:          %{name}-zlib-ng.patch
-# Adapt to a changed function name in breakid 3.1.3
-Patch:          %{name}-breakid.patch
 
 # See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
@@ -32,13 +30,13 @@ BuildOption(conf): -DCMAKE_INSTALL_BINDIR=bin
 BuildOption(conf): -DCMAKE_INSTALL_LIBDIR=%{_lib}
 BuildOption(conf): -DENABLE_ASSERTIONS:BOOL=OFF
 BuildOption(conf): -DNOBREAKID:BOOL=OFF
+BuildOption(conf): -Dbreakid_DIR=%{_prefix}
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  cmake(breakid)
 BuildRequires:  cmake(cadical)
 BuildRequires:  gcc-c++
-BuildRequires:  gperftools-devel
 BuildRequires:  help2man
 BuildRequires:  ninja-build
 BuildRequires:  picosat-devel
@@ -116,8 +114,8 @@ rm -fr src/mpicosat
 %pyproject_buildrequires
 
 %conf -p
-export CFLAGS='%{build_cflags} -DNTRACING'
-export CXXFLAGS='%{build_cxxflags} -DNTRACING'
+export CFLAGS='%{build_cflags} -I %{_includedir}/breakid -DNTRACING'
+export CXXFLAGS='%{build_cxxflags} -I %{_includedir}/breakid -DNTRACING'
 
 %install -a
 # We don't want the bundled cadiback

diff --git a/sources b/sources
index 3b70305..7548070 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cryptominisat-5.14.5.tar.gz) = a4a9c100b4a8e75b0739913a009b93ea1fea017c9ab25772290fe6ffd594c716320327e8024510062f8ee5d83706a1ea0e328271edba0bffff2b979145c796ff
-SHA512 (cadiback-35f0273.tar.gz) = 9539b9cd1e6c8a99c75eba21c9d8f83a6dde891944e62d694647cff0577bb13007086f53fcae67c3445fb555637ef57c1aff246ab4ccce21d769e5c3380d2736
+SHA512 (cryptominisat-5.14.7.tar.gz) = 7387f2866049455fa176b3844dd65800721ebf0170a11a3262cd35a05fb1db5d9422be62a0e976ba9abeb31ca074b38b95c188448eb9b2b8a51caba1ff4c46cc
+SHA512 (cadiback-3b6a840.tar.gz) = 8d3796b774c03ac6965a35c24cbb351623146fa8f0c6b98e2b63b888812724003c496b66ef04fbe1520fecb1e5a918e00f44b4b6feaf7849050d0520f37ba63b

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-08 19:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-08 19:15 [rpms/cryptominisat] f44: Version 5.14.7 Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox