forked from pool/libminizinc
Accepting request 978466 from science
OBS-URL: https://build.opensuse.org/request/show/978466 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libminizinc?expand=0&rev=2
This commit is contained in:
commit
8e4284c1ae
28
0001-Add-memory-include-required-for-unique_ptr.patch
Normal file
28
0001-Add-memory-include-required-for-unique_ptr.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
From 0cbe77ac110d3335cafdd85196780e02d02753db Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||||
|
Date: Sat, 21 May 2022 12:37:06 +0200
|
||||||
|
Subject: [PATCH] Add <memory> include required for unique_ptr
|
||||||
|
|
||||||
|
Do no rely on <memory> to be included by some other header file.
|
||||||
|
Fixes build failures with GCC 12.1.0.
|
||||||
|
|
||||||
|
Fixes #583.
|
||||||
|
---
|
||||||
|
include/minizinc/utils.hh | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/include/minizinc/utils.hh b/include/minizinc/utils.hh
|
||||||
|
index 209869cb..0deedaed 100644
|
||||||
|
--- a/include/minizinc/utils.hh
|
||||||
|
+++ b/include/minizinc/utils.hh
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
#include <iomanip>
|
||||||
|
#include <iostream>
|
||||||
|
#include <limits>
|
||||||
|
+#include <memory>
|
||||||
|
#include <ratio>
|
||||||
|
#include <sstream>
|
||||||
|
#include <string>
|
||||||
|
--
|
||||||
|
2.36.0
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0893bb0d37336fdc75c5f8864135e1abc571af422df9fbd41432776cedd3ebbc
|
|
||||||
size 12965958
|
|
3
libminizinc-2.6.3.tar.gz
Normal file
3
libminizinc-2.6.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:740884d4eb8e7acf366efaad82efa0ca46dc4342afa5a6ecc1d749fcc4f96dd4
|
||||||
|
size 12967548
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat May 21 10:47:50 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- Update to version 2.6.3
|
||||||
|
https://github.com/MiniZinc/libminizinc/blob/2.6.3/changes.rst
|
||||||
|
- Fix build with GCC 12.1.0, add
|
||||||
|
0001-Add-memory-include-required-for-unique_ptr.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 28 12:47:40 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
- Depend on gecode for building the presolver, and recommend the
|
||||||
|
gecode-minizinc solver plugin.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 26 20:51:53 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Tue Apr 26 20:51:53 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
@ -17,24 +17,28 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: libminizinc
|
Name: libminizinc
|
||||||
Version: 2.6.2
|
Version: 2.6.3
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A high-level constraint modelling language
|
Summary: A high-level constraint modelling language
|
||||||
Group: Productivity/Scientific/Math
|
Group: Productivity/Scientific/Math
|
||||||
License: MPL-2.0
|
License: MPL-2.0
|
||||||
URL: https://www.minizinc.org/
|
URL: https://www.minizinc.org/
|
||||||
Source: https://github.com/MiniZinc/libminizinc/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://github.com/MiniZinc/libminizinc/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch0: 0001-Fix-missing-return-in-non-void-function.patch
|
Patch0: 0001-Fix-missing-return-in-non-void-function.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch1: 0001-Add-memory-include-required-for-unique_ptr.patch
|
||||||
BuildRequires: cmake >= 3.4.0
|
BuildRequires: cmake >= 3.4.0
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: pkgconfig(mpfr)
|
BuildRequires: pkgconfig(mpfr)
|
||||||
|
BuildRequires: gecode-devel
|
||||||
|
Recommends: gecode-minizinc
|
||||||
|
|
||||||
%description
|
%description
|
||||||
MiniZinc is a free and open-source constraint modeling language.
|
MiniZinc is a free and open-source constraint modeling language.
|
||||||
|
|
||||||
%package -n minizinc
|
%package -n minizinc
|
||||||
Summary: A high-level constraint modelling language
|
Summary: A high-level constraint modelling language
|
||||||
|
|
||||||
%description -n minizinc
|
%description -n minizinc
|
||||||
You can use MiniZinc to model constraint satisfaction and optimisation
|
You can use MiniZinc to model constraint satisfaction and optimisation
|
||||||
@ -44,7 +48,7 @@ compiled into FlatZinc, a solver input language that is understood
|
|||||||
by a wide range of solvers.
|
by a wide range of solvers.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: A high-level constraint modelling language
|
Summary: A high-level constraint modelling language
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: minizinc = %{version}
|
Requires: minizinc = %{version}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user