diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-admin/keepass/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-admin/keepass/files')
-rw-r--r-- | app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch | 43 | ||||
-rw-r--r-- | app-admin/keepass/files/keepass.xml | 9 |
2 files changed, 0 insertions, 52 deletions
diff --git a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch deleted file mode 100644 index c17b654d3f35..000000000000 --- a/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -KeePass looks for some resources (XSL files) in the executable directory, -however under UNIX system this not a good idea, so we look into the -CommonApplicationData SpecialFolder, which usually maps to "/usr/share/". -So the final search path should be "/usr/share/KeePass/XSL/". - ---- a/KeePass/forms/AboutForm.cs -+++ b/KeePass/Forms/AboutForm.cs -@@ -31,9 +31,11 @@ - using KeePass.Resources;
- using KeePass.UI;
- using KeePass.Util;
-+using KeePass.Native;
-
- using KeePassLib;
- using KeePassLib.Utility;
-+using KeePassLib.Native;
-
- namespace KeePass.Forms
- {
-@@ -98,8 +100,21 @@ - m_lvComponents.Items.Add(lvi);
-
- lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
-- string strPath = WinUtil.GetExecutable();
-- strPath = UrlUtil.GetFileDirectory(strPath, true, false);
-+
-+ string strPath;
-+ if (NativeLib.IsUnix())
-+ {
-+ strPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
-+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
-+ strPath += PwDefs.ShortProductName.ToLower();
-+ strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
-+ }
-+ else
-+ {
-+ strPath = WinUtil.GetExecutable();
-+ strPath = UrlUtil.GetFileDirectory(strPath, true, false);
-+ }
-+
- strPath += AppDefs.XslFilesDir;
- strPath = UrlUtil.EnsureTerminatingSeparator(strPath, false);
- bool bInstalled = File.Exists(strPath + AppDefs.XslFileHtmlFull);
diff --git a/app-admin/keepass/files/keepass.xml b/app-admin/keepass/files/keepass.xml deleted file mode 100644 index 5e3d80dcae7b..000000000000 --- a/app-admin/keepass/files/keepass.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/x-keepass2"> - <comment>KeePass database</comment> - <glob pattern="*.kdbx"/> - <icon name="keepass" /> - </mime-type> -</mime-info> - |