public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/files/
@ 2023-07-16 23:01 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2023-07-16 23:01 UTC (permalink / raw
  To: gentoo-commits

commit:     6a0e94e592d95fe3ce770ac8f77fa2126cf33c65
Author:     Tom Gillespie <tgbugs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 16 22:54:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 23:01:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0e94e5

app-admin/keepass: fix 2.53 patch line endings

Closes: https://bugs.gentoo.org/910439
Signed-off-by: Tom Gillespie <tgbugs <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31918
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/keepass-2.53-xsl-path-detection.patch    | 38 +++++++++++-----------
 1 file 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);
+ 


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-07-16 23:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-16 23:01 [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/files/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox