From 8a2eec5e9fbbcc057f83573544bae6af79d326f006a8354778a2d9897ecf99ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 21 May 2022 22:13:14 +0000 Subject: [PATCH] Accepting request 978409 from home:StefanBruens:branches:science GCC 12 fix Update to 2.6.3 OBS-URL: https://build.opensuse.org/request/show/978409 OBS-URL: https://build.opensuse.org/package/show/science/libminizinc?expand=0&rev=3 --- ...mory-include-required-for-unique_ptr.patch | 28 +++++++++++++++++++ libminizinc-2.6.2.tar.gz | 3 -- libminizinc-2.6.3.tar.gz | 3 ++ libminizinc.changes | 14 ++++++++++ libminizinc.spec | 12 +++++--- 5 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 0001-Add-memory-include-required-for-unique_ptr.patch delete mode 100644 libminizinc-2.6.2.tar.gz create mode 100644 libminizinc-2.6.3.tar.gz diff --git a/0001-Add-memory-include-required-for-unique_ptr.patch b/0001-Add-memory-include-required-for-unique_ptr.patch new file mode 100644 index 0000000..a2163ec --- /dev/null +++ b/0001-Add-memory-include-required-for-unique_ptr.patch @@ -0,0 +1,28 @@ +From 0cbe77ac110d3335cafdd85196780e02d02753db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Sat, 21 May 2022 12:37:06 +0200 +Subject: [PATCH] Add include required for unique_ptr + +Do no rely on 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 + #include + #include ++#include + #include + #include + #include +-- +2.36.0 + diff --git a/libminizinc-2.6.2.tar.gz b/libminizinc-2.6.2.tar.gz deleted file mode 100644 index 279141c..0000000 --- a/libminizinc-2.6.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0893bb0d37336fdc75c5f8864135e1abc571af422df9fbd41432776cedd3ebbc -size 12965958 diff --git a/libminizinc-2.6.3.tar.gz b/libminizinc-2.6.3.tar.gz new file mode 100644 index 0000000..2043375 --- /dev/null +++ b/libminizinc-2.6.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:740884d4eb8e7acf366efaad82efa0ca46dc4342afa5a6ecc1d749fcc4f96dd4 +size 12967548 diff --git a/libminizinc.changes b/libminizinc.changes index 9814ef5..0eb0cd9 100644 --- a/libminizinc.changes +++ b/libminizinc.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat May 21 10:47:50 UTC 2022 - Stefan Brüns + +- 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 + +- 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 diff --git a/libminizinc.spec b/libminizinc.spec index 7458e00..e2a0c76 100644 --- a/libminizinc.spec +++ b/libminizinc.spec @@ -17,24 +17,28 @@ Name: libminizinc -Version: 2.6.2 +Version: 2.6.3 Release: 0 -Summary: A high-level constraint modelling language +Summary: A high-level constraint modelling language Group: Productivity/Scientific/Math License: MPL-2.0 URL: https://www.minizinc.org/ Source: https://github.com/MiniZinc/libminizinc/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM 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: gcc-c++ BuildRequires: pkgconfig(mpfr) +BuildRequires: gecode-devel +Recommends: gecode-minizinc %description MiniZinc is a free and open-source constraint modeling language. %package -n minizinc -Summary: A high-level constraint modelling language +Summary: A high-level constraint modelling language %description -n minizinc 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. %package devel -Summary: A high-level constraint modelling language +Summary: A high-level constraint modelling language Group: Development/Libraries/C and C++ Requires: minizinc = %{version}