CVS commit: pkgsrc/editors/codelite

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Jan  3 13:30:49 UTC 2024

Modified Files:
        pkgsrc/editors/codelite: distinfo
Added Files:
        pkgsrc/editors/codelite/patches:
            patch-LiteEditor_editorsettingsdockingwidows.cpp

Log Message:
codelite: fix compilation using patch from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/codelite/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/codelite/patches/patch-LiteEditor_editorsettingsdockingwidows.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/codelite/distinfo
diff -u pkgsrc/editors/codelite/distinfo:1.14 pkgsrc/editors/codelite/distinfo:1.15
--- pkgsrc/editors/codelite/distinfo:1.14       Thu Nov  2 12:04:02 2023
+++ pkgsrc/editors/codelite/distinfo    Wed Jan  3 13:30:49 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2023/11/02 12:04:02 nros Exp $
+$NetBSD: distinfo,v 1.15 2024/01/03 13:30:49 nros Exp $
 
 BLAKE2s (codelite-17.0.0.tar.gz) = f87eff56ee8f9af203a6212cc19e9031f70a396982a9f6fe276dc879f960f4dc
 SHA512 (codelite-17.0.0.tar.gz) = e36b6dcc37cd036a301a78714e8d5f2a61714b58fe006398fe0e959be59992dd7cc7d2a59661d364e371c750ca15cc21d4085d207738a7e3ede09ec0de125cff
@@ -15,6 +15,7 @@ SHA1 (patch-CodeLite_var__parser.cpp) = 
 SHA1 (patch-LanguageServer_LanguageServerLogView.h) = e098709cd6e6cf76a5416b1b8e93f60a6b636bd6
 SHA1 (patch-LiteEditor_CMakeLists.txt) = 34a788336a9a90b1b2960385c28cc5ace4abbfa0
 SHA1 (patch-LiteEditor_clConfigurationSelectionCtrl.h) = 3432007081056ca29f71324f47d994e00a592d86
+SHA1 (patch-LiteEditor_editorsettingsdockingwidows.cpp) = 01e9e230ff5c4596dec590e3515fca63166738d9
 SHA1 (patch-LiteEditor_tabgroupmanager.h) = b537238557f99ad83eb39937ce16f65caab45783
 SHA1 (patch-Plugin_DiffUI.h) = 66780d7ddc659df446f5f6361c8c69d966dfeb5d
 SHA1 (patch-Plugin_clEditorEditEventsHandler.cpp) = dc354802d62160a101983931526479e566680e89

Added files:

Index: pkgsrc/editors/codelite/patches/patch-LiteEditor_editorsettingsdockingwidows.cpp
diff -u /dev/null pkgsrc/editors/codelite/patches/patch-LiteEditor_editorsettingsdockingwidows.cpp:1.1
--- /dev/null   Wed Jan  3 13:30:49 2024
+++ pkgsrc/editors/codelite/patches/patch-LiteEditor_editorsettingsdockingwidows.cpp    Wed Jan  3 13:30:49 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-LiteEditor_editorsettingsdockingwidows.cpp,v 1.1 2024/01/03 13:30:49 nros Exp $
+
+* Fix, error call of overloaded ... is ambiguous
+  taken from upstream:
+  https://github.com/eranif/codelite/commit/c5c975afa30c958b87399255abf13e653138a697
+
+--- LiteEditor/editorsettingsdockingwidows.cpp.orig    2024-01-03 13:11:10.864486752 +0000
++++ LiteEditor/editorsettingsdockingwidows.cpp
+@@ -59,7 +59,7 @@ EditorSettingsDockingWindows::EditorSett
+     std::unordered_map<wxString, wxDirection> orientation_map = { { "UP", wxUP }, { "DOWN", wxDOWN } };
+     std::unordered_map<int, wxString> orientation_map_reverse = { { wxUP, "UP" }, { wxDOWN, "DOWN" } };
+ 
+-    AddProperty(_("Workspace tabs orientation"), { "UP", "DOWN" },
++    AddProperty(_("Workspace tabs orientation"), std::vector<wxString>{ "UP", "DOWN" },
+                 orientation_map_reverse[m_options->GetWorkspaceTabsDirection()],
+                 [this, orientation_map](const wxString&, const wxAny& value) mutable {
+                     wxString str_value;
+@@ -67,7 +67,7 @@ EditorSettingsDockingWindows::EditorSett
+                         m_options->SetWorkspaceTabsDirection(orientation_map[str_value]);
+                     }
+                 });
+-    AddProperty(_("Output tabs orientation"), { "UP", "DOWN" },
++    AddProperty(_("Output tabs orientation"), std::vector<wxString>{ "UP", "DOWN" },
+                 orientation_map_reverse[m_options->GetOutputTabsDirection()],
+                 [this, orientation_map](const wxString&, const wxAny& value) mutable {
+                     wxString str_value;