git: e714e6b229b9 - main - games/doomsday: Fix build with LLVM 16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 27 Jun 2023 18:16:12 UTC
The branch main has been updated by danilo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e714e6b229b90e9a18e178541a1691cf2e1e9dc7
commit e714e6b229b90e9a18e178541a1691cf2e1e9dc7
Author: Danilo Egea Gondolfo <danilo@FreeBSD.org>
AuthorDate: 2023-06-26 18:30:25 +0000
Commit: Danilo Egea Gondolfo <danilo@FreeBSD.org>
CommitDate: 2023-06-27 18:15:58 +0000
games/doomsday: Fix build with LLVM 16
It was failing with "call to 'round' is ambiguous".
---
.../patch-apps_client_src_ui_dialogs_filedownloaddialog.cpp | 11 +++++++++++
.../patch-apps_client_src_ui_widgets_cvarsliderwidget.cpp | 10 ++++++++++
2 files changed, 21 insertions(+)
diff --git a/games/doomsday/files/patch-apps_client_src_ui_dialogs_filedownloaddialog.cpp b/games/doomsday/files/patch-apps_client_src_ui_dialogs_filedownloaddialog.cpp
new file mode 100644
index 000000000000..c0a3946791f3
--- /dev/null
+++ b/games/doomsday/files/patch-apps_client_src_ui_dialogs_filedownloaddialog.cpp
@@ -0,0 +1,11 @@
+--- apps/client/src/ui/dialogs/filedownloaddialog.cpp.orig 2023-06-26 18:10:09 UTC
++++ apps/client/src/ui/dialogs/filedownloaddialog.cpp
+@@ -47,7 +47,7 @@ DENG_GUI_PIMPL(FileDownloadDialog)
+ if (!bytes.end) return;
+
+ auto &indicator = self().progressIndicator();
+- indicator.setProgress(round<int>(100.0 * double(bytes.size())/double(bytes.end)));
++ indicator.setProgress(de::round<int>(100.0 * double(bytes.size())/double(bytes.end)));
+
+ indicator.setText(tr("%1\n" _E(l)_E(F) "%2 file%3 / %4 MB")
+ .arg(message)
diff --git a/games/doomsday/files/patch-apps_client_src_ui_widgets_cvarsliderwidget.cpp b/games/doomsday/files/patch-apps_client_src_ui_widgets_cvarsliderwidget.cpp
new file mode 100644
index 000000000000..a93e67d0828d
--- /dev/null
+++ b/games/doomsday/files/patch-apps_client_src_ui_widgets_cvarsliderwidget.cpp
@@ -0,0 +1,10 @@
+--- apps/client/src/ui/widgets/cvarsliderwidget.cpp.orig 2023-06-26 18:09:55 UTC
++++ apps/client/src/ui/widgets/cvarsliderwidget.cpp
+@@ -87,6 +87,6 @@ void CVarSliderWidget::setCVarValueFromWidget()
+ }
+ else
+ {
+- CVar_SetInteger(d->var(), round<int>(value()));
++ CVar_SetInteger(d->var(), de::round<int>(value()));
+ }
+ }