Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
cryptominisat
Commits:
077fd865 by Antonio Rojas at 2024-11-17T22:12:20+01:00
upgpkg: 5.11.22-3: Python 3.13 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + python-3.13.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = cryptominisat
pkgdesc = A modern, multi-threaded, feature-rich, simplifying SAT solver
pkgver = 5.11.22
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/msoos/cryptominisat/
arch = x86_64
license = MIT
@@ -11,7 +11,7 @@ pkgbase = cryptominisat
makedepends = python-build
makedepends = python-installer
makedepends = python-setuptools
- makedepends = python-toml
+ makedepends = python-tomli
makedepends = python-wheel
makedepends = vim
depends = gcc-libs
@@ -24,10 +24,12 @@ pkgbase = cryptominisat
source =
git+https://github.com/meelgroup/cadical.git#commit=c90592eab35a4a26ad901367db3cd727c5ab79c5
source = python-system-libs.patch
source = link-private.patch
+ source = python-3.13.patch
sha256sums =
0e6fc417cfbe03f1b993cdaf5ba8c22e98585f58321df24ad87a28fc3854bb2f
sha256sums =
e7e96d6e91bba3c9d28c798545f25236f107aec97780ee0c459352606c7c3a0c
sha256sums =
1769c624bb55a26de5a027f17bfaa323fac8d338db8069eeb76934aa3c0625d4
sha256sums =
d5f0d3c314a36283dbea3022c45d1c21b0857b6e5ccddec61985b15391f611bb
sha256sums =
a5006f49e8adf1474725d2a3e4205cdd65beb2f100f5538b2f89e14de0613e0f
+ sha256sums =
369e1e31936c0fce8960eb9130a03ec2550f5f379af2a31164c2b4234503e81c
pkgname = cryptominisat
=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
pkgname=cryptominisat
pkgver=5.11.22
-pkgrel=2
+pkgrel=3
_cadiback=ea65a9442fc2604ee5f4ffd0f0fdd0bf481d5b42
_cadical=c90592eab35a4a26ad901367db3cd727c5ab79c5
pkgdesc='A modern, multi-threaded, feature-rich, simplifying SAT solver'
@@ -20,7 +20,7 @@ makedepends=(cmake
python-build
python-installer
python-setuptools
- python-toml
+ python-tomli
python-wheel
vim)
optdepends=('python: python module')
@@ -28,12 +28,14 @@
source=(git+https://github.com/msoos/cryptominisat#tag=$pkgver
git+https://github.com/meelgroup/cadiback#commit=$_cadiback
git+https://github.com/meelgroup/cadical.git#commit=$_cadical
python-system-libs.patch
- link-private.patch)
+ link-private.patch
+ python-3.13.patch)
sha256sums=('0e6fc417cfbe03f1b993cdaf5ba8c22e98585f58321df24ad87a28fc3854bb2f'
'e7e96d6e91bba3c9d28c798545f25236f107aec97780ee0c459352606c7c3a0c'
'1769c624bb55a26de5a027f17bfaa323fac8d338db8069eeb76934aa3c0625d4'
'd5f0d3c314a36283dbea3022c45d1c21b0857b6e5ccddec61985b15391f611bb'
- 'a5006f49e8adf1474725d2a3e4205cdd65beb2f100f5538b2f89e14de0613e0f')
+ 'a5006f49e8adf1474725d2a3e4205cdd65beb2f100f5538b2f89e14de0613e0f'
+ '369e1e31936c0fce8960eb9130a03ec2550f5f379af2a31164c2b4234503e81c')
prepare() {
cd $pkgname
@@ -41,7 +43,8 @@ prepare() {
git cherry-pick -n 2905d6d9a755e9f20ec4a4c22f7f27070c4455e7 \
1d735b6ce0e3d17cdec182db491646fc89aa8cf4 # Fix python
build
patch -p1 -i ../python-system-libs.patch # Build python module against
shared library
- sed -e '/makeSuite(TestDump)/d' -i python/tests/test_pycryptosat.py # Remove
broken tests
+ patch -p1 -i ../python-3.13.patch # Fix tests with python 3.13
+ sed -e '/(TestDump)/d' -i python/tests/test_pycryptosat.py # Remove broken
tests
sed -e 's|/$COMPILE/|/${COMPILE//\\//\\\\/}/|' -i ../cadiback/configure #
Honor system build flags
patch -p1 -i ../link-private.patch # Link cadiback and cadical privately
}
=====================================
python-3.13.patch
=====================================
@@ -0,0 +1,21 @@
+diff --git a/python/tests/test_pycryptosat.py
b/python/tests/test_pycryptosat.py
+index a59e659a6..25f92fcb8 100644
+--- a/python/tests/test_pycryptosat.py
++++ b/python/tests/test_pycryptosat.py
+@@ -343,11 +343,11 @@ def run():
+ except AttributeError:
+ pass
+ suite = unittest.TestSuite()
+- suite.addTest(unittest.makeSuite(TestXor))
+- suite.addTest(unittest.makeSuite(InitTester))
+- suite.addTest(unittest.makeSuite(TestSolve))
+- suite.addTest(unittest.makeSuite(TestDump))
+- suite.addTest(unittest.makeSuite(TestSolveTimeLimit))
++ suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestXor))
++
suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(InitTester))
++ suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestSolve))
++ suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestDump))
++
suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TestSolveTimeLimit))
+
+ runner = unittest.TextTestRunner(verbosity=2)
+ result = runner.run(suite)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cryptominisat/-/commit/077fd86549ab0ce07563d07e72cc82dd4ab89371
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cryptominisat/-/commit/077fd86549ab0ce07563d07e72cc82dd4ab89371
You're receiving this email because of your account on gitlab.archlinux.org.
