<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd62d37e1c7b0cc45ecdf0adb3438a57aecac660">https://github.com/macports/macports-ports/commit/bd62d37e1c7b0cc45ecdf0adb3438a57aecac660</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bd62d37e1c7b0cc45ecdf0adb3438a57aecac660
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Apr 24 15:59:17 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> charm: depends on qtscript
</span>---
office/charm/Portfile | 6 +++++-
office/charm/files/patch-fix-Qt5.diff | 10 ++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/charm/Portfile b/office/charm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 799de11412d..53355c35ea7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/charm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/charm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,11 @@ subport ${name}-qt5 {
</span>
conflicts ${name}
qt5.depends_component \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmacextras qtscript sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-Qt5.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DCHARM_FORCE_QT4:BOOL=OFF
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/charm/files/patch-fix-Qt5.diff b/office/charm/files/patch-fix-Qt5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5ff45fa4e4d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/charm/files/patch-fix-Qt5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Charm/Widgets/NotificationPopup.cpp 2016-04-22 00:40:23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Charm/Widgets/NotificationPopup.cpp 2024-04-24 16:42:56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QDesktopWidget>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTimer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QStyle>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NotificationPopup::NotificationPopup( QWidget* parent )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : QDialog( parent )
</span></pre><pre style='margin:0'>
</pre>