[MacPorts] #66219: qt5-qtwebengine @5.15.11_0: does not build in macOS 10.14 (Mojave)
MacPorts
noreply at macports.org
Mon Nov 14 03:53:03 UTC 2022
#66219: qt5-qtwebengine @5.15.11_0: does not build in macOS 10.14 (Mojave)
------------------------------+---------------------------------
Reporter: JD-Veiga | Owner: MarcusCalhoun-Lopez
Type: defect | Status: assigned
Priority: Normal | Milestone:
Component: ports | Version: 2.8.0
Resolution: | Keywords:
Port: qt5-qtwebengine |
------------------------------+---------------------------------
Comment (by kencu):
making this change fixes the build on Mojave, but breaks the build on
Monterey with Xcode 14.1, hah hah:
{{{
$ git diff
diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
index ac20dc89602..7b16f822c2e 100644
--- a/aqua/qt5/Portfile
+++ b/aqua/qt5/Portfile
@@ -683,7 +683,7 @@ array set modules {
{"Qt WebEngine"}
"very large and relatively new"
"variant overrides: "
- "revision 0"
+ "revision 1"
"License: "
}
qtwebglplugin {
diff --git a/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff
b/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff
index bd303877741..9a72468cd85 100644
--- a/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff
+++ b/aqua/qt5/files/patch-qt5-qtwebengine-RectF-ambiguous.diff
@@ -8,7 +8,7 @@ index e41a894fc..be79bf7cf 100644
- return
gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
+// return
gfx::RectF(FindInPageRectFromRange(EphemeralRange(ActiveMatch())));
-+ CGRect r = FindInPageRectFromRange(EphemeralRange(ActiveMatch()));
++ FloatRect r = FindInPageRectFromRange(EphemeralRange(ActiveMatch()));
+ return gfx::RectF(r);
+
}
@@ -20,7 +20,7 @@ index e41a894fc..be79bf7cf 100644
DCHECK(!match.rect_.IsEmpty());
- match_rects.push_back(match.rect_);
+// match_rects.push_back(match.rect_);
-+ CGRect r = match.rect_;
++ FloatRect r = match.rect_;
+ match_rects.push_back(r);
+
}
@@ -36,7 +36,7 @@ index 48d06120e..e7963b327 100644
return float_rect;
- return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
+// return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(float_rect)));
-+ CGRect r = float_rect;
++ FloatRect r = float_rect;
+ return FloatRect(widget->BlinkSpaceToDIPs(gfx::RectF(r)));
}
@@ -51,7 +51,7 @@ index f7a348c81..45de8d332 100644
offset_container = WebAXObject(container);
- bounds_in_container = gfx::RectF(bounds);
+ //bounds_in_container = gfx::RectF(bounds);
-+ CGRect r = bounds;
++ FloatRect r = bounds;
+ bounds_in_container = gfx::RectF(r);
}
}}}
I really don't like having a patch that is conditional on the Xcode
(/clang) version. That is just bad.
Maybe we can find out instead why Mojave is not seeing a definition for
CGRect; that might be a nice fix for this.
Seems very odd that Monterey+ see such a definition, but Mojave and
Catalina do not.... what's up with that?
--
Ticket URL: <https://trac.macports.org/ticket/66219#comment:7>
MacPorts <https://www.macports.org/>
Ports system for macOS
More information about the macports-tickets
mailing list