public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/permlib] rawhide: Use the cmake declarative buildsystem
@ 2026-07-08 17:52 Jerry James
0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-07-08 17:52 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/permlib
Branch : rawhide
Commit : 7802029e2aad67781553679bfc61f101e7f66b1d
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-08T11:51:49-06:00
Stats : +119/-19 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/permlib/c/7802029e2aad67781553679bfc61f101e7f66b1d?branch=rawhide
Log:
Use the cmake declarative buildsystem
- Simplify the gcc6 patch
- Add patch to avoid deprecated unary_function and binary_function
- Drop unused dvipng BR
---
diff --git a/permlib-0.2.8-gcc6.patch b/permlib-0.2.8-gcc6.patch
index 9cad7a7..e46833f 100644
--- a/permlib-0.2.8-gcc6.patch
+++ b/permlib-0.2.8-gcc6.patch
@@ -1,15 +1,11 @@
---- include/permlib/prime_helper.h.orig 2012-09-27 04:21:58.000000000 -0600
-+++ include/permlib/prime_helper.h 2016-02-05 12:21:52.436630308 -0700
-@@ -80,9 +80,10 @@ private:
+--- include/permlib/prime_helper.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/prime_helper.h 2026-07-08 11:28:06.352132938 -0600
+@@ -80,7 +80,7 @@ private:
static const unsigned int largestPrime;
};
-const unsigned int PrimeHelper::numberOfPrimes = 170;
-+#define PRIME_HELPER_NUMBER_OF_PRIMES 170
-+const unsigned int PrimeHelper::numberOfPrimes = PRIME_HELPER_NUMBER_OF_PRIMES;
++constexpr unsigned int PrimeHelper::numberOfPrimes = 170;
// Probably this list is incomplete ;)
--const unsigned int PrimeHelper::primes[numberOfPrimes] = {
-+const unsigned int PrimeHelper::primes[PRIME_HELPER_NUMBER_OF_PRIMES] = {
+ const unsigned int PrimeHelper::primes[numberOfPrimes] = {
2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,59,61,67,71,73,79,83,89,97,101,103,107,109,113,
- 127,131,137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,227,229,233,239,241,251,257,263,269,271,277,281,
- 283,293,307,311,313,317,331,337,347,349,353,359,367,373,379,383,389,397,401,409,419,421,431,433,439,443,449,457,461,463,
diff --git a/permlib-0.2.9-deprecated.patch b/permlib-0.2.9-deprecated.patch
new file mode 100644
index 0000000..271d4db
--- /dev/null
+++ b/permlib-0.2.9-deprecated.patch
@@ -0,0 +1,99 @@
+--- include/permlib/bsgs.h.orig 2019-02-05 21:29:58.286974413 -0700
++++ include/permlib/bsgs.h 2026-07-08 11:41:22.945754783 -0600
+@@ -455,7 +455,7 @@ void BSGS<PERM, TRANS>::stripRedundantBa
+ * stabilizer chain are next to each other.
+ */
+ template <class PERM>
+-class StrongGeneratingSetSorter : public std::binary_function<typename PERM::ptr, typename PERM::ptr, bool> {
++class StrongGeneratingSetSorter {
+ public:
+ /**
+ * @param baseBegin begin-iterator(dom_int) to the base relative to which the strong generating set is to be sorted
+--- include/permlib/predicate/identity_predicate.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/predicate/identity_predicate.h 2026-07-08 11:37:00.322826648 -0600
+@@ -39,7 +39,7 @@ namespace permlib {
+
+ /// predicate matching a permutation if it stabilizes a given list of points pointwise
+ template <class PERM>
+-class IdentityPredicate : public std::unary_function<typename PERM::ptr, bool> {
++class IdentityPredicate {
+ public:
+ /// evaluate predicate
+ bool operator()(const typename PERM::ptr &p) const {
+--- include/permlib/predicate/pointwise_stabilizer_predicate.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/predicate/pointwise_stabilizer_predicate.h 2026-07-08 11:35:25.012773434 -0600
+@@ -39,7 +39,7 @@ namespace permlib {
+
+ /// predicate matching a permutation if it stabilizes a given list of points pointwise
+ template <class PERM>
+-class PointwiseStabilizerPredicate : public std::unary_function<typename PERM::ptr, bool> {
++class PointwiseStabilizerPredicate {
+ public:
+ /// constructor
+ /**
+--- include/permlib/predicate/stabilizes_point_predicate.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/predicate/stabilizes_point_predicate.h 2026-07-08 11:35:53.932506524 -0600
+@@ -39,7 +39,7 @@ namespace permlib {
+
+ /// predicate matching points that are stabilized by given permutations
+ template <class PERM>
+-class StabilizesPointPredicate : public std::unary_function<unsigned long, bool> {
++class StabilizesPointPredicate {
+ public:
+ /// constructor
+ /**
+--- include/permlib/predicate/subgroup_predicate.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/predicate/subgroup_predicate.h 2026-07-08 11:38:04.370606440 -0600
+@@ -42,7 +42,7 @@ class RefinementFamily;
+
+ /// abstract base class for subgroup (and coset) predicates
+ template <class PERM>
+-class SubgroupPredicate : public std::unary_function<PERM, bool> {
++class SubgroupPredicate {
+ public:
+ /// virtual destructor
+ virtual ~SubgroupPredicate() {}
+--- include/permlib/search/partition/backtrack_refinement.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/search/partition/backtrack_refinement.h 2026-07-08 11:38:44.674020980 -0600
+@@ -67,7 +67,7 @@ private:
+
+ typedef typename Refinement<PERM>::RefinementPtr RefinementPtr;
+
+- struct RefinementSorter : public std::binary_function<RefinementPtr, RefinementPtr, bool> {
++ struct RefinementSorter {
+ RefinementSorter(const BaseSorterByReference& sorter, const Partition* pi) : m_sorter(sorter), m_pi(pi) {}
+
+ bool operator()(RefinementPtr a, RefinementPtr b) const {
+--- include/permlib/sorter/base_sorter.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/sorter/base_sorter.h 2026-07-08 11:35:02.316238582 -0600
+@@ -39,7 +39,7 @@ namespace permlib {
+
+ /// A sorter that sorts a sequence with respect to a given input ordering
+ template<class ORDER>
+-class OrderedSorter : public std::binary_function<unsigned long, unsigned long, bool> {
++class OrderedSorter {
+ public:
+ /// true iff a preceeds b in given sequence
+ bool operator() (unsigned long a, unsigned long b) const {
+--- include/permlib/sorter/group_sorter.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/sorter/group_sorter.h 2026-07-08 11:39:03.465991424 -0600
+@@ -39,7 +39,7 @@ namespace permlib {
+
+ /// A sorter that sorts a sequence of permutations with respect to a ordering induced by a base
+ template <class PERM>
+-class GroupSorter : public std::binary_function<PERM, PERM, bool>{
++class GroupSorter {
+ public:
+ /// constructor
+ /**
+--- include/permlib/sorter/trivial_sorter.h.orig 2016-07-16 11:37:15.000000000 -0600
++++ include/permlib/sorter/trivial_sorter.h 2026-07-08 11:39:18.946003333 -0600
+@@ -36,7 +36,7 @@
+ namespace permlib {
+
+ /// A sorter that sorts a sequence in natural numerical order (1 < 2 < 3 < ...)
+-class TrivialSorter : public std::binary_function<unsigned long, unsigned long, bool>{
++class TrivialSorter {
+ public:
+ /// true iff a < b
+ bool operator() (unsigned long a, unsigned long b) const {
diff --git a/permlib.spec b/permlib.spec
index 5fad1f1..d96e69c 100644
--- a/permlib.spec
+++ b/permlib.spec
@@ -1,9 +1,12 @@
# There are no ELF objects in this package, so turn off debuginfo generation.
%global debug_package %{nil}
+# Whether to run tests
+%bcond ctest 1
+
Name: permlib
Version: 0.2.9
-Release: 26%{?dist}
+Release: 27%{?dist}
Summary: Library for permutation computations
License: BSD-3-Clause
@@ -16,13 +19,15 @@ Source1: %{name}-Doxyfile
Patch: %{name}-0.2.8-gcc6.patch
# Adapt to changes in recent versions of boost
Patch: %{name}-0.2.9-boost.patch
+# Remove deprecated use of std::unary_function and std::binary_function
+Patch: %{name}-0.2.9-deprecated.patch
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
+BuildSystem: cmake
+BuildOption(conf): -DCMAKE_POLICY_VERSION_MINIMUM=3.5
BuildRequires: boost-devel
-BuildRequires: cmake
-BuildRequires: dvipng
BuildRequires: doxygen-latex
BuildRequires: gcc-c++
BuildRequires: ghostscript
@@ -63,10 +68,7 @@ sed "s/@VERSION@/%{version}/" %{SOURCE1} > Doxyfile
# Remove flags that break the build with boost 1.90.0
sed -i 's/ -ansi -pedantic//' CMakeLists.txt
-%build
-%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5
-%cmake_build
-
+%build -a
# Build the documentation
mkdir doc
doxygen
@@ -81,15 +83,18 @@ rm -f doc/html/installdox
mkdir -p $RPM_BUILD_ROOT%{_includedir}
cp -a include/%{name} $RPM_BUILD_ROOT%{_includedir}
-%check
-%ctest
-
%files devel
%doc AUTHORS CHANGELOG doc/html
%license LICENSE
%{_includedir}/permlib
%changelog
+* Wed Jul 08 2026 Jerry James <loganjerry@gmail.com> - 0.2.9-27
+- Use the cmake declarative buildsystem
+- Simplify the gcc6 patch
+- Add patch to avoid deprecated unary_function and binary_function
+- Drop unused dvipng BR
+
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-08 17:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-08 17:52 [rpms/permlib] rawhide: Use the cmake declarative buildsystem Jerry James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox