diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 87bc185..fe484c2 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1725961134 -commit: 9a97068a726686bf792175d2b40a66f0e22d79ca +mtime: 1725961359 +commit: bc3f2ee17d072aa7d4f5a40deebe16f4e8c00930 url: https://src.opensuse.org/jengelh/gfan revision: master diff --git a/gfan-odr.patch b/gfan-odr.patch deleted file mode 100644 index 5219116..0000000 --- a/gfan-odr.patch +++ /dev/null @@ -1,82 +0,0 @@ -From a75e670e0e228e0a738eb65c7128a01446b4135c Mon Sep 17 00:00:00 2001 -From: Alois Wohlschlager -Date: Sat, 3 Jul 2021 11:07:23 +0200 -Subject: [PATCH] Fix ODR violations -Upstream: not reachable - -Various traversal code reused class names (Boundary, pathStepRidge, -pathStepFacet) in violation of the one definition rule. Put the -respective classes into anonymous namespaces to comply with ODR. ---- - src/gfanlib_traversal.cpp | 4 ++++ - src/symmetrictraversal.cpp | 4 ++++ - src/tropicaltraverse.cpp | 5 +++++ - 3 files changed, 13 insertions(+) - -Index: gfan0.7/src/gfanlib_traversal.cpp -=================================================================== ---- gfan0.7.orig/src/gfanlib_traversal.cpp -+++ gfan0.7/src/gfanlib_traversal.cpp -@@ -45,6 +45,8 @@ bool FanBuilder::process(FanTraverser &t - - - -+namespace -+{ - - /** - * Classes -@@ -159,6 +161,8 @@ public: - } - }; - -+} -+ - /** - Rewrite these comments. - -Index: gfan0.7/src/symmetrictraversal.cpp -=================================================================== ---- gfan0.7.orig/src/symmetrictraversal.cpp -+++ gfan0.7/src/symmetrictraversal.cpp -@@ -103,6 +103,8 @@ bool SymmetricTargetVertexSetBuilder::pr - in the computation is made these edges will be deleted. - */ - -+namespace -+{ - - class Boundary - { -@@ -231,6 +233,8 @@ public: - } - }; - -+} -+ - /** - Rewrite these comments. - -Index: gfan0.7/src/tropicaltraverse.cpp -=================================================================== ---- gfan0.7.orig/src/tropicaltraverse.cpp -+++ gfan0.7/src/tropicaltraverse.cpp -@@ -104,6 +104,9 @@ public: - } - }; - -+namespace -+{ -+ - /** - Rewrite these comments. - -@@ -135,6 +138,8 @@ struct pathStepFacet - - using namespace tropicalTraverseNamespace; - -+} -+ - /** - We need to simulate two mutually recursive functions. An actual - implementation of these two functions would propably not work since diff --git a/gfan.changes b/gfan.changes index 1dd5534..b75eed7 100644 --- a/gfan.changes +++ b/gfan.changes @@ -5,9 +5,9 @@ Tue Sep 10 09:05:35 UTC 2024 - Jan Engelhardt * Introduction of ``_tropicalprevariety`` which is much faster than the old ``_tropicalintersection``. - Add gfan-c++20.patch, gfan-gcd.patch, gfan-multiplicities.patch, - gfan-odr.patch, gfan-soplex.patch, gfan-warning.patch + gfan-soplex.patch, gfan-warning.patch - Delete gfan-warnings.diff & cddlib.patch - (replaced by gfan-warning.patch) + (replaced by gfan-warning.patch), delete gfan-odr.patch (obsolete) ------------------------------------------------------------------- Tue Jul 13 09:09:06 UTC 2021 - Alois Wohlschlager