forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-office/scribus: fixed one boost issue in 1.6.1-r1
Bug: https://bugs.gentoo.org/932492 Signed-off-by: Miroslav Šulc <[email protected]>
- Loading branch information
Showing
2 changed files
with
40 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
From 3e80b387a226f1abac2bcce6e4300467c189d264 Mon Sep 17 00:00:00 2001 | ||
From: Jean Ghali <[email protected]> | ||
Date: Sat, 1 Jun 2024 22:04:13 +0000 | ||
Subject: [PATCH] #17229: scribus fails to compile with boost 1.85.0 | ||
|
||
git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26170 11d20701-8431-0410-a711-e3c959e3b870 | ||
--- a/scribus/third_party/lib2geom/point.h | ||
+++ b/scribus/third_party/lib2geom/point.h | ||
@@ -121,10 +121,14 @@ class Point { | ||
|
||
Point &operator*=(Matrix const &m); | ||
|
||
- inline int operator == (const Point &in_pnt) { | ||
+ inline bool operator==(const Point &in_pnt) const { | ||
return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); | ||
} | ||
|
||
+ inline bool operator!=(const Point &in_pnt) const { | ||
+ return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); | ||
+ } | ||
+ | ||
friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); | ||
}; | ||
|
||
@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { | ||
return ret; | ||
} | ||
|
||
-//IMPL: boost::EqualityComparableConcept | ||
-inline bool operator==(Point const &a, Point const &b) { | ||
- return (a[X] == b[X]) && (a[Y] == b[Y]); | ||
-} | ||
-inline bool operator!=(Point const &a, Point const &b) { | ||
- return (a[X] != b[X]) || (a[Y] != b[Y]); | ||
-} | ||
- | ||
/** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ | ||
inline bool operator<=(Point const &a, Point const &b) { | ||
return ( ( a[Y] < b[Y] ) || |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters