[Git][debian-gis-team/geos][master] Replace doxygen 1.9.4 patch with upstream changes.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon Jul 25 19:29:55 BST 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / geos
Commits:
7936b209 by Bas Couwenberg at 2022-07-25T20:10:49+02:00
Replace doxygen 1.9.4 patch with upstream changes.
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/0001-Fix-multiple-docstring-issues-647.patch
- − debian/patches/doxygen-1.9.4.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+geos (3.11.0-3) UNRELEASED; urgency=medium
+
+ * Replace doxygen 1.9.4 patch with upstream changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 25 Jul 2022 20:10:35 +0200
+
geos (3.11.0-2) unstable; urgency=medium
* Drop obsolete dh_strip override, dbgsym migration complete.
=====================================
debian/patches/0001-Fix-multiple-docstring-issues-647.patch
=====================================
@@ -0,0 +1,83 @@
+Description: Fix multiple docstring issues
+Author: Sandro Mani <manisandro at gmail.com>
+Origin: https://github.com/libgeos/geos/pull/647
+Bug: https://github.com/libgeos/geos/issues/654
+Bug-Debian: https://bugs.debian.org/1015862
+
+diff --git a/include/geos/index/SpatialIndex.h b/include/geos/index/SpatialIndex.h
+index 308543ba2..b3842543b 100644
+--- a/include/geos/index/SpatialIndex.h
++++ b/include/geos/index/SpatialIndex.h
+@@ -70,7 +70,6 @@ public:
+ * intersect the query envelope.
+ *
+ * @param searchEnv the envelope to query for
+- * @return a list of the items found by the query in a newly allocated vector
+ */
+ //virtual std::vector<void*>* query(const geom::Envelope *searchEnv)=0;
+ virtual void query(const geom::Envelope* searchEnv, std::vector<void*>&) = 0;
+diff --git a/include/geos/index/VertexSequencePackedRtree.h b/include/geos/index/VertexSequencePackedRtree.h
+index b427298d0..0a2c040a0 100644
+--- a/include/geos/index/VertexSequencePackedRtree.h
++++ b/include/geos/index/VertexSequencePackedRtree.h
+@@ -136,7 +136,6 @@ public:
+ *
+ * @param queryEnv the query extent
+ * @param result vector to fill with results
+- * @return
+ */
+ void query(const Envelope& queryEnv, std::vector<std::size_t>& result) const;
+
+diff --git a/include/geos/noding/SegmentNodeList.h b/include/geos/noding/SegmentNodeList.h
+index 2ec78f342..8378df651 100644
+--- a/include/geos/noding/SegmentNodeList.h
++++ b/include/geos/noding/SegmentNodeList.h
+@@ -155,9 +155,6 @@ public:
+ * Adds an intersection into the list, if it isn't already there.
+ * The input segmentIndex is expected to be normalized.
+ *
+- * @return the SegmentIntersection found or added. It will be
+- * destroyed at SegmentNodeList destruction time.
+- *
+ * @param intPt the intersection Coordinate, will be copied
+ * @param segmentIndex
+ */
+diff --git a/include/geos/operation/buffer/OffsetCurve.h b/include/geos/operation/buffer/OffsetCurve.h
+index a624157b9..cc8526406 100644
+--- a/include/geos/operation/buffer/OffsetCurve.h
++++ b/include/geos/operation/buffer/OffsetCurve.h
+@@ -252,7 +252,6 @@ public:
+ * @param dist the offset distance
+ * @param bufParams the buffer parameters to use
+ * @param lineList the vector to populate with the return value
+- * @return the raw offset line
+ */
+ static void rawOffset(const LineString& geom, double dist, BufferParameters& bufParams, std::vector<CoordinateSequence*>& lineList);
+ static void rawOffset(const LineString& geom, double dist, std::vector<CoordinateSequence*>& lineList);
+diff --git a/include/geos/precision/CommonBitsRemover.h b/include/geos/precision/CommonBitsRemover.h
+index 03a1b75ff..d14a1040a 100644
+--- a/include/geos/precision/CommonBitsRemover.h
++++ b/include/geos/precision/CommonBitsRemover.h
+@@ -74,7 +74,6 @@ public:
+ *
+ * @param geom the Geometry from which to remove the common
+ * coordinate bits
+- * @return the shifted Geometry
+ */
+ void removeCommonBits(geom::Geometry* geom);
+
+diff --git a/include/geos/triangulate/polygon/PolygonEarClipper.h b/include/geos/triangulate/polygon/PolygonEarClipper.h
+index 6478bb2e4..43e14119a 100644
+--- a/include/geos/triangulate/polygon/PolygonEarClipper.h
++++ b/include/geos/triangulate/polygon/PolygonEarClipper.h
+@@ -184,7 +184,6 @@ public:
+ *
+ * @param polyShell the vertices of the polygon
+ * @param triListResult vector to fill in with the resultant Tri s
+- * @return a list of the Tris
+ */
+ static void triangulate(std::vector<Coordinate>& polyShell, TriList<Tri>& triListResult);
+
+--
+2.30.2
+
=====================================
debian/patches/doxygen-1.9.4.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Fix test_docs failure with Doxygen 1.9.4.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/libgeos/geos/issues/654
-Bug-Debian: https://bugs.debian.org/1015862
-Forwarded: https://github.com/libgeos/geos/issues/654#issue-1315175921
-
---- a/doxygen/check_doxygen_errors.cmake
-+++ b/doxygen/check_doxygen_errors.cmake
-@@ -32,7 +32,7 @@ if(EXISTS "${DOXYGEN_LOGFILE}")
-
- foreach(LINE ${LOGFILE})
- string(REGEX MATCH
-- ".*(not documented|ignoring unsupported tag).*" IGNORE ${LINE})
-+ ".*(not documented|ignoring unsupported tag|that does not return anything).*" IGNORE ${LINE})
- if("${IGNORE}" STREQUAL "")
- list(APPEND ERRORS ${LINE})
- endif()
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-doxygen-1.9.4.patch
+0001-Fix-multiple-docstring-issues-647.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/commit/7936b2093c69df3fa4860b6b4ff8a6fa57485003
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/commit/7936b2093c69df3fa4860b6b4ff8a6fa57485003
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220725/e6ac83c4/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list