From 5e5e6894c98cf56e6df875d84ac4a05ad97b4591c58c75dc1bf795582afef3ca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 20 Sep 2020 07:12:23 +0000 Subject: [PATCH] - Update to release 0.94l OBS-URL: https://build.opensuse.org/package/show/science/cddlib?expand=0&rev=25 --- ...xtend-extern-C-block-in-header-files.patch | 70 ------------------- cddlib-0.94k.tar.gz | 3 - cddlib-0.94l.tar.gz | 3 + cddlib.changes | 6 ++ cddlib.spec | 3 +- 5 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 0001-build-extend-extern-C-block-in-header-files.patch delete mode 100644 cddlib-0.94k.tar.gz create mode 100644 cddlib-0.94l.tar.gz diff --git a/0001-build-extend-extern-C-block-in-header-files.patch b/0001-build-extend-extern-C-block-in-header-files.patch deleted file mode 100644 index 6e41086..0000000 --- a/0001-build-extend-extern-C-block-in-header-files.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1412ca0120841c7f8a83633c5dc857add060445f Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sat, 19 Sep 2020 13:03:18 +0200 -Subject: [PATCH] build: extend "extern C" block in header files -Upstream: https://github.com/cddlib/cddlib/pull/46 - -I am getting compile errors in sympol when I try to remove -their extern "C" hack: - - extern "C" { - #include - } - -Turns out this is because cdd's own extern C are not broad enough. ---- - lib-src/cdd.h | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/lib-src/cdd.h b/lib-src/cdd.h -index ebc52cc..d78d5d1 100644 ---- a/lib-src/cdd.h -+++ b/lib-src/cdd.h -@@ -35,6 +35,10 @@ extern mytype dd_purezero; - extern mytype dd_minuszero; - extern mytype dd_minusone; - -+#if defined(__cplusplus) -+extern "C" { -+#endif -+ - extern time_t dd_statStartTime; /* cddlib starting time */ - extern long dd_statBApivots; /* basis finding pivots */ - extern long dd_statCCpivots; /* criss-cross pivots */ -@@ -53,10 +57,6 @@ extern dd_boolean dd_choiceLexicoPivotQ; /* whether to use the lexicographic - - /* ---------- FUNCTIONS MEANT TO BE PUBLIC ---------- */ - --#if defined(__cplusplus) --extern "C" { --#endif -- - /* basic matrix manipulations */ - void dd_InitializeArow(dd_colrange,dd_Arow *); - void dd_InitializeAmatrix(dd_rowrange,dd_colrange,dd_Amatrix *); -@@ -211,10 +211,6 @@ void dd_WriteLPMode(FILE *f); - dd_MatrixPtr dd_FourierElimination(dd_MatrixPtr,dd_ErrorType *); - dd_MatrixPtr dd_BlockElimination(dd_MatrixPtr, dd_colset, dd_ErrorType *); - --#if defined(__cplusplus) --} --#endif -- - /* ---------- FUNCTIONS MEANT TO BE NON-PUBLIC ---------- */ - void dd_QuickSort(dd_rowindex, long, long, dd_Amatrix, long); - void dd_RandomPermutation(dd_rowindex, long, unsigned int seed); -@@ -285,8 +281,8 @@ dd_PolyhedraPtr dd_CreatePolyhedraData(dd_rowrange, dd_colrange); - dd_boolean dd_InitializeConeData(dd_rowrange, dd_colrange, dd_ConePtr*); - dd_boolean dd_AppendMatrix2Poly(dd_PolyhedraPtr*, dd_MatrixPtr); - -- -- -- -+#if defined(__cplusplus) -+} -+#endif - - /* end of cddlib.h */ --- -2.28.0 - diff --git a/cddlib-0.94k.tar.gz b/cddlib-0.94k.tar.gz deleted file mode 100644 index 71be9bb..0000000 --- a/cddlib-0.94k.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de7397d7fe32758a6b53453a889ec7619b6c68a15d84eb132421f3d7d457be44 -size 1363115 diff --git a/cddlib-0.94l.tar.gz b/cddlib-0.94l.tar.gz new file mode 100644 index 0000000..7961346 --- /dev/null +++ b/cddlib-0.94l.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ef6b1ee44509a26d480cda699ca1a9a38ecc9a2aba5092dbd7390ca285769e0 +size 1350988 diff --git a/cddlib.changes b/cddlib.changes index 7738a43..d3e5fd4 100644 --- a/cddlib.changes +++ b/cddlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Sep 20 06:38:16 UTC 2020 - Jan Engelhardt + +- Update to release 0.94l + * Merged 0001-build-extend-extern-C-block-in-header-files.patch + ------------------------------------------------------------------- Sat Sep 19 09:18:52 UTC 2020 - Jan Engelhardt diff --git a/cddlib.spec b/cddlib.spec index 4d21a59..ed2f808 100644 --- a/cddlib.spec +++ b/cddlib.spec @@ -18,7 +18,7 @@ Name: cddlib %define lname libcdd0 -Version: 0.94k +Version: 0.94l Release: 0 Summary: Library for finding vertices of convex polytopes License: GPL-2.0-or-later @@ -26,7 +26,6 @@ Group: Productivity/Scientific/Math URL: https://www.inf.ethz.ch/personal/fukudak/cdd_home/ Source: https://github.com/cddlib/cddlib/releases/download/%version/%name-%version.tar.gz -Patch1: 0001-build-extend-extern-C-block-in-header-files.patch BuildRequires: fdupes BuildRequires: gmp-devel >= 3