[PR PATCH] minisat: update to 2.2.1, switch to maintained fork.

[PR PATCH] minisat: update to 2.2.1, switch to maintained fork.

[hazen2215]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

There is a new pull request by hazen2215 against master on the void-packages repository

https://github.com/hazen2215/void-packages minisat
https://github.com/void-linux/void-packages/pull/44680

minisat: update to 2.2.1, switch to maintained fork.
<!-- Uncomment relevant sections and delete options which are not applicable -->

switch to maintained fork (https://github.com/stp/minisat)

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)


A patch file from https://github.com/void-linux/void-packages/pull/44680.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-minisat-44680.patch --]
[-- Type: text/x-diff, Size: 5988 bytes --]

From abc66a60afbe0ac9a05da5460f4954a9175f8a0f Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Wed, 28 Jun 2023 21:27:10 +0900
Subject: [PATCH] minisat: update to 2.2.1, switch to maintained fork.

---
 common/shlibs                          |  1 +
 srcpkgs/libminisat                     |  1 +
 srcpkgs/libminisat-devel               |  1 +
 srcpkgs/minisat/patches/fix-musl.patch | 41 ++++++++++++++++++++++++++
 srcpkgs/minisat/patches/friend.patch   | 21 -------------
 srcpkgs/minisat/template               | 37 ++++++++++++++---------
 6 files changed, 67 insertions(+), 35 deletions(-)
 create mode 120000 srcpkgs/libminisat
 create mode 120000 srcpkgs/libminisat-devel
 create mode 100644 srcpkgs/minisat/patches/fix-musl.patch
 delete mode 100644 srcpkgs/minisat/patches/friend.patch

