<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a383ceb01653d0fdc98c1121b42a418ca0848d73">https://github.com/macports/macports-ports/commit/a383ceb01653d0fdc98c1121b42a418ca0848d73</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a383ceb01653d0fdc98c1121b42a418ca0848d73
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Fri Aug 30 20:26:12 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    LyX: add a patch to Qt4 variant for broken QRawFont
</span>---
 aqua/LyX/Portfile                            |  7 +++++++
 aqua/LyX/files/patch-GuiFontMetrics.cpp.diff | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/LyX/Portfile b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec484532aca..624c520aa1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/LyX/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +93,12 @@ variant qt4 conflicts qt5 description {Use Qt4} {
</span>                         --with-version-suffix=-${branch} \
                         --with-qt-dir=${prefix}/libexec/qt4 \
                         --disable-qt5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # QRawFont is supposed to work, but does not:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # GuiFontMetrics.cpp:127:9: error: 'QRawFont' was not declared in this scope; did you mean 'QFont'?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Anyway, it seems to have issues in Qt4:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # https://stackoverflow.com/questions/12597595/qrawfontfromfont-not-working-correctly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-GuiFontMetrics.cpp.diff
</span> }
 
 variant qt5 conflicts qt4 description {Use Qt5} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,6 +123,7 @@ variant qt5 conflicts qt4 description {Use Qt5} {
</span> 
 # error: '-fobjc-exceptions' is required to enable Objective-C exception syntax
 if {[string match *gcc* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # This must be set in pre-configure:
</span>     pre-configure {
         configure.objcflags-append \
                         -fobjc-exceptions
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/LyX/files/patch-GuiFontMetrics.cpp.diff b/aqua/LyX/files/patch-GuiFontMetrics.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..301693c9bd1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/LyX/files/patch-GuiFontMetrics.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/frontends/qt4/GuiFontMetrics.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/frontends/qt4/GuiFontMetrics.cpp   2024-08-30 20:05:29.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     breakat_cache_(cache_metrics_breakat_size),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     qtextlayout_cache_(cache_metrics_qtextlayout_size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// For w/e reason QRawFont is not recognized, despite its header being included.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   // Determine italic slope
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   double const defaultSlope = tan(qDegreesToRadians(19.0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   QRawFont raw = QRawFont::fromFont(font);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,6 +139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           slope_ = -tan(qDegreesToRadians(angle));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           LYXERR(Debug::FONT, "Italic slope: " << slope_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>