summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2017-07-23 12:05:25 +1000
committerMichael Palimaka <kensington@gentoo.org>2017-07-23 12:08:01 +1000
commit31d82fd523531c48db76b9aad9790a1fa42321c3 (patch)
tree6c229d3acf3e932c705ae660e6f3362f886caa73 /app-admin/keepass/files
parentapp-admin/keepass: amd64/x86 stable (diff)
downloadgentoo-31d82fd523531c48db76b9aad9790a1fa42321c3.tar.gz
gentoo-31d82fd523531c48db76b9aad9790a1fa42321c3.tar.bz2
gentoo-31d82fd523531c48db76b9aad9790a1fa42321c3.zip
app-admin/keepass: remove 2.35-r1
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'app-admin/keepass/files')
-rw-r--r--app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch45
-rw-r--r--app-admin/keepass/files/keepass-2.35-new-monoprep-script.sh59
2 files changed, 0 insertions, 104 deletions
diff --git a/app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch b/app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch
deleted file mode 100644
index d3805feb0d98..000000000000
--- a/app-admin/keepass/files/keepass-2.20-xsl-path-detection.patch
+++ /dev/null
@@ -1,45 +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/".
-
-diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
-index 8a04c87..6083c00 100644
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
-@@ -31,9 +31,11 @@ using KeePass.UI;
- using KeePass.Resources;
- using KeePass.Util;
- using KeePass.DataExchange;
-+using KeePass.Native;
-
- using KeePassLib;
- using KeePassLib.Utility;
-+using KeePassLib.Native;
-
- namespace KeePass.Forms
- {
-@@ -92,8 +94,21 @@ namespace KeePass.Forms
- 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.XslFileHtmlLite);
diff --git a/app-admin/keepass/files/keepass-2.35-new-monoprep-script.sh b/app-admin/keepass/files/keepass-2.35-new-monoprep-script.sh
deleted file mode 100644
index c6fc41f839c2..000000000000
--- a/app-admin/keepass/files/keepass-2.35-new-monoprep-script.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-buildDir="$(pwd)"
-keePassRootDir="${buildDir}/.."
-
-copyKeePassIcons()
-{
- cd "${buildDir}"
- cp -f ../Ext/Icons_04_CB/Finals2/plockb.ico ../KeePass/KeePass.ico
- cp -f ../Ext/Icons_04_CB/Finals2/plockb.ico ../KeePass/Resources/Images/KeePass.ico
-}
-
-sanitizeKeePassProjectFiles()
-{
- cd "${keePassRootDir}/KeePass"
-
- local keePassProjectFile="KeePass.csproj"
- local keePassProjectSolution="KeePass.sln"
-
- sed -i 's!<SignAssembly>true</SignAssembly>!<SignAssembly>false</SignAssembly>!g' "${keePassProjectFile}"
- sed -i 's! ToolsVersion="3.5"!!g' "${keePassProjectFile}"
- sed -i '/sgen\.exe/d' "${keePassProjectFile}"
-
- # Update solution .NET format to 11 (This targets Mono 4 rather than 3.5)
- cd "${keePassRootDir}"
- sed -i 's!Format Version 10.00!Format Version 11.00!g' "${keePassProjectSolution}"
-
- cd "${buildDir}"
-}
-
-sanitizeKeePassLibProjectFile()
-{
- cd "${keePassRootDir}/KeePassLib"
-
- local keePassProjectLibFile="KeePassLib.csproj"
- sed -i 's!<SignAssembly>true</SignAssembly>!<SignAssembly>false</SignAssembly>!g' "${keePassProjectLibFile}"
- sed -i 's! ToolsVersion="3.5"!!g' "${keePassProjectLibFile}"
-
- cd "${buildDir}"
-}
-
-
-sanitizeTrlUtilProjectFile()
-{
- cd "${keePassRootDir}/Translation/TrlUtil"
-
- local trlUtilProjectFile="TrlUtil.csproj"
- sed -i 's! ToolsVersion="3.5"!!g' "${trlUtilProjectFile}"
-
- cd "${buildDir}"
-}
-
-# Start
-copyKeePassIcons
-
-# Remove ToolsVersion 3.5 References so that newer Mono compilers can be used
-sanitizeKeePassProjectFiles
-sanitizeKeePassLibProjectFile
-sanitizeTrlUtilProjectFile