diff --git a/common/shlibs b/common/shlibs
index ef71bae3f9a7..17016c656d18 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4278,3 +4278,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libminisat.so.2 libminisat-2.2.1_1
diff --git a/srcpkgs/libminisat b/srcpkgs/libminisat
new file mode 120000
index 000000000000..37658eb5157a
--- /dev/null
+++ b/srcpkgs/libminisat
@@ -0,0 +1 @@
+minisat
\ No newline at end of file
diff --git a/srcpkgs/libminisat-devel b/srcpkgs/libminisat-devel
new file mode 120000
index 000000000000..37658eb5157a
--- /dev/null
+++ b/srcpkgs/libminisat-devel
@@ -0,0 +1 @@
+minisat
\ No newline at end of file
diff --git a/srcpkgs/minisat/patches/fix-musl.patch b/srcpkgs/minisat/patches/fix-musl.patch
new file mode 100644
index 000000000000..3a25d5964318
--- /dev/null
+++ b/srcpkgs/minisat/patches/fix-musl.patch
@@ -0,0 +1,41 @@
+From 4c8afcd6bfbf2cbdb5ebe271f20503a6d34d7d49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Bar=C4=87?= <xgqt@gentoo.org>
+Date: Mon, 6 Feb 2023 17:09:18 +0100
+Subject: [PATCH] utils/System.*: use fpu_control only on glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: https://github.com/vprover/vampire/pull/432
+Signed-off-by: Maciej Barć <xgqt@gentoo.org>
+---
+ minisat/utils/System.cc | 2 +-
+ minisat/utils/System.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/minisat/utils/System.cc b/minisat/utils/System.cc
+index 282f98ed..112708f7 100644
+--- a/minisat/utils/System.cc
++++ b/minisat/utils/System.cc
+@@ -97,7 +97,7 @@ double Minisat::memUsedPeak(bool /*strictlyPeak*/) { return 0; }
+ 
+ void Minisat::setX86FPUPrecision()
+ {
+-#if defined(__linux__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW)
++#if defined(__GLIBC__) && defined(_FPU_EXTENDED) && defined(_FPU_DOUBLE) && defined(_FPU_GETCW)
+     // Only correct FPU precision on Linux architectures that needs and supports it:
+     fpu_control_t oldcw, newcw;
+     _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw);
+diff --git a/minisat/utils/System.h b/minisat/utils/System.h
+index a51d4c2e..189fcbff 100644
+--- a/minisat/utils/System.h
++++ b/minisat/utils/System.h
+@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+ 
+-#if defined(__linux__)
++#if defined(__GLIBC__)
+ #include <fpu_control.h>
+ #endif
+ 
diff --git a/srcpkgs/minisat/patches/friend.patch b/srcpkgs/minisat/patches/friend.patch
deleted file mode 100644
index 69563f1fec96..000000000000
--- a/srcpkgs/minisat/patches/friend.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/core/SolverTypes.h	2010-07-10 18:07:36.000000000 +0200
-+++ b/core/SolverTypes.h	2020-05-27 14:12:09.005969769 +0200
-@@ -46,8 +46,8 @@
- struct Lit {
-     int     x;
- 
-     // Use this as a constructor:
--    friend Lit mkLit(Var var, bool sign = false);
-+    Lit mkLit(Var var, bool sign = false);
- 
-     bool operator == (Lit p) const { return x == p.x; }
-     bool operator != (Lit p) const { return x != p.x; }
-@@ -55,7 +55,7 @@
- };
- 
- 
--inline  Lit  mkLit     (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
-+inline  Lit  mkLit     (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
- inline  Lit  operator ~(Lit p)              { Lit q; q.x = p.x ^ 1; return q; }
- inline  Lit  operator ^(Lit p, bool b)      { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
- inline  bool sign      (Lit p)              { return p.x & 1; }
diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template
index c71b704145bb..c0f5cedb6bc1 100644
--- a/srcpkgs/minisat/template
+++ b/srcpkgs/minisat/template
@@ -1,24 +1,33 @@
 # Template file for 'minisat'
 pkgname=minisat
-version=2.2.0
-revision=2
-build_wrksrc=simp
-build_style=gnu-makefile
+version=2.2.1
+revision=1
+build_style=cmake
 makedepends="zlib-devel"
-archs="i686 x86_64"
-short_desc="A minimalistic and high-performance SAT solver"
+short_desc="Minimalistic and high-performance SAT solver"
 maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
 license="MIT"
 homepage="http://minisat.se/MiniSat.html"
-distfiles="http://minisat.se/downloads/minisat-${version}.tar.gz"
-checksum=92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
+distfiles="https://github.com/stp/minisat/archive/refs/tags/releases/${version}.tar.gz"
+checksum=432985833596653fcd698ab439588471cc0f2437617d0df2bb191a0252ba423d
 
-do_build() {
-	CFLAGS+=" -I${wrksrc}"
-	make ${makejobs} MROOT=${wrksrc} r
+post_install() {
+	vlicense LICENSE
 }
 
-do_install() {
-	vbin minisat_release minisat
-	vlicense ../LICENSE
+libminisat_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+libminisat-devel_package() {
+	depends="libminisat>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
 }

Re: minisat: update to 2.2.1, switch to maintained fork.

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/44680#issuecomment-1611629439

Comment:
Not sure if we want to switch to a random fork.

Re: minisat: update to 2.2.1, switch to maintained fork.

[hazen2215]

[-- Attachment #1: Type: text/plain, Size: 415 bytes --]

New comment by hazen2215 on void-packages repository

https://github.com/void-linux/void-packages/pull/44680#issuecomment-1615439607

Comment:
Arch, freebsd, gentoo, nix, opensuse use either https://github.com/msoos/minisat or https://github.com/stp/minisat (more up-to-date) which are maintained by same person.
They are identical at version 2.2.1, except minisat/utils/System.cc (stp/minisat seems more correct)

Re: [PR PATCH] [Closed]: minisat: update to 2.2.1, switch to maintained fork.

[hazen2215]

[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]

There's a closed pull request on the void-packages repository

minisat: update to 2.2.1, switch to maintained fork.
https://github.com/void-linux/void-packages/pull/44680

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

switch to maintained fork (https://github.com/stp/minisat)

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)