- Added 0001-Compilation-fixes-for-wxWidgets-3.1.6.patch, 0001-Compilation-fix-for-wxWidgets-3.1.5.patch, 0001-Fix-a-wx-assert-complaining-that-a-panel-was-being-a.patch, 0001-Fix-a-wxAssert-when-showing-the-Command-line-termina.patch, and 0001-Prevent-a-wx-build-warning-about-wxPATH_NORM_ALL-bei.patch to fix build with wxWidgets 3.2 OBS-URL: https://build.opensuse.org/request/show/999180 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/4pane?expand=0&rev=20
27 lines
840 B
Diff
27 lines
840 B
Diff
From edb36ef77acf3c64b5bc1acfe106a2455c4589ee Mon Sep 17 00:00:00 2001
|
|
From: dghart <dghart@users.sourceforge.net>
|
|
Date: Sun, 13 Feb 2022 14:41:32 +0000
|
|
Subject: [PATCH] Prevent a wx build warning about wxPATH_NORM_ALL being
|
|
deprecated
|
|
|
|
---
|
|
Filetypes.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Filetypes.cpp b/Filetypes.cpp
|
|
index defb120..26c36a9 100644
|
|
--- a/Filetypes.cpp
|
|
+++ b/Filetypes.cpp
|
|
@@ -437,7 +437,7 @@ if (fpath.IsEmpty()) // If fpath is emp
|
|
}
|
|
|
|
wxFileName fn(fpath); // Now use wxFileName's Normalize method to do the hard bit
|
|
-fn.Normalize(wxPATH_NORM_ALL, cwd);
|
|
+fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE, cwd);
|
|
return fn.GetFullPath();
|
|
}
|
|
|
|
--
|
|
2.37.2
|
|
|