Attachment 157122 Details for Bug 200343 – Patch to fix build of security/keepass with mono 4

[patch] Patch to fix build of security/keepass with mono 4

keepass.diff (text/plain), 11.27 KB, created by Ben Woods on 2015-05-25 14:44:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2015-05-25 14:44:56 UTC

Size: 11.27 KB

patch

obsolete

>Index: security/keepass/files/patch-KeePass.sln
>===================================================================
>--- security/keepass/files/patch-KeePass.sln	(revision 0)
>+++ security/keepass/files/patch-KeePass.sln	(working copy)
>@@ -0,0 +1,80 @@
>+--- KeePass.sln.orig	2015-05-25 13:56:46 UTC
>++++ KeePass.sln
>+@@ -1,5 +1,6 @@
>+-Microsoft Visual Studio Solution File, Format Version 10.00
>+-# Visual Studio 2008
>++ï»¿
>++Microsoft Visual Studio Solution File, Format Version 12.00
>++# Visual Studio 2012
>+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
>+ EndProject
>+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
>+@@ -20,18 +21,6 @@ Global
>+ 		Release|x64 = Release|x64
>+ 	EndGlobalSection
>+ 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Win32.ActiveCfg = Debug|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|x64.ActiveCfg = Debug|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.Build.0 = Release|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Win32.ActiveCfg = Release|Any CPU
>+-		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|x64.ActiveCfg = Release|Any CPU
>+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
>+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
>+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
>+@@ -44,18 +33,18 @@ Global
>+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
>+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU
>+ 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU
>+-		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|Win32.ActiveCfg = Debug|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Debug|x64.ActiveCfg = Debug|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Any CPU.Build.0 = Release|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|Win32.ActiveCfg = Release|Any CPU
>++		{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}.Release|x64.ActiveCfg = Release|Any CPU
>+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
>+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU
>+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
>+@@ -68,6 +57,18 @@ Global
>+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
>+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Release|Win32.ActiveCfg = Release|Any CPU
>+ 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Release|x64.ActiveCfg = Release|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU
>++		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU
>+ 	EndGlobalSection
>+ 	GlobalSection(SolutionProperties) = preSolution
>+ 		HideSolutionNode = FALSE
>
>Property changes on: security/keepass/files/patch-KeePass.sln
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj
>===================================================================
>--- security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj	(revision 0)
>+++ security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj	(working copy)
>@@ -0,0 +1,17 @@
>+--- KeePassLibSD/KeePassLibSD.csproj.orig	2015-05-25 13:34:02 UTC
>++++ KeePassLibSD/KeePassLibSD.csproj
>+@@ -1,4 +1,4 @@
>+-ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
>++ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
>+   <PropertyGroup>
>+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
>+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
>+@@ -381,5 +381,5 @@
>+   <Target Name="AfterBuild">
>+   </Target>
>+   -->
>+-  <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
>+-</Project>
>+\ No newline at end of file
>++  <Import Condition="'$(TargetFrameworkVersion)' == 'v4.0'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
>++</Project>
>
>Property changes on: security/keepass/files/patch-KeePassLibSD_KeePassLibSD.csproj
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/keepass/files/patch-KeePassLib_KeePassLib.csproj
>===================================================================
>--- security/keepass/files/patch-KeePassLib_KeePassLib.csproj	(revision 0)
>+++ security/keepass/files/patch-KeePassLib_KeePassLib.csproj	(working copy)
>@@ -0,0 +1,8 @@
>+--- KeePassLib/KeePassLib.csproj.orig	2015-05-25 13:14:13 UTC
>++++ KeePassLib/KeePassLib.csproj
>+@@ -1,4 +1,4 @@
>+-ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
>++ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
>+   <PropertyGroup>
>+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
>+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
>
>Property changes on: security/keepass/files/patch-KeePassLib_KeePassLib.csproj
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/keepass/files/patch-KeePass_KeePass.csproj
>===================================================================
>--- security/keepass/files/patch-KeePass_KeePass.csproj	(revision 0)
>+++ security/keepass/files/patch-KeePass_KeePass.csproj	(working copy)
>@@ -0,0 +1,8 @@
>+--- KeePass/KeePass.csproj.orig	2015-05-25 13:12:43 UTC
>++++ KeePass/KeePass.csproj
>+@@ -1,4 +1,4 @@
>+-ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
>++ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
>+   <PropertyGroup>
>+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
>+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
>
>Property changes on: security/keepass/files/patch-KeePass_KeePass.csproj
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj
>===================================================================
>--- security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj	(revision 0)
>+++ security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj	(working copy)
>@@ -0,0 +1,8 @@
>+--- Translation/TrlUtil/TrlUtil.csproj.orig	2015-05-25 13:16:14 UTC
>++++ Translation/TrlUtil/TrlUtil.csproj
>+@@ -1,4 +1,4 @@
>+-ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
>++ï»¿<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
>+   <PropertyGroup>
>+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
>+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
>
>Property changes on: security/keepass/files/patch-Translation_TrlUtil_TrlUtil.csproj
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

woodsb02: maintainer-approval+

Actions: View | Diff

Attachments on bug 200343: 156973 | 157122 | 157123