* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/, app-admin/keepass/files/
@ 2015-10-04 15:59 Ian Delaney
0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2015-10-04 15:59 UTC (permalink / raw
To: gentoo-commits
commit: d5094f447a1433978cff63283329e1659b3b1bc4
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 15:58:52 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 15:59:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5094f44
app-admin/keepass: patch to build to support >=mono-4
pacthes supplied by maintainer via the gentoo bug
Gentoo bug #558094
Package-Manager: portage-2.2.20.1
.../files/keepass-2.30-mono-4-support.patch | 92 ++++++++++++++++++++++
app-admin/keepass/keepass-2.30.ebuild | 3 +
2 files changed, 95 insertions(+)
diff --git a/app-admin/keepass/files/keepass-2.30-mono-4-support.patch b/app-admin/keepass/files/keepass-2.30-mono-4-support.patch
new file mode 100644
index 0000000..5794ba0
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.30-mono-4-support.patch
@@ -0,0 +1,92 @@
+File keepass-2.30-original/.ipc_in is a fifo while file keepass-2.30/.ipc_in is a fifo
+File keepass-2.30-original/.ipc_out is a fifo while file keepass-2.30/.ipc_out is a fifo
+diff -ur keepass-2.30-original/work/Ext/KeePassMsi/KeePassMsi.sln keepass-2.30/work/Ext/KeePassMsi/KeePassMsi.sln
+--- keepass-2.30-original/work/Ext/KeePassMsi/KeePassMsi.sln 2008-09-11 18:19:14.000000000 +0200
++++ keepass-2.30/work/Ext/KeePassMsi/KeePassMsi.sln 2015-09-28 17:21:23.640007000 +0200
+@@ -1,5 +1,5 @@
+
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2008
+ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "KeePassMsi", "KeePassMsi.vdproj", "{C4135368-4A84-4924-B5CE-82B18FAADFD4}"
+ EndProject
+diff -ur keepass-2.30-original/work/KeePass/KeePass.csproj keepass-2.30/work/KeePass/KeePass.csproj
+--- keepass-2.30-original/work/KeePass/KeePass.csproj 2015-09-28 17:20:19.828006799 +0200
++++ keepass-2.30/work/KeePass/KeePass.csproj 2015-09-28 17:21:26.160007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+@@ -1315,6 +1315,6 @@
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+- <PropertyGroup>
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ </PropertyGroup>
+ </Project>
+diff -ur keepass-2.30-original/work/KeePassLib/KeePassLib.csproj keepass-2.30/work/KeePassLib/KeePassLib.csproj
+--- keepass-2.30-original/work/KeePassLib/KeePassLib.csproj 2015-09-28 17:20:19.836006799 +0200
++++ keepass-2.30/work/KeePassLib/KeePassLib.csproj 2015-09-28 17:21:26.148007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+diff -ur keepass-2.30-original/work/KeePassLibSD/KeePassLibSD.csproj keepass-2.30/work/KeePassLibSD/KeePassLibSD.csproj
+--- keepass-2.30-original/work/KeePassLibSD/KeePassLibSD.csproj 2014-05-08 15:00:06.000000000 +0200
++++ keepass-2.30/work/KeePassLibSD/KeePassLibSD.csproj 2015-09-28 17:21:26.148007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
+@@ -14,7 +14,7 @@
+ <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
+ <OSVersion>4.20</OSVersion>
+ <DeployDirSuffix>KeePassLibSD</DeployDirSuffix>
+- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
++
+ <FormFactorID>
+ </FormFactorID>
+ <SignAssembly>true</SignAssembly>
+diff -ur keepass-2.30-original/work/KeePass.sln keepass-2.30/work/KeePass.sln
+--- keepass-2.30-original/work/KeePass.sln 2015-09-28 17:20:19.848006799 +0200
++++ keepass-2.30/work/KeePass.sln 2015-09-28 17:21:23.632007000 +0200
+@@ -1,4 +1,4 @@
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2008
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
+ EndProject
+diff -ur keepass-2.30-original/work/ShInstUtil/ShInstUtil.sln keepass-2.30/work/ShInstUtil/ShInstUtil.sln
+--- keepass-2.30-original/work/ShInstUtil/ShInstUtil.sln 2011-09-10 13:21:28.000000000 +0200
++++ keepass-2.30/work/ShInstUtil/ShInstUtil.sln 2015-09-28 17:21:23.636007000 +0200
+@@ -1,5 +1,5 @@
+
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 11.00
+ # Visual Studio 2008
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShInstUtil", "ShInstUtil.vcproj", "{C9FBA6FD-04AC-4B2F-8277-B852B8013DAE}"
+ EndProject
+diff -ur keepass-2.30-original/work/Translation/TrlUtil/TrlUtil.csproj keepass-2.30/work/Translation/TrlUtil/TrlUtil.csproj
+--- keepass-2.30-original/work/Translation/TrlUtil/TrlUtil.csproj 2013-07-21 10:06:38.000000000 +0200
++++ keepass-2.30/work/Translation/TrlUtil/TrlUtil.csproj 2015-09-28 17:21:26.140007008 +0200
+@@ -1,5 +1,5 @@
+-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+- <PropertyGroup>
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
++ <PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.30729</ProductVersion>
diff --git a/app-admin/keepass/keepass-2.30.ebuild b/app-admin/keepass/keepass-2.30.ebuild
index 55cdd13..d98b4e7 100644
--- a/app-admin/keepass/keepass-2.30.ebuild
+++ b/app-admin/keepass/keepass-2.30.ebuild
@@ -33,6 +33,9 @@ src_prepare() {
# KeePass looks for some XSL files in the same folder as the executable,
# we prefer to have it in /usr/share/KeePass
epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+ # bug # 558094
+ has_version ">=dev-lang/mono-4" && epatch \
+ "${FILESDIR}/${P}-mono-4-support.patch"
}
src_compile() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/, app-admin/keepass/files/
@ 2016-02-25 12:21 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-02-25 12:21 UTC (permalink / raw
To: gentoo-commits
commit: 3a15dfadf94cb3a09f15f483403a144d59f3dc47
Author: Alessandro Di Federico <ale <AT> clearmind <DOT> me>
AuthorDate: Thu Feb 25 12:20:12 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 12:21:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a15dfad
app-admin/keepass: fix build with >=app-text/grep-2.22
Gentoo-bug: 574480
Package-Manager: portage-2.2.27
app-admin/keepass/files/keepass-2.31-force-text-grep.patch | 13 +++++++++++++
app-admin/keepass/keepass-2.31.ebuild | 3 +++
2 files changed, 16 insertions(+)
diff --git a/app-admin/keepass/files/keepass-2.31-force-text-grep.patch b/app-admin/keepass/files/keepass-2.31-force-text-grep.patch
new file mode 100644
index 0000000..c108651
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.31-force-text-grep.patch
@@ -0,0 +1,13 @@
+Force text mode for >=grep-2.22 (bug #574480).
+
+--- a/Build/PrepMonoDev.sh
++++ b/Build/PrepMonoDev.sh
+@@ -3,7 +3,7 @@
+
+ sed 's!<SignAssembly>true</SignAssembly>!<SignAssembly>false</SignAssembly>!g' ../KeePass/KeePass.csproj > ../KeePass/KeePass.csproj.new
+ sed 's! ToolsVersion="3.5"!!g' ../KeePass/KeePass.csproj.new > ../KeePass/KeePass.csproj.new2
+-cat ../KeePass/KeePass.csproj.new2 | grep -v 'sgen\.exe' > ../KeePass/KeePass.csproj
++cat ../KeePass/KeePass.csproj.new2 | grep -va 'sgen\.exe' > ../KeePass/KeePass.csproj
+ rm -f ../KeePass/KeePass.csproj.new2
+ rm -f ../KeePass/KeePass.csproj.new
+
diff --git a/app-admin/keepass/keepass-2.31.ebuild b/app-admin/keepass/keepass-2.31.ebuild
index cac738e..d828fcf 100644
--- a/app-admin/keepass/keepass-2.31.ebuild
+++ b/app-admin/keepass/keepass-2.31.ebuild
@@ -25,6 +25,9 @@ DEPEND="${COMMON_DEPEND}
S=${WORKDIR}
src_prepare() {
+ # Force text mode for >grep-2.21 (bug #574480)
+ epatch "${FILESDIR}/${PN}-2.31-force-text-grep.patch"
+
# Remove Windows-specific things
pushd Build > /dev/null || die
. PrepMonoDev.sh || die
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/, app-admin/keepass/files/
@ 2017-01-13 4:09 Jonathan Vasquez
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Vasquez @ 2017-01-13 4:09 UTC (permalink / raw
To: gentoo-commits
commit: ef662c29f1f69a26728b371c245e55e13d45c1d3
Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 04:08:19 2017 +0000
Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 04:08:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef662c29
app-admin/keepass: including new PrepMonoEnv script and fixing header
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/keepass-2.35-new-monoprep-script.sh | 59 +++++++++++++++++
app-admin/keepass/keepass-2.34-r1.ebuild | 2 +-
app-admin/keepass/keepass-2.34.ebuild | 2 +-
...epass-2.34-r1.ebuild => keepass-2.35-r1.ebuild} | 73 ++++++++++++----------
app-admin/keepass/metadata.xml | 1 +
5 files changed, 101 insertions(+), 36 deletions(-)
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
new file mode 100644
index 00000000..c6fc41f
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.35-new-monoprep-script.sh
@@ -0,0 +1,59 @@
+#!/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
diff --git a/app-admin/keepass/keepass-2.34-r1.ebuild b/app-admin/keepass/keepass-2.34-r1.ebuild
index b790b54..9145063 100644
--- a/app-admin/keepass/keepass-2.34-r1.ebuild
+++ b/app-admin/keepass/keepass-2.34-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-admin/keepass/keepass-2.34.ebuild b/app-admin/keepass/keepass-2.34.ebuild
index 3bc899e..93eb09f 100644
--- a/app-admin/keepass/keepass-2.34.ebuild
+++ b/app-admin/keepass/keepass-2.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-admin/keepass/keepass-2.34-r1.ebuild b/app-admin/keepass/keepass-2.35-r1.ebuild
similarity index 57%
copy from app-admin/keepass/keepass-2.34-r1.ebuild
copy to app-admin/keepass/keepass-2.35-r1.ebuild
index b790b54..3fbf36b 100644
--- a/app-admin/keepass/keepass-2.34-r1.ebuild
+++ b/app-admin/keepass/keepass-2.35-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit eutils fdo-mime gnome2-utils mono-env multilib
+inherit eutils fdo-mime gnome2-utils multilib
MY_PN="KeePass"
DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
@@ -16,31 +16,32 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="aot"
-COMMON_DEPEND=">=dev-lang/mono-2.10.5"
-RDEPEND="${COMMON_DEPEND}
- dev-dotnet/libgdiplus[cairo]"
+COMMON_DEPEND="dev-lang/mono"
DEPEND="${COMMON_DEPEND}
- app-arch/unzip"
+ app-arch/unzip"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]"
-S=${WORKDIR}
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch" )
src_prepare() {
- # Force text mode for >grep-2.21 (bug #574480)
- epatch "${FILESDIR}/${PN}-2.31-force-text-grep.patch"
-
- # Remove Windows-specific things
- pushd Build > /dev/null || die
- . PrepMonoDev.sh || die
- popd > /dev/null || die
-
# KeePass looks for some XSL files in the same folder as the executable,
- # we prefer to have it in /usr/share/KeePass
- epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
- # bug # 558094
- if has_version ">=dev-lang/mono-4" ; then
- sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
- sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
- fi
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ # This XSL file will not be upstreamed since the KeePass creator said that
+ # including this patch would break the Portable USB version of KeePass
+ # (which keeps/looks for xsl files in its own folder)
+ default
+
+ # New Mono Prep Script until keepass 2.36+ comes out.
+ # This script has been upstreamed, still waiting for final confirmation.
+ local newMonoPrepScript="${FILESDIR}/keepass-2.35-new-monoprep-script.sh"
+
+ # Switch into build dir so the mono prepration script works correctly
+ cd Build || die
+ cp -f "${newMonoPrepScript}" PrepMonoDev.sh
+ source PrepMonoDev.sh || die
+ cd ../ || die
}
src_compile() {
@@ -49,22 +50,24 @@ src_compile() {
# Run Ahead Of Time compiler on the binary
if use aot; then
- cp Ext/KeePass.exe.config Build/KeePass/Release/
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
fi
}
src_install() {
# Wrapper script to launch mono
- make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
# Some XSL files
- insinto /usr/share/${PN}/XSL
+ insinto "/usr/share/${PN}/XSL"
doins Ext/XSL/*
- insinto /usr/$(get_libdir)/${PN}/
- exeinto /usr/$(get_libdir)/${PN}/
+ insinto "/usr/$(get_libdir)/${PN}/"
+ exeinto "/usr/$(get_libdir)/${PN}/"
+
doins Ext/KeePass.exe.config
+
# Default configuration, simply says to use user-specific configuration
doins Ext/KeePass.config.xml
@@ -81,13 +84,13 @@ src_install() {
newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
# Create a desktop entry and associate it with the KeePass mime type
- make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
# MIME descriptor for .kdbx files
insinto /usr/share/mime/packages/
doins "${FILESDIR}/${PN}.xml"
- # sed, because patching this realllllly sucks
+ # sed, because patching this really sucks
sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
}
@@ -96,13 +99,11 @@ pkg_preinst() {
}
pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
+ _update_caches
if ! has_version x11-misc/xdotool ; then
elog "Optional dependencies:"
- elog " x11-misc/xdotool (enables autotype)"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
fi
elog "Some systems may experience issues with copy and paste operations."
@@ -110,6 +111,10 @@ pkg_postinst() {
}
pkg_postrm() {
+ _update_caches
+}
+
+_update_caches() {
gnome2_icon_cache_update
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index 9a5a02b..ca860b2 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -11,6 +11,7 @@
</maintainer>
<maintainer type="person">
<email>fearedbliss@gentoo.org</email>
+ <name>Jonathan Vasquez</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
<maintainer type="project">
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/, app-admin/keepass/files/
@ 2017-06-11 4:36 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2017-06-11 4:36 UTC (permalink / raw
To: gentoo-commits
commit: c0b70c7fd53f4a633c6ca82c2e829cf9b2f08023
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 04:30:35 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 04:35:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b70c7f
app-admin/keepass: version bump 2.36
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-admin/keepass/Manifest | 1 +
.../files/keepass-2.36-xsl-path-detection.patch | 43 ++++++++
app-admin/keepass/keepass-2.36.ebuild | 116 +++++++++++++++++++++
3 files changed, 160 insertions(+)
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index c0a32d0328c..a40911b337b 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1 +1,2 @@
DIST KeePass-2.35-Source.zip 4840873 SHA256 5faad9381af2f9d808d65ee3d880ff3bca9352c7ce886fea95d54f9169e863df SHA512 9f9bb0875c3261e004f655356e8302858afebb7d41a4e4619affaa5e8e5375ffe4fc2b251db10d1d18ef94e07d60dd9bd8812ecedcd5de4c4fbe641c6a37dede WHIRLPOOL db1d270ac5402021add60739ca4916d9dd81999c53b095d143a34a2886f47c354170e41fee63027be83866c541022c79c3c21111a501cd51bafb972e5fe277e2
+DIST KeePass-2.36-Source.zip 5063221 SHA256 de7e3e9d9bedab13e4d66b0ee941b2ebedaa08d8090f7cd78bd0fc019187d8c8 SHA512 16d51ed6bc437172765f69d1d67862afe7219a0898d13b4609198bbd7b5107620f1be418f5ea6ba23a5e3c7ca12d45ba3f0f3778c516eea6b2b953bc291cfe41 WHIRLPOOL 1d9fbf662757e09c4854010da9f6960fe4bf794eb694b37a9f63d813c1e1d1471257a66f01eac761fed5b06831f659cb81f11eba8858ee4e128cd578a19fcae8
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
new file mode 100644
index 00000000000..c17b654d3f3
--- /dev/null
+++ b/app-admin/keepass/files/keepass-2.36-xsl-path-detection.patch
@@ -0,0 +1,43 @@
+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/keepass-2.36.ebuild b/app-admin/keepass/keepass-2.36.ebuild
new file mode 100644
index 00000000000..6bf94521c59
--- /dev/null
+++ b/app-admin/keepass/keepass-2.36.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+src_prepare() {
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ # This XSL file will not be upstreamed since the KeePass creator said that
+ # including this patch would break the Portable USB version of KeePass
+ # (which keeps/looks for xsl files in its own folder)
+ default
+
+ # New Mono Prep Script until keepass 2.36+ comes out.
+ # This script has been upstreamed, still waiting for final confirmation.
+ local newMonoPrepScript="${FILESDIR}/keepass-2.35-new-monoprep-script.sh"
+
+ # Switch into build dir so the mono prepration script works correctly
+ cd Build || die
+ cp -f "${newMonoPrepScript}" PrepMonoDev.sh
+ source PrepMonoDev.sh || die
+ cd ../ || die
+}
+
+src_compile() {
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto "/usr/share/${PN}/XSL"
+ doins Ext/XSL/*
+
+ insinto "/usr/$(get_libdir)/${PN}/"
+ exeinto "/usr/$(get_libdir)/${PN}/"
+
+ doins Ext/KeePass.exe.config
+
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages/
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this really sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-11 4:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-04 15:59 [gentoo-commits] repo/gentoo:master commit in: app-admin/keepass/, app-admin/keepass/files/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2016-02-25 12:21 Michael Palimaka
2017-01-13 4:09 Jonathan Vasquez
2017-06-11 4:36 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox