diff --git a/srcpkgs/z3/patches/fix-gcc6-typecast.patch b/srcpkgs/z3/patches/fix-gcc6-typecast.patch deleted file mode 100644 index 10456d05026..00000000000 --- a/srcpkgs/z3/patches/fix-gcc6-typecast.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/util/debug.cpp 2015-10-05 14:07:19.000000000 +0200 -+++ src/util/debug.cpp 2016-09-23 09:56:52.501486862 +0200 -@@ -76,7 +76,7 @@ - for (;;) { - std::cerr << "(C)ontinue, (A)bort, (S)top, (T)hrow exception, Invoke (G)DB\n"; - char result; -- bool ok = (std::cin >> result); -+ bool ok = static_cast(std::cin >> result); - if (!ok) exit(ERR_INTERNAL_FATAL); // happens if std::cin is eof or unattached. - switch(result) { - case 'C': ---- src/util/mpz.cpp 2015-10-05 14:07:19.000000000 +0200 -+++ src/util/mpz.cpp 2016-09-23 10:10:19.116642705 +0200 -@@ -134,7 +134,7 @@ - #endif - - mpz one(1); -- set(m_two64, UINT64_MAX); -+ set(m_two64, static_cast(UINT64_MAX)); - add(m_two64, one, m_two64); - } - diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index 328d26e653e..9f33698e0dc 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,19 +1,18 @@ # Template file for 'z3' pkgname=z3 -version=4.4.1 -revision=3 +version=4.5.0 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" hostmakedepends="python" makedepends="libgomp-devel gmp-devel" -depends="python" -pycompile_module="z3.py z3consts.py z3core.py z3num.py z3poly.py z3printer.py - z3rcf.py z3test.py z3types.py z3util.py" +depends="python python-setuptools" +pycompile_module="z3" short_desc="Z3 theorem prover and SMT solver (command line + Python module)" maintainer="Christian Neukirchen " license="MIT" homepage="https://github.com/Z3Prover/z3" distfiles="https://github.com/Z3Prover/z3/archive/${pkgname}-${version}.tar.gz" -checksum=50967cca12c5c6e1612d0ccf8b6ebf5f99840a783d6cf5216336a2b59c37c0ce +checksum=aeae1d239c5e06ac183be7dd853775b84698db1265cb2258e5918a28372d4a0c do_configure() { case "$XBPS_TARGET_MACHINE" in @@ -33,15 +32,14 @@ do_build() { do_install() { vbin build/z3 vbin build/z3_tptp - vbin build/iz3 vbin build/maxsat - vinstall build/libz3.so 0755 usr/lib + vinstall build/libz3.so 0644 usr/lib for f in src/api/z3*.h; do vinstall $f 0644 usr/include done vinstall src/api/c++/z3++.h 0644 usr/include - for f in ${pycompile_module}; do - vinstall build/$f 0644 usr/lib/python2.7/site-packages + for f in build/python/z3/*; do + vinstall $f 0644 usr/lib/python2.7/site-packages/z3 done vlicense LICENSE.txt }