Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package octave-forge-geometry for
openSUSE:Factory checked in at 2021-07-10 22:54:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-geometry (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-geometry.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-geometry"
Sat Jul 10 22:54:46 2021 rev:5 rq:905558 version:4.0.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/octave-forge-geometry/octave-forge-geometry.changes
2020-02-22 19:07:00.558414867 +0100
+++
/work/SRC/openSUSE:Factory/.octave-forge-geometry.new.2625/octave-forge-geometry.changes
2021-07-10 22:55:19.187380076 +0200
@@ -1,0 +2,6 @@
+Fri Jul 9 09:13:35 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Add upstream patch:
+ * compile-with-g++-v11.patch
+
+-------------------------------------------------------------------
New:
----
compile-with-g++-v11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-geometry.spec ++++++
--- /var/tmp/diff_new_pack.mlAzLh/_old 2021-07-10 22:55:19.555377236 +0200
+++ /var/tmp/diff_new_pack.mlAzLh/_new 2021-07-10 22:55:19.559377205 +0200
@@ -25,6 +25,8 @@
Group: Productivity/Scientific/Math
URL: https://octave.sourceforge.io/%{octpkg}/index.html
Source0:
https://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
+Patch0: compile-with-g++-v11.patch
BuildRequires: octave-devel >= 4.2.0
Requires: octave-cli >= 4.0.1
Requires: octave-forge-matgeom >= 1.0.0
@@ -37,6 +39,9 @@
%prep
%setup -q -c %{name}-%{version}
+pushd %{octpkg}-%{version}
+%patch0 -p1
+popd
%octave_pkg_src
%build
++++++ compile-with-g++-v11.patch ++++++
Description: Compile with g++ v11
Author: Rafael Laboissi??re <[email protected]>
Bug-Debian: https://bugs.debian.org/984266
Forwarded: no
Last-Update: 2021-07-06
--- octave-geometry-4.0.0.orig/src/martinez.cpp
+++ octave-geometry-4.0.0/src/martinez.cpp
@@ -26,7 +26,7 @@ void Martinez::print (SweepEvent& e)
// Compare two sweep events
// Return true means that e1 is placed at the event queue after e2, i.e,, e1
is processed by the algorithm after e2
-bool Martinez::SweepEventComp::operator() (SweepEvent* e1, SweepEvent* e2) {
+bool Martinez::SweepEventComp::operator() (SweepEvent* e1, SweepEvent* e2)
const {
if (e1->p.x > e2->p.x) // Different x-coordinate
return true;
if (e2->p.x > e1->p.x) // Different x-coordinate
@@ -40,7 +40,7 @@ bool Martinez::SweepEventComp::operator(
}
// e1 and a2 are the left events of line segments (e1->p, e1->other->p) and
(e2->p, e2->other->p)
-bool Martinez::SegmentComp::operator() (SweepEvent* e1, SweepEvent* e2) {
+bool Martinez::SegmentComp::operator() (SweepEvent* e1, SweepEvent* e2) const {
if (e1 == e2)
return false;
if (signedArea (e1->p, e1->other->p, e2->p) != 0 || signedArea (e1->p,
e1->other->p, e2->other->p) != 0) {
--- octave-geometry-4.0.0.orig/src/martinez.h
+++ octave-geometry-4.0.0/src/martinez.h
@@ -38,7 +38,7 @@ private:
struct SweepEvent;
struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*,
bool> { // for sorting edges in the sweep line
- bool operator() (SweepEvent* e1, SweepEvent* e2);
+ bool operator() (SweepEvent* e1, SweepEvent* e2) const;
};
struct SweepEvent {
@@ -65,7 +65,7 @@ private:
static void print (SweepEvent& e); // This function is intended for
debugging purposes
struct SweepEventComp : public binary_function<SweepEvent*,
SweepEvent*, bool> { // for sortening events
- bool operator() (SweepEvent* e1, SweepEvent* e2);
+ bool operator() (SweepEvent* e1, SweepEvent* e2) const;
};
/** @brief Event Queue */
--- octave-geometry-4.0.0.orig/src/polygon.cpp
+++ octave-geometry-4.0.0/src/polygon.cpp
@@ -94,7 +94,7 @@ void Polygon::move (double x, double y)
namespace { // start of anonymous namespace
struct SweepEvent;
struct SegmentComp : public binary_function<SweepEvent*, SweepEvent*,
bool> {
- bool operator() (SweepEvent* e1, SweepEvent* e2);
+ bool operator() (SweepEvent* e1, SweepEvent* e2) const;
};
struct SweepEvent {
@@ -117,7 +117,7 @@ namespace { // start of anonymous namesp
};
struct SweepEventComp : public binary_function<SweepEvent*,
SweepEvent*, bool> {
- bool operator() (SweepEvent* e1, SweepEvent* e2) {
+ bool operator() (SweepEvent* e1, SweepEvent* e2) const {
if (e1->p.x < e2->p.x) // Different x coordinate
return true;
if (e2->p.x < e1->p.x) // Different x coordinate
@@ -133,7 +133,7 @@ namespace { // start of anonymous namesp
} // end of anonymous namespace
-bool SegmentComp::operator() (SweepEvent* e1, SweepEvent* e2) {
+bool SegmentComp::operator() (SweepEvent* e1, SweepEvent* e2) const {
if (e1 == e2)
return false;
if (signedArea (e1->p, e1->other->p, e2->p) != 0 || signedArea (e1->p,
e1->other->p, e2->other->p) != 0) {
