vte/vte-revert-back-to-c++17.patch

51 lines
1.9 KiB
Diff

diff --color -Naur vte-0.66.0.orig/meson.build vte-0.66.0/meson.build
--- vte-0.66.0.orig/meson.build 2021-10-26 15:49:40.539203281 +0800
+++ vte-0.66.0/meson.build 2021-10-26 15:51:22.749208116 +0800
@@ -30,9 +30,9 @@
# Compiler requirements
c_req_std = 'gnu11'
-cxx_req_std = 'gnu++20'
-gxx_req_version = '10.0'
-clangxx_req_version = '11.0'
+cxx_req_std = 'gnu++17'
+gxx_req_version = '7.0'
+clangxx_req_version = '8.0'
# Version requirements
diff --color -Naur vte-0.66.0.orig/src/widget.cc vte-0.66.0/src/widget.cc
--- vte-0.66.0.orig/src/widget.cc 2021-10-26 15:49:40.548203282 +0800
+++ vte-0.66.0/src/widget.cc 2021-10-27 04:08:33.405300452 +0800
@@ -402,7 +402,11 @@
#endif /* VTE_GTK == 4 */
Widget::Widget(VteTerminal* t)
- : m_widget{&t->widget}
+ : m_widget{&t->widget},
+ m_hscroll_policy(GTK_SCROLL_NATURAL),
+ m_vscroll_policy(GTK_SCROLL_NATURAL),
+ m_scroll_unit_is_pixels(false),
+ m_changing_scroll_position(false)
{
// Create a default adjustment
set_vadjustment({});
diff --color -Naur vte-0.66.0.orig/src/widget.hh vte-0.66.0/src/widget.hh
--- vte-0.66.0.orig/src/widget.hh 2021-10-26 15:49:40.548203282 +0800
+++ vte-0.66.0/src/widget.hh 2021-10-27 04:08:52.888301374 +0800
@@ -577,10 +577,10 @@
vte::glib::RefPtr<GtkAdjustment> m_vadjustment{};
vte::glib::RefPtr<GtkAdjustment> m_hadjustment{};
- unsigned m_hscroll_policy:1{GTK_SCROLL_NATURAL};
- unsigned m_vscroll_policy:1{GTK_SCROLL_NATURAL};
- unsigned m_scroll_unit_is_pixels:1{false};
- unsigned m_changing_scroll_position:1{false};
+ unsigned m_hscroll_policy:1;
+ unsigned m_vscroll_policy:1;
+ unsigned m_scroll_unit_is_pixels:1;
+ unsigned m_changing_scroll_position:1;
};
} // namespace platform