public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/polymake] f45: Rebuild for scip 10.1.0
@ 2026-09-22 21:46 Jerry James
0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-09-22 21:46 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/polymake
Branch : f45
Commit : c8c4a19558eeea91291ec17e35070fbcf331e139
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-09-22T10:34:52-06:00
Stats : +23/-29 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/polymake/c/c8c4a19558eeea91291ec17e35070fbcf331e139?branch=f45
Log:
Rebuild for scip 10.1.0
- Link with zlib-ng instead of zlib when building with SCIP
---
diff --git a/polymake-perl-5.44.patch b/polymake-perl-5.44.patch
index bd6b712..e63d9d7 100644
--- a/polymake-perl-5.44.patch
+++ b/polymake-perl-5.44.patch
@@ -18,7 +18,6 @@ Updates for perl 5.44.0
means that the set holds the only reference to that SV, so we remove it from
the set and decrement its refcount to 0.
-
--- apps/common/perllib/Visual/Wire.pm.orig 2025-09-30 07:03:08.000000000 -0600
+++ apps/common/perllib/Visual/Wire.pm 2026-08-31 11:51:46.555357710 -0600
@@ -81,7 +81,7 @@ use overload
@@ -214,7 +213,7 @@ Updates for perl 5.44.0
} } }
--- lib/core/src/perl/RefHash.xxs.orig 2025-09-30 07:03:08.000000000 -0600
-+++ lib/core/src/perl/RefHash.xxs 2026-09-05 16:06:20.049484146 -0600
++++ lib/core/src/perl/RefHash.xxs 2026-09-21 13:43:29.175248553 -0600
@@ -26,6 +26,9 @@ Perl_ppaddr_t def_pp_CONST, def_pp_ENTER
namespace {
@@ -273,43 +272,25 @@ Updates for perl 5.44.0
}
} } }
-@@ -874,20 +906,35 @@ PROTOTYPES: DISABLE
+@@ -874,7 +906,7 @@ PROTOTYPES: DISABLE
void is_keyword(SV* sv)
PPCODE:
{
-+#if PerlVersion < 5440
- if (is_keyword_constant(sv))
+- if (is_keyword_constant(sv))
++ if (is_keyword_constant(aTHX_ sv))
PUSHs(&PL_sv_yes);
else
PUSHs(&PL_sv_no);
-+#else
-+ if (is_keyword_constant(aTHX_ sv))
-+ PUSHs(&PL_sv_yes);
-+ else
-+ PUSHs(&PL_sv_no);
-+#endif
- }
-
- void is_keyword_or_hash(SV* sv)
+@@ -884,7 +916,7 @@ void is_keyword_or_hash(SV* sv)
PPCODE:
{
-+#if PerlVersion < 5440
if (SvROK(sv) ? (sv = SvRV(sv), SvTYPE(sv) == SVt_PVHV && !SvSTASH(sv))
- : is_keyword_constant(sv))
+- : is_keyword_constant(sv))
++ : is_keyword_constant(aTHX_ sv))
PUSHs(&PL_sv_yes);
else
PUSHs(&PL_sv_no);
-+#else
-+ if (SvROK(sv) ? (sv = SvRV(sv), SvTYPE(sv) == SVt_PVHV && !SvSTASH(sv))
-+ : is_keyword_constant(aTHX_ sv))
-+ PUSHs(&PL_sv_yes);
-+ else
-+ PUSHs(&PL_sv_no);
-+#endif
- }
-
- MODULE = Polymake::RefHash PACKAGE = Polymake::RefHash
-@@ -902,6 +949,9 @@ BOOT:
+@@ -902,6 +934,9 @@ BOOT:
{
my_pkg=gv_stashpv("Polymake::RefHash", FALSE);
allowed_pkgs=newAV();
@@ -319,8 +300,8 @@ Updates for perl 5.44.0
def_pp_CONST=PL_ppaddr[OP_CONST];
def_pp_ENTERSUB=PL_ppaddr[OP_ENTERSUB];
def_pp_HELEM=PL_ppaddr[OP_HELEM];
---- support/configure.pl.orig 2026-08-31 11:45:20.380880879 -0600
-+++ support/configure.pl 2026-08-31 11:57:25.617054968 -0600
+--- support/configure.pl.orig 2026-09-21 13:41:28.964242311 -0600
++++ support/configure.pl 2026-09-21 13:42:03.924260733 -0600
@@ -27,13 +27,13 @@ you can specify its location on the comm
./configure PERL=/path/to/my/new/perl [other options ...]
.
diff --git a/polymake-scip.patch b/polymake-scip.patch
new file mode 100644
index 0000000..b07e142
--- /dev/null
+++ b/polymake-scip.patch
@@ -0,0 +1,11 @@
+--- bundled/scip/support/configure.pl.orig 2026-09-21 13:41:18.918627795 -0600
++++ bundled/scip/support/configure.pl 2026-09-21 14:11:43.181055072 -0600
+@@ -45,7 +45,7 @@ sub proceed {
+ $LDFLAGS = "-L$libdir";
+ }
+
+- $LIBS="-lscip -lz";
++ $LIBS="-lscip -lz-ng";
+
+ # modified from scip/examples/CallableLibrary/src/circle.c
+ my $testcode = <<'---';
diff --git a/polymake.spec b/polymake.spec
index 284cdcc..a090352 100644
--- a/polymake.spec
+++ b/polymake.spec
@@ -54,6 +54,8 @@ Patch: %{name}-sympol.patch
Patch: %{name}-mongoc2.patch
# Adapt to perl 5.44
Patch: %{name}-perl-5.44.patch
+# Link with zlib-ng instead of zlib when building with SCIP
+Patch: %{name}-scip.patch
# Polymake 4.7 and later cannot be built on 32 bit platforms due to the
# limited integer ranges on those platforms.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 21:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 21:46 [rpms/polymake] f45: Rebuild for scip 10.1.0 Jerry James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox