diff options
| author |   Tom Gillespie <tgbugs@gmail.com> | 2023-07-16 15:54:09 -0700 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-07-17 00:01:33 +0100 |
| commit | 6a0e94e592d95fe3ce770ac8f77fa2126cf33c65 (patch) | |
| tree | fe4d57d589d7a37230e8e1cfca42bc583080b300 /app-admin | |
| parent | dev-qt/qtwayland: Stabilize 5.15.10-r1 ppc64, #910416 (diff) | |
| download | gentoo-6a0e94e592d95fe3ce770ac8f77fa2126cf33c65.tar.gz gentoo-6a0e94e592d95fe3ce770ac8f77fa2126cf33c65.tar.bz2 gentoo-6a0e94e592d95fe3ce770ac8f77fa2126cf33c65.zip | |
app-admin/keepass: fix 2.53 patch line endings
Closes: https://bugs.gentoo.org/910439
Signed-off-by: Tom Gillespie <tgbugs@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31918
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch index 19701410cae6..3fed7593a1de 100644 --- a/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch +++ b/app-admin/keepass/files/keepass-2.53-xsl-path-detection.patch @@ -1,22 +1,22 @@ --- a/KeePass/Forms/AboutForm.cs +++ b/KeePass/Forms/AboutForm.cs @@ -135,7 +135,18 @@ - m_lvComponents.Columns.Add(strValueColumn, 100); - - string strExe = WinUtil.GetExecutable(); -- string strDir = UrlUtil.GetFileDirectory(strExe, true, false); -+ string strDir = null; -+ if (KeePassLib.Native.NativeLib.IsUnix()) -+ { -+ string strBPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData); -+ strBPath = UrlUtil.EnsureTerminatingSeparator(strBPath, false); -+ strBPath += PwDefs.ShortProductName.ToLower(); -+ strDir = UrlUtil.EnsureTerminatingSeparator(strBPath, false); -+ } -+ else -+ { -+ strDir = UrlUtil.GetFileDirectory(strExe, true, false); -+ } - - AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe); - + m_lvComponents.Columns.Add(strValueColumn, 100);
+
+ string strExe = WinUtil.GetExecutable();
+- string strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ string strDir = null;
++ if (KeePassLib.Native.NativeLib.IsUnix())
++ {
++ string strBPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
++ strBPath = UrlUtil.EnsureTerminatingSeparator(strBPath, false);
++ strBPath += PwDefs.ShortProductName.ToLower();
++ strDir = UrlUtil.EnsureTerminatingSeparator(strBPath, false);
++ }
++ else
++ {
++ strDir = UrlUtil.GetFileDirectory(strExe, true, false);
++ }
+
+ AddComponentItem(PwDefs.ShortProductName, strMainVersion, strExe);
+
